summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSavio Sena <savio@expertisesolutions.com.br>2014-10-04 12:57:21 -0300
committerSavio Sena <savio@expertisesolutions.com.br>2014-10-06 13:18:47 -0300
commit2a2cc7260cfcb12bdbb177abf848b7ea4794fcb9 (patch)
tree41171581eb0e728122c388169a76fa4f904acfe0
parentc9984a38ad95b4b3960594e3495b46884a9e3228 (diff)
expedite-cxx: Finished all image, line, rect, font and text tests.
missing: widgets and textblock.
-rw-r--r--src/bin/Makefile.am9
-rw-r--r--src/bin/cxx/image_blend_border.cc4
-rw-r--r--src/bin/cxx/image_blend_border_recolor.cc2
-rw-r--r--src/bin/cxx/image_blend_fade_pow2_unscaled.cc2
-rw-r--r--src/bin/cxx/image_blend_fade_unscaled.cc2
-rw-r--r--src/bin/cxx/image_blend_many_smooth_same_scaled.cc6
-rw-r--r--src/bin/cxx/image_blend_nearest_same_scaled.cc4
-rw-r--r--src/bin/cxx/image_blend_nearest_scaled.cc4
-rw-r--r--src/bin/cxx/image_blend_nearest_solid_same_scaled.cc4
-rw-r--r--src/bin/cxx/image_blend_nearest_solid_scaled.cc4
-rw-r--r--src/bin/cxx/image_blend_occlude1.cc6
-rw-r--r--src/bin/cxx/image_blend_occlude1_few.cc6
-rw-r--r--src/bin/cxx/image_blend_occlude1_many.cc6
-rw-r--r--src/bin/cxx/image_blend_occlude1_very_many.cc6
-rw-r--r--src/bin/cxx/image_blend_occlude2.cc6
-rw-r--r--src/bin/cxx/image_blend_occlude2_few.cc6
-rw-r--r--src/bin/cxx/image_blend_occlude2_many.cc6
-rw-r--r--src/bin/cxx/image_blend_occlude2_very_many.cc6
-rw-r--r--src/bin/cxx/image_blend_occlude3.cc6
-rw-r--r--src/bin/cxx/image_blend_occlude3_few.cc6
-rw-r--r--src/bin/cxx/image_blend_occlude3_many.cc6
-rw-r--r--src/bin/cxx/image_blend_occlude3_very_many.cc6
-rw-r--r--src/bin/cxx/image_blend_smooth_same_scaled.cc4
-rw-r--r--src/bin/cxx/image_blend_smooth_scaled.cc10
-rw-r--r--src/bin/cxx/image_blend_smooth_solid_same_scaled.cc6
-rw-r--r--src/bin/cxx/image_blend_smooth_solid_scaled.cc14
-rw-r--r--src/bin/cxx/image_blend_solid_border.cc2
-rw-r--r--src/bin/cxx/image_blend_solid_fade_pow2_unscaled.cc2
-rw-r--r--src/bin/cxx/image_blend_solid_fade_unscaled.cc3
-rw-r--r--src/bin/cxx/image_blend_solid_middle_border.cc4
-rw-r--r--src/bin/cxx/image_blend_solid_middle_unscaled.cc4
-rw-r--r--src/bin/cxx/image_blend_solid_unscaled.cc2
-rw-r--r--src/bin/cxx/image_blend_unscaled.cc4
-rw-r--r--src/bin/cxx/image_crossfade.cc16
-rw-r--r--src/bin/cxx/image_data_argb.cc4
-rw-r--r--src/bin/cxx/image_data_ycbcr601pl.cc2
-rw-r--r--src/bin/cxx/image_map_3d_1.cc55
-rw-r--r--src/bin/cxx/image_map_3d_2.cc38
-rw-r--r--src/bin/cxx/image_map_3d_3.cc35
-rw-r--r--src/bin/cxx/image_map_3d_4.cc34
-rw-r--r--src/bin/cxx/image_map_3d_5.cc39
-rw-r--r--src/bin/cxx/image_map_3d_6.cc39
-rw-r--r--src/bin/cxx/image_map_3d_flow.cc5
-rw-r--r--src/bin/cxx/image_map_color_alpha_nearest_rotate.cc2
-rw-r--r--src/bin/cxx/image_map_color_alpha_nearest_solid_rotate.cc2
-rw-r--r--src/bin/cxx/image_map_color_alpha_rotate.cc2
-rw-r--r--src/bin/cxx/image_map_color_alpha_solid_rotate.cc2
-rw-r--r--src/bin/cxx/image_map_color_nearest_rotate.cc2
-rw-r--r--src/bin/cxx/image_map_color_nearest_solid_rotate.cc2
-rw-r--r--src/bin/cxx/image_map_color_rotate.cc2
-rw-r--r--src/bin/cxx/image_map_color_solid_rotate.cc2
-rw-r--r--src/bin/cxx/image_map_nearest_rotate.cc2
-rw-r--r--src/bin/cxx/image_map_nearest_solid_rotate.cc2
-rw-r--r--src/bin/cxx/image_map_rotate.cc2
-rw-r--r--src/bin/cxx/image_map_solid_rotate.cc2
-rw-r--r--src/bin/cxx/image_quality_scale.cc6
-rw-r--r--src/bin/cxx/line_blend.cc4
-rw-r--r--src/bin/cxx/proxy_image.cc4
-rw-r--r--src/bin/cxx/proxy_image_offscreen.cc2
-rw-r--r--src/bin/cxx/proxy_text_fixed.cc73
-rw-r--r--src/bin/cxx/rect_blend_pow2.cc16
-rw-r--r--src/bin/cxx/rect_blend_pow2_few.cc28
-rw-r--r--src/bin/cxx/rect_solid.cc16
-rw-r--r--src/bin/cxx/rect_solid_few.cc30
-rw-r--r--src/bin/cxx/tests.h10
-rw-r--r--src/bin/cxx/text_basic.cc2
-rw-r--r--src/bin/cxx/text_change.cc2
-rw-r--r--src/bin/cxx/text_styles.cc61
-rw-r--r--src/bin/cxx/text_styles_different_strings.cc30
-rw-r--r--src/bin/cxx/widgets_file_icons.cc51
-rw-r--r--src/bin/cxx/widgets_file_icons_2.cc52
-rw-r--r--src/bin/cxx/widgets_file_icons_2_grouped.cc61
-rw-r--r--src/bin/cxx/widgets_file_icons_2_same.cc47
-rw-r--r--src/bin/cxx/widgets_file_icons_2_same_grouped.cc67
-rw-r--r--src/bin/cxx/widgets_file_icons_3.cc50
-rw-r--r--src/bin/cxx/widgets_file_icons_4.cc49
-rw-r--r--src/bin/cxx/widgets_list_1.cc53
-rw-r--r--src/bin/cxx/widgets_list_1_grouped.cc60
-rw-r--r--src/bin/cxx/widgets_list_2.cc51
-rw-r--r--src/bin/cxx/widgets_list_2_grouped.cc60
-rw-r--r--src/bin/cxx/widgets_list_3.cc71
-rw-r--r--src/bin/cxx/widgets_list_3_grouped.cc98
-rw-r--r--src/bin/cxx/widgets_list_4.cc73
-rw-r--r--src/bin/cxx/widgets_list_4_grouped.cc99
-rw-r--r--src/bin/tests.h2
85 files changed, 864 insertions, 823 deletions
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index c732326..feb4d93 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -13,9 +13,8 @@ AM_CPPFLAGS = \
13bin_PROGRAMS = expedite 13bin_PROGRAMS = expedite
14bin_SCRIPTS = expedite-cmp 14bin_SCRIPTS = expedite-cmp
15 15
16# XXX
16cxx_sources = \ 17cxx_sources = \
17cxx/font_effect_blur_alpha.cc \
18cxx/font_effect_blur_alpha_capi.h \
19cxx/image_blend_border.cc \ 18cxx/image_blend_border.cc \
20cxx/image_blend_border_capi.h \ 19cxx/image_blend_border_capi.h \
21cxx/image_blend_border_recolor.cc \ 20cxx/image_blend_border_recolor.cc \
@@ -173,7 +172,6 @@ cxx/textblock_intl.cc \
173cxx/textblock_intl_capi.h \ 172cxx/textblock_intl_capi.h \
174cxx/textblock_text_append.cc \ 173cxx/textblock_text_append.cc \
175cxx/textblock_text_append_capi.h \ 174cxx/textblock_text_append_capi.h \
176cxx/widgets__*_capi.h \
177cxx/widgets_file_icons.cc \ 175cxx/widgets_file_icons.cc \
178cxx/widgets_file_icons_2.cc \ 176cxx/widgets_file_icons_2.cc \
179cxx/widgets_file_icons_2_capi.h \ 177cxx/widgets_file_icons_2_capi.h \
@@ -203,7 +201,9 @@ cxx/widgets_list_3_grouped_capi.h \
203cxx/widgets_list_4.cc \ 201cxx/widgets_list_4.cc \
204cxx/widgets_list_4_capi.h \ 202cxx/widgets_list_4_capi.h \
205cxx/widgets_list_4_grouped.cc \ 203cxx/widgets_list_4_grouped.cc \
206cxx/widgets_list_4_grouped_capi.h 204cxx/widgets_list_4_grouped_capi.h \
205cxx/font_effect_blur_alpha.cc \
206cxx/font_effect_blur_alpha_capi.h
207 207
208expedite_SOURCES = \ 208expedite_SOURCES = \
209main.c main.h \ 209main.c main.h \
@@ -306,6 +306,7 @@ image_blend_many_smooth_same_scaled.c \
306font_effect_blur_alpha.c \ 306font_effect_blur_alpha.c \
307font_effect_blur_color.c \ 307font_effect_blur_color.c \
308${cxx_sources} 308${cxx_sources}
309
309# \ 310# \
310# image_mask.c \ 311# image_mask.c \
311# image_mask_2.c \ 312# image_mask_2.c \
diff --git a/src/bin/cxx/image_blend_border.cc b/src/bin/cxx/image_blend_border.cc
index de4bde6..9f859fa 100644
--- a/src/bin/cxx/image_blend_border.cc
+++ b/src/bin/cxx/image_blend_border.cc
@@ -26,9 +26,9 @@ static void _setup()
26 evas::canvas canvas(::eo_ref(G_evas)); 26 evas::canvas canvas(::eo_ref(G_evas));
27 for (int i = 0; i < OBNUM; i++) 27 for (int i = 0; i < OBNUM; i++)
28 { 28 {
29 evas::image o(efl::eo::parent = canvas); // XXX 29 evas::image o(efl::eo::parent = canvas); // XXX:
30 images.push_back(o); 30 images.push_back(o);
31 o.file_set(::build_path("bar.png"), ""); // XXX 31 eo_do(o._eo_ptr(), efl_file_set(build_path("bar.png"), NULL)); // XXX
32 o.border_set(6, 6, 6, 6); 32 o.border_set(6, 6, 6, 6);
33 o.visibility_set(true); 33 o.visibility_set(true);
34 } 34 }
diff --git a/src/bin/cxx/image_blend_border_recolor.cc b/src/bin/cxx/image_blend_border_recolor.cc
index bf2b81d..e1435da 100644
--- a/src/bin/cxx/image_blend_border_recolor.cc
+++ b/src/bin/cxx/image_blend_border_recolor.cc
@@ -28,7 +28,7 @@ static void _setup(void)
28 { 28 {
29 evas::image o(efl::eo::parent = canvas); 29 evas::image o(efl::eo::parent = canvas);
30 images.push_back(o); 30 images.push_back(o);
31 o.file_set(::build_path("pan.png"), ""); 31 eo_do(o._eo_ptr(), efl_file_set(::build_path("pan.png"), NULL)); // XXX
32 o.color_set(64, 64, 64, 255); 32 o.color_set(64, 64, 64, 255);
33 o.border_set(3, 3, 3, 3); 33 o.border_set(3, 3, 3, 3);
34 o.visibility_set(true); 34 o.visibility_set(true);
diff --git a/src/bin/cxx/image_blend_fade_pow2_unscaled.cc b/src/bin/cxx/image_blend_fade_pow2_unscaled.cc
index ef82f70..82c6ce5 100644
--- a/src/bin/cxx/image_blend_fade_pow2_unscaled.cc
+++ b/src/bin/cxx/image_blend_fade_pow2_unscaled.cc
@@ -29,7 +29,7 @@ static void _setup(void)
29 evas::image o(efl::eo::parent = canvas); 29 evas::image o(efl::eo::parent = canvas);
30 images.push_back(o); 30 images.push_back(o);
31 31
32 o.file_set(::build_path("logo.png"), ""); 32 eo_do(o._eo_ptr(), efl_file_set(::build_path("logo.png"), NULL)); // XXX
33 o.fill_set(0, 0, 120, 160); 33 o.fill_set(0, 0, 120, 160);
34 o.evas::object::size_set(120, 160); 34 o.evas::object::size_set(120, 160);
35 35
diff --git a/src/bin/cxx/image_blend_fade_unscaled.cc b/src/bin/cxx/image_blend_fade_unscaled.cc
index 3a9405e..634f0dd 100644
--- a/src/bin/cxx/image_blend_fade_unscaled.cc
+++ b/src/bin/cxx/image_blend_fade_unscaled.cc
@@ -28,7 +28,7 @@ static void _setup(void)
28 { 28 {
29 evas::image o(efl::eo::parent = canvas); 29 evas::image o(efl::eo::parent = canvas);
30 images.push_back(o); 30 images.push_back(o);
31 o.file_set(::build_path("logo.png"), ""); 31 eo_do(o._eo_ptr(), efl_file_set(::build_path("logo.png"), NULL)); // XXX
32 o.fill_set(0, 0, 120, 160); 32 o.fill_set(0, 0, 120, 160);
33 o.evas::object::size_set(120, 160); 33 o.evas::object::size_set(120, 160);
34 34
diff --git a/src/bin/cxx/image_blend_many_smooth_same_scaled.cc b/src/bin/cxx/image_blend_many_smooth_same_scaled.cc
index 5c5f076..fe3fdce 100644
--- a/src/bin/cxx/image_blend_many_smooth_same_scaled.cc
+++ b/src/bin/cxx/image_blend_many_smooth_same_scaled.cc
@@ -33,7 +33,7 @@ static void _setup(void)
33 int n = rnd() % 100; 33 int n = rnd() % 100;
34 int w = 3 + ((n * (60 - 3)) / 100); 34 int w = 3 + ((n * (60 - 3)) / 100);
35 int h = 4 + ((n * (80 - 4)) / 100); 35 int h = 4 + ((n * (80 - 4)) / 100);
36 o.file_set(build_path("logo.png"), ""); 36 eo_do(o._eo_ptr(), efl_file_set(build_path("logo.png"), NULL)); // XXX
37 o.smooth_scale_set(1); 37 o.smooth_scale_set(1);
38 o.evas::object::size_set(w, h); 38 o.evas::object::size_set(w, h);
39 o.fill_set(0, 0, w, h); 39 o.fill_set(0, 0, w, h);
@@ -59,9 +59,9 @@ static void _loop(double t, int f)
59 Evas_Coord w, h; 59 Evas_Coord w, h;
60 img.evas::object::size_get(&w, &h); 60 img.evas::object::size_get(&w, &h);
61 Evas_Coord x = (win_w / 2) - (w / 2); 61 Evas_Coord x = (win_w / 2) - (w / 2);
62 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 2); 62 x += ::sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 2);
63 Evas_Coord y = (win_h / 2) - (h / 2); 63 Evas_Coord y = (win_h / 2) - (h / 2);
64 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 2); 64 y += ::cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 2);
65 img.evas::object::position_set(x, y); 65 img.evas::object::position_set(x, y);
66 ++i; 66 ++i;
67 } 67 }
diff --git a/src/bin/cxx/image_blend_nearest_same_scaled.cc b/src/bin/cxx/image_blend_nearest_same_scaled.cc
index 4bb4353..8dba0c2 100644
--- a/src/bin/cxx/image_blend_nearest_same_scaled.cc
+++ b/src/bin/cxx/image_blend_nearest_same_scaled.cc
@@ -28,7 +28,7 @@ static void _setup(void)
28 { 28 {
29 evas::image o(efl::eo::parent = canvas); 29 evas::image o(efl::eo::parent = canvas);
30 images.push_back(o); 30 images.push_back(o);
31 o.file_set(build_path("logo.png"), ""); 31 eo_do(o._eo_ptr(), efl_file_set(build_path("logo.png"), NULL)); // XXX
32 o.smooth_scale_set(0); 32 o.smooth_scale_set(0);
33 o.visibility_set(true); 33 o.visibility_set(true);
34 } 34 }
@@ -57,7 +57,7 @@ static void _loop(double t, int f)
57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
58 Evas_Coord y = (win_h / 2) - (h / 2); 58 Evas_Coord y = (win_h / 2) - (h / 2);
59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
60 img.position_set(x, y); 60 img.evas::object::position_set(x, y);
61 img.evas::object::size_set(w, h); 61 img.evas::object::size_set(w, h);
62 img.fill_set(0, 0, w, h); 62 img.fill_set(0, 0, w, h);
63 ++i; 63 ++i;
diff --git a/src/bin/cxx/image_blend_nearest_scaled.cc b/src/bin/cxx/image_blend_nearest_scaled.cc
index 8bf8b63..47104fa 100644
--- a/src/bin/cxx/image_blend_nearest_scaled.cc
+++ b/src/bin/cxx/image_blend_nearest_scaled.cc
@@ -28,7 +28,7 @@ static void _setup(void)
28 { 28 {
29 evas::image o(efl::eo::parent = canvas); 29 evas::image o(efl::eo::parent = canvas);
30 images.push_back(o); 30 images.push_back(o);
31 o.file_set(build_path("logo.png"), ""); 31 eo_do(o._eo_ptr(), efl_file_set(build_path("logo.png"), NULL)); // XXX
32 o.smooth_scale_set(0); 32 o.smooth_scale_set(0);
33 o.visibility_set(true); 33 o.visibility_set(true);
34 } 34 }
@@ -57,7 +57,7 @@ static void _loop(double t, int f)
57 Evas_Coord y = (win_h / 2) - (h / 2); 57 Evas_Coord y = (win_h / 2) - (h / 2);
58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
60 img.position_set(x, y); 60 img.evas::object::position_set(x, y);
61 img.evas::object::size_set(w, h); 61 img.evas::object::size_set(w, h);
62 img.fill_set(0, 0, w, h); 62 img.fill_set(0, 0, w, h);
63 ++i; 63 ++i;
diff --git a/src/bin/cxx/image_blend_nearest_solid_same_scaled.cc b/src/bin/cxx/image_blend_nearest_solid_same_scaled.cc
index d5e620e..8b30c7e 100644
--- a/src/bin/cxx/image_blend_nearest_solid_same_scaled.cc
+++ b/src/bin/cxx/image_blend_nearest_solid_same_scaled.cc
@@ -28,7 +28,7 @@ static void _setup(void)
28 { 28 {
29 evas::image o(efl::eo::parent = canvas); 29 evas::image o(efl::eo::parent = canvas);
30 images.push_back(o); 30 images.push_back(o);
31 o.file_set(build_path("image.png"), ""); 31 eo_do(o._eo_ptr(), efl_file_set(build_path("image.png"), NULL)); // XXX
32 o.smooth_scale_set(0); 32 o.smooth_scale_set(0);
33 o.visibility_set(EINA_TRUE); 33 o.visibility_set(EINA_TRUE);
34 } 34 }
@@ -57,7 +57,7 @@ static void _loop(double t, int f)
57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
58 Evas_Coord y = (win_h / 2) - (h / 2); 58 Evas_Coord y = (win_h / 2) - (h / 2);
59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
60 img.position_set(x, y); 60 img.evas::object::position_set(x, y);
61 img.evas::object::size_set(w, h); 61 img.evas::object::size_set(w, h);
62 img.fill_set(0, 0, w, h); 62 img.fill_set(0, 0, w, h);
63 ++i; 63 ++i;
diff --git a/src/bin/cxx/image_blend_nearest_solid_scaled.cc b/src/bin/cxx/image_blend_nearest_solid_scaled.cc
index 0739b35..4522913 100644
--- a/src/bin/cxx/image_blend_nearest_solid_scaled.cc
+++ b/src/bin/cxx/image_blend_nearest_solid_scaled.cc
@@ -28,7 +28,7 @@ static void _setup(void)
28 { 28 {
29 evas::image o(efl::eo::parent = canvas); 29 evas::image o(efl::eo::parent = canvas);
30 images.push_back(o); 30 images.push_back(o);
31 o.file_set(build_path("image.png"), ""); 31 eo_do(o._eo_ptr(), efl_file_set(build_path("image.png"), NULL)); // XXX
32 o.smooth_scale_set(0); 32 o.smooth_scale_set(0);
33 o.visibility_set(true); 33 o.visibility_set(true);
34 } 34 }
@@ -57,7 +57,7 @@ static void _loop(double t, int f)
57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
58 Evas_Coord y = (win_h / 2) - (h / 2); 58 Evas_Coord y = (win_h / 2) - (h / 2);
59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
60 img.position_set(x, y); 60 img.evas::object::position_set(x, y);
61 img.evas::object::size_set(w, h); 61 img.evas::object::size_set(w, h);
62 img.fill_set(0, 0, w, h); 62 img.fill_set(0, 0, w, h);
63 ++i; 63 ++i;
diff --git a/src/bin/cxx/image_blend_occlude1.cc b/src/bin/cxx/image_blend_occlude1.cc
index 7615e29..bf2db13 100644
--- a/src/bin/cxx/image_blend_occlude1.cc
+++ b/src/bin/cxx/image_blend_occlude1.cc
@@ -31,7 +31,7 @@ static void _setup(void)
31 images.push_back(o); 31 images.push_back(o);
32 if (i < (OBNUM / 2)) 32 if (i < (OBNUM / 2))
33 { 33 {
34 o.file_set(build_path("logo.png"), ""); 34 eo_do(o._eo_ptr(), efl_file_set(build_path("logo.png"), NULL)); // XXX
35 } 35 }
36 else 36 else
37 { 37 {
@@ -39,7 +39,7 @@ static void _setup(void)
39 39
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 o.file_set(build_path("image.png"), ""); 42 eo_do(o._eo_ptr(), efl_file_set(build_path("image.png"), NULL)); // XXX
43 o.evas::object::position_set(x, y); 43 o.evas::object::position_set(x, y);
44 } 44 }
45 o.fill_set(0, 0, 120, 160); 45 o.fill_set(0, 0, 120, 160);
@@ -71,7 +71,7 @@ static void _loop(double t, int f)
71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
72 Evas_Coord y = (win_h / 2) - (h / 2); 72 Evas_Coord y = (win_h / 2) - (h / 2);
73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
74 img.position_set(x, y); 74 img.evas::object::position_set(x, y);
75 } 75 }
76 ++i; 76 ++i;
77 } 77 }
diff --git a/src/bin/cxx/image_blend_occlude1_few.cc b/src/bin/cxx/image_blend_occlude1_few.cc
index 6d88350..6be38fa 100644
--- a/src/bin/cxx/image_blend_occlude1_few.cc
+++ b/src/bin/cxx/image_blend_occlude1_few.cc
@@ -34,7 +34,7 @@ static void _setup(void)
34 images.push_back(o); 34 images.push_back(o);
35 if (i < (OBNUM / 2)) 35 if (i < (OBNUM / 2))
36 { 36 {
37 o.file_set(PACKAGE_DATA_DIR"/data/logo.png", ""); 37 eo_do(o._eo_ptr(), efl_file_set(PACKAGE_DATA_DIR"/data/logo.png", NULL)); // XXX
38 } 38 }
39 else 39 else
40 { 40 {
@@ -42,7 +42,7 @@ static void _setup(void)
42 42
43 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 43 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
44 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 44 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
45 o.file_set(PACKAGE_DATA_DIR"/data/image.png", ""); 45 eo_do(o._eo_ptr(), efl_file_set(PACKAGE_DATA_DIR"/data/image.png", NULL)); // XXX
46 o.evas::object::position_set(x, y); 46 o.evas::object::position_set(x, y);
47 } 47 }
48 o.fill_set(0, 0, 120, 160); 48 o.fill_set(0, 0, 120, 160);
@@ -74,7 +74,7 @@ static void _loop(double t, int f)
74 Evas_Coord y = (win_h / 2) - (h / 2); 74 Evas_Coord y = (win_h / 2) - (h / 2);
75 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 75 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
76 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 76 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
77 img.position_set(x, y); 77 img.evas::object::position_set(x, y);
78 } 78 }
79 ++i; 79 ++i;
80 } 80 }
diff --git a/src/bin/cxx/image_blend_occlude1_many.cc b/src/bin/cxx/image_blend_occlude1_many.cc
index ca441ac..e8a8a2d 100644
--- a/src/bin/cxx/image_blend_occlude1_many.cc
+++ b/src/bin/cxx/image_blend_occlude1_many.cc
@@ -34,14 +34,14 @@ static void _setup(void)
34 images.push_back(o); 34 images.push_back(o);
35 if (i < (OBNUM / 2)) 35 if (i < (OBNUM / 2))
36 { 36 {
37 o.file_set(build_path("logo.png"), ""); 37 eo_do(o._eo_ptr(), efl_file_set(build_path("logo.png"), NULL)); // XXX
38 } 38 }
39 else 39 else
40 { 40 {
41 Evas_Coord x, y; 41 Evas_Coord x, y;
42 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 42 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
43 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 43 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
44 o.file_set(build_path("image.png"), ""); 44 eo_do(o._eo_ptr(), efl_file_set(build_path("image.png"), NULL)); // XXX
45 o.evas::object::position_set(x, y); 45 o.evas::object::position_set(x, y);
46 } 46 }
47 o.fill_set(0, 0, 120, 160); 47 o.fill_set(0, 0, 120, 160);
@@ -73,7 +73,7 @@ static void _loop(double t, int f)
73 Evas_Coord y = (win_h / 2) - (h / 2); 73 Evas_Coord y = (win_h / 2) - (h / 2);
74 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 74 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
76 img.position_set(x, y); 76 img.evas::object::position_set(x, y);
77 } 77 }
78 ++i; 78 ++i;
79 } 79 }
diff --git a/src/bin/cxx/image_blend_occlude1_very_many.cc b/src/bin/cxx/image_blend_occlude1_very_many.cc
index 546ab20..985b636 100644
--- a/src/bin/cxx/image_blend_occlude1_very_many.cc
+++ b/src/bin/cxx/image_blend_occlude1_very_many.cc
@@ -36,13 +36,13 @@ static void _setup(void)
36 images.push_back(o); 36 images.push_back(o);
37 if (i < (OBNUM / 2)) 37 if (i < (OBNUM / 2))
38 { 38 {
39 o.file_set(build_path("logo.png"), ""); 39 eo_do(o._eo_ptr(), efl_file_set(build_path("logo.png"), NULL)); // XXX
40 } 40 }
41 else 41 else
42 { 42 {
43 Evas_Coord x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 43 Evas_Coord x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
44 Evas_Coord y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 44 Evas_Coord y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
45 o.file_set(build_path("image.png"), ""); 45 eo_do(o._eo_ptr(), efl_file_set(build_path("image.png"), NULL)); // XXX
46 o.evas::object::position_set(x, y); 46 o.evas::object::position_set(x, y);
47 } 47 }
48 o.fill_set(0, 0, 120, 160); 48 o.fill_set(0, 0, 120, 160);
@@ -74,7 +74,7 @@ static void _loop(double t, int f)
74 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 74 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
75 Evas_Coord y = (win_h / 2) - (h / 2); 75 Evas_Coord y = (win_h / 2) - (h / 2);
76 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 76 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
77 img.position_set(x, y); 77 img.evas::object::position_set(x, y);
78 } 78 }
79 ++i; 79 ++i;
80 } 80 }
diff --git a/src/bin/cxx/image_blend_occlude2.cc b/src/bin/cxx/image_blend_occlude2.cc
index e5b786e..7b1c0f3 100644
--- a/src/bin/cxx/image_blend_occlude2.cc
+++ b/src/bin/cxx/image_blend_occlude2.cc
@@ -33,14 +33,14 @@ static void _setup(void)
33 images.push_back(o); 33 images.push_back(o);
34 if (i & 0x1) 34 if (i & 0x1)
35 { 35 {
36 o.file_set(build_path("logo.png"), ""); 36 eo_do(o._eo_ptr(), efl_file_set(build_path("logo.png"), NULL)); // XXX
37 } 37 }
38 else 38 else
39 { 39 {
40 Evas_Coord x, y; 40 Evas_Coord x, y;
41 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 41 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
42 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 42 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
43 o.file_set(build_path("image.png"), ""); 43 eo_do(o._eo_ptr(), efl_file_set(build_path("image.png"), NULL)); // XXX
44 o.evas::object::position_set(x, y); 44 o.evas::object::position_set(x, y);
45 } 45 }
46 o.fill_set(0, 0, 120, 160); 46 o.fill_set(0, 0, 120, 160);
@@ -72,7 +72,7 @@ static void _loop(double t, int f)
72 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 72 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
73 Evas_Coord y = (win_h / 2) - (h / 2); 73 Evas_Coord y = (win_h / 2) - (h / 2);
74 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 74 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
75 img.position_set(x, y); 75 img.evas::object::position_set(x, y);
76 } 76 }
77 ++i; 77 ++i;
78 } 78 }
diff --git a/src/bin/cxx/image_blend_occlude2_few.cc b/src/bin/cxx/image_blend_occlude2_few.cc
index c2c458c..0f08934 100644
--- a/src/bin/cxx/image_blend_occlude2_few.cc
+++ b/src/bin/cxx/image_blend_occlude2_few.cc
@@ -36,13 +36,13 @@ static void _setup(void)
36 images.push_back(o); 36 images.push_back(o);
37 if (i & 0x1) 37 if (i & 0x1)
38 { 38 {
39 o.file_set(build_path("logo.png"), ""); 39 eo_do(o._eo_ptr(), efl_file_set(build_path("logo.png"), NULL)); // XXX
40 } 40 }
41 else 41 else
42 { 42 {
43 Evas_Coord x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 43 Evas_Coord x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
44 Evas_Coord y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 44 Evas_Coord y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
45 o.file_set(build_path("image.png"), ""); 45 eo_do(o._eo_ptr(), efl_file_set(build_path("image.png"), NULL)); // XXX
46 o.evas::object::position_set(x, y); 46 o.evas::object::position_set(x, y);
47 } 47 }
48 o.fill_set(0, 0, 120, 160); 48 o.fill_set(0, 0, 120, 160);
@@ -74,7 +74,7 @@ static void _loop(double t, int f)
74 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 74 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
75 Evas_Coord y = (win_h / 2) - (h / 2); 75 Evas_Coord y = (win_h / 2) - (h / 2);
76 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 76 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
77 img.position_set(x, y); 77 img.evas::object::position_set(x, y);
78 } 78 }
79 ++i; 79 ++i;
80 } 80 }
diff --git a/src/bin/cxx/image_blend_occlude2_many.cc b/src/bin/cxx/image_blend_occlude2_many.cc
index b98f161..4ab8cce 100644
--- a/src/bin/cxx/image_blend_occlude2_many.cc
+++ b/src/bin/cxx/image_blend_occlude2_many.cc
@@ -36,7 +36,7 @@ static void _setup(void)
36 images.push_back(o); 36 images.push_back(o);
37 if (i & 0x1) 37 if (i & 0x1)
38 { 38 {
39 o.file_set(build_path("logo.png"), ""); 39 eo_do(o._eo_ptr(), efl_file_set(build_path("logo.png"), NULL)); // XXX
40 } 40 }
41 else 41 else
42 { 42 {
@@ -44,7 +44,7 @@ static void _setup(void)
44 44
45 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 45 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
46 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 46 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
47 o.file_set(build_path("image.png"), ""); 47 eo_do(o._eo_ptr(), efl_file_set(build_path("image.png"), NULL)); // XXX
48 o.evas::object::position_set(x, y); 48 o.evas::object::position_set(x, y);
49 } 49 }
50 o.fill_set(0, 0, 120, 160); 50 o.fill_set(0, 0, 120, 160);
@@ -76,7 +76,7 @@ static void _loop(double t, int f)
76 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 76 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
77 Evas_Coord y = (win_h / 2) - (h / 2); 77 Evas_Coord y = (win_h / 2) - (h / 2);
78 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 78 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
79 img.position_set(x, y); 79 img.evas::object::position_set(x, y);
80 } 80 }
81 ++i; 81 ++i;
82 } 82 }
diff --git a/src/bin/cxx/image_blend_occlude2_very_many.cc b/src/bin/cxx/image_blend_occlude2_very_many.cc
index 49ef504..cf34fb8 100644
--- a/src/bin/cxx/image_blend_occlude2_very_many.cc
+++ b/src/bin/cxx/image_blend_occlude2_very_many.cc
@@ -36,13 +36,13 @@ static void _setup(void)
36 images.push_back(o); 36 images.push_back(o);
37 if (i & 0x1) 37 if (i & 0x1)
38 { 38 {
39 o.file_set(build_path("logo.png"), ""); 39 eo_do(o._eo_ptr(), efl_file_set(build_path("logo.png"), NULL)); // XXX
40 } 40 }
41 else 41 else
42 { 42 {
43 Evas_Coord x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 43 Evas_Coord x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
44 Evas_Coord y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 44 Evas_Coord y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
45 o.file_set(build_path("image.png"), ""); 45 eo_do(o._eo_ptr(), efl_file_set(build_path("image.png"), NULL)); // XXX
46 o.evas::object::position_set(x, y); 46 o.evas::object::position_set(x, y);
47 } 47 }
48 o.fill_set(0, 0, 120, 160); 48 o.fill_set(0, 0, 120, 160);
@@ -74,7 +74,7 @@ static void _loop(double t, int f)
74 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 74 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
75 Evas_Coord y = (win_h / 2) - (h / 2); 75 Evas_Coord y = (win_h / 2) - (h / 2);
76 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 76 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
77 img.position_set(x, y); 77 img.evas::object::position_set(x, y);
78 } 78 }
79 ++i; 79 ++i;
80 } 80 }
diff --git a/src/bin/cxx/image_blend_occlude3.cc b/src/bin/cxx/image_blend_occlude3.cc
index 22dd3d9..86b6381 100644
--- a/src/bin/cxx/image_blend_occlude3.cc
+++ b/src/bin/cxx/image_blend_occlude3.cc
@@ -33,7 +33,7 @@ static void _setup(void)
33 images.push_back(o); 33 images.push_back(o);
34 if (i > (OBNUM / 2)) 34 if (i > (OBNUM / 2))
35 { 35 {
36 o.file_set(build_path("logo.png"), ""); 36 eo_do(o._eo_ptr(), efl_file_set(build_path("logo.png"), NULL)); // XXX
37 } 37 }
38 else 38 else
39 { 39 {
@@ -41,7 +41,7 @@ static void _setup(void)
41 41
42 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 42 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
43 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 43 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
44 o.file_set(build_path("image.png"), ""); 44 eo_do(o._eo_ptr(), efl_file_set(build_path("image.png"), NULL)); // XXX
45 o.evas::object::position_set(x, y); 45 o.evas::object::position_set(x, y);
46 } 46 }
47 o.fill_set(0, 0, 120, 160); 47 o.fill_set(0, 0, 120, 160);
@@ -73,7 +73,7 @@ static void _loop(double t, int f)
73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
74 Evas_Coord y = (win_h / 2) - (h / 2); 74 Evas_Coord y = (win_h / 2) - (h / 2);
75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
76 img.position_set(x, y); 76 img.evas::object::position_set(x, y);
77 } 77 }
78 ++i; 78 ++i;
79 } 79 }
diff --git a/src/bin/cxx/image_blend_occlude3_few.cc b/src/bin/cxx/image_blend_occlude3_few.cc
index bfcbee3..69cbabd 100644
--- a/src/bin/cxx/image_blend_occlude3_few.cc
+++ b/src/bin/cxx/image_blend_occlude3_few.cc
@@ -36,7 +36,7 @@ static void _setup(void)
36 images.push_back(o); 36 images.push_back(o);
37 if (i > (OBNUM / 2)) 37 if (i > (OBNUM / 2))
38 { 38 {
39 o.file_set(build_path("logo.png"), ""); 39 eo_do(o._eo_ptr(), efl_file_set(build_path("logo.png"), NULL)); // XXX
40 } 40 }
41 else 41 else
42 { 42 {
@@ -44,7 +44,7 @@ static void _setup(void)
44 44
45 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 45 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
46 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 46 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
47 o.file_set(build_path("image.png"), ""); 47 eo_do(o._eo_ptr(), efl_file_set(build_path("image.png"), NULL)); // XXX
48 o.evas::object::position_set(x, y); 48 o.evas::object::position_set(x, y);
49 } 49 }
50 o.fill_set(0, 0, 120, 160); 50 o.fill_set(0, 0, 120, 160);
@@ -76,7 +76,7 @@ static void _loop(double t, int f)
76 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 76 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
77 Evas_Coord y = (win_h / 2) - (h / 2); 77 Evas_Coord y = (win_h / 2) - (h / 2);
78 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 78 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
79 img.position_set(x, y); 79 img.evas::object::position_set(x, y);
80 } 80 }
81 ++i; 81 ++i;
82 } 82 }
diff --git a/src/bin/cxx/image_blend_occlude3_many.cc b/src/bin/cxx/image_blend_occlude3_many.cc
index b9a3df2..714d5eb 100644
--- a/src/bin/cxx/image_blend_occlude3_many.cc
+++ b/src/bin/cxx/image_blend_occlude3_many.cc
@@ -34,13 +34,13 @@ static void _setup(void)
34 images.push_back(o); 34 images.push_back(o);
35 if (i > (OBNUM / 2)) 35 if (i > (OBNUM / 2))
36 { 36 {
37 o.file_set(build_path("logo.png"), ""); 37 eo_do(o._eo_ptr(), efl_file_set(build_path("logo.png"), NULL)); // XXX
38 } 38 }
39 else 39 else
40 { 40 {
41 Evas_Coord x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 41 Evas_Coord x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
42 Evas_Coord y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 42 Evas_Coord y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
43 o.file_set(build_path("image.png"), ""); 43 eo_do(o._eo_ptr(), efl_file_set(build_path("image.png"), NULL)); // XXX
44 o.evas::object::position_set(x, y); 44 o.evas::object::position_set(x, y);
45 } 45 }
46 o.fill_set(0, 0, 120, 160); 46 o.fill_set(0, 0, 120, 160);
@@ -72,7 +72,7 @@ static void _loop(double t, int f)
72 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 72 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
73 Evas_Coord y = (win_h / 2) - (h / 2); 73 Evas_Coord y = (win_h / 2) - (h / 2);
74 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 74 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
75 img.position_set(x, y); 75 img.evas::object::position_set(x, y);
76 } 76 }
77 ++i; 77 ++i;
78 } 78 }
diff --git a/src/bin/cxx/image_blend_occlude3_very_many.cc b/src/bin/cxx/image_blend_occlude3_very_many.cc
index e2326f9..36b51e2 100644
--- a/src/bin/cxx/image_blend_occlude3_very_many.cc
+++ b/src/bin/cxx/image_blend_occlude3_very_many.cc
@@ -35,13 +35,13 @@ static void _setup(void)
35 images.push_back(o); 35 images.push_back(o);
36 if (i > (OBNUM / 2)) 36 if (i > (OBNUM / 2))
37 { 37 {
38 o.file_set(build_path("logo.png"), ""); 38 eo_do(o._eo_ptr(), efl_file_set(build_path("logo.png"), NULL)); // XXX
39 } 39 }
40 else 40 else
41 { 41 {
42 Evas_Coord x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 42 Evas_Coord x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
43 Evas_Coord y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 43 Evas_Coord y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
44 o.file_set(build_path("image.png"), ""); 44 eo_do(o._eo_ptr(), efl_file_set(build_path("image.png"), NULL)); // XXX
45 o.evas::object::position_set(x, y); 45 o.evas::object::position_set(x, y);
46 } 46 }
47 o.fill_set(0, 0, 120, 160); 47 o.fill_set(0, 0, 120, 160);
@@ -73,7 +73,7 @@ static void _loop(double t, int f)
73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
74 Evas_Coord y = (win_h / 2) - (h / 2); 74 Evas_Coord y = (win_h / 2) - (h / 2);
75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
76 img.position_set(x, y); 76 img.evas::object::position_set(x, y);
77 } 77 }
78 ++i; 78 ++i;
79 } 79 }
diff --git a/src/bin/cxx/image_blend_smooth_same_scaled.cc b/src/bin/cxx/image_blend_smooth_same_scaled.cc
index 7f992b7..c7a9a89 100644
--- a/src/bin/cxx/image_blend_smooth_same_scaled.cc
+++ b/src/bin/cxx/image_blend_smooth_same_scaled.cc
@@ -29,7 +29,7 @@ static void _setup(void)
29 { 29 {
30 evas::image o(efl::eo::parent = canvas); 30 evas::image o(efl::eo::parent = canvas);
31 images.push_back(o); 31 images.push_back(o);
32 o.file_set(build_path("logo.png"), ""); 32 eo_do(o._eo_ptr(), efl_file_set(build_path("logo.png"), NULL)); // XXX
33 o.smooth_scale_set(1); 33 o.smooth_scale_set(1);
34 o.visibility_set(true); 34 o.visibility_set(true);
35 } 35 }
@@ -58,7 +58,7 @@ static void _loop(double t, int f)
58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
59 Evas_Coord y = (win_h / 2) - (h / 2); 59 Evas_Coord y = (win_h / 2) - (h / 2);
60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
61 img.position_set(x, y); 61 img.evas::object::position_set(x, y);
62 img.evas::object::size_set(w, h); 62 img.evas::object::size_set(w, h);
63 img.fill_set(0, 0, w, h); 63 img.fill_set(0, 0, w, h);
64 ++i; 64 ++i;
diff --git a/src/bin/cxx/image_blend_smooth_scaled.cc b/src/bin/cxx/image_blend_smooth_scaled.cc
index e0ec1fd..ece6c14 100644
--- a/src/bin/cxx/image_blend_smooth_scaled.cc
+++ b/src/bin/cxx/image_blend_smooth_scaled.cc
@@ -28,7 +28,7 @@ static void _setup(void)
28 { 28 {
29 evas::image o(efl::eo::parent = canvas); 29 evas::image o(efl::eo::parent = canvas);
30 images.push_back(o); 30 images.push_back(o);
31 o.file_set(build_path("logo.png"), ""); 31 eo_do(o._eo_ptr(), efl_file_set(build_path("logo.png"), NULL)); // XXX
32 o.smooth_scale_set(1); 32 o.smooth_scale_set(1);
33 o.visibility_set(true); 33 o.visibility_set(true);
34 } 34 }
@@ -54,11 +54,11 @@ static void _loop(double t, int f)
54 Evas_Coord w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2); 54 Evas_Coord w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
55 Evas_Coord h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2); 55 Evas_Coord h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
56 Evas_Coord x = (win_w / 2) - (w / 2); 56 Evas_Coord x = (win_w / 2) - (w / 2);
57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 57 x += ::sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
58 Evas_Coord y = (win_h / 2) - (h / 2); 58 Evas_Coord y = (win_h / 2) - (h / 2);
59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 59 y += ::cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
60 img.position_set(x, y); 60 img.evas::object::position_set(x, y);
61 img.size_set(w, h); 61 img.evas::object::size_set(w, h);
62 img.fill_set(0, 0, w, h); 62 img.fill_set(0, 0, w, h);
63 ++i; 63 ++i;
64 } 64 }
diff --git a/src/bin/cxx/image_blend_smooth_solid_same_scaled.cc b/src/bin/cxx/image_blend_smooth_solid_same_scaled.cc
index d9939d9..bad5a53 100644
--- a/src/bin/cxx/image_blend_smooth_solid_same_scaled.cc
+++ b/src/bin/cxx/image_blend_smooth_solid_same_scaled.cc
@@ -28,7 +28,7 @@ static void _setup(void)
28 { 28 {
29 evas::image o(efl::eo::parent = canvas); 29 evas::image o(efl::eo::parent = canvas);
30 images.push_back(o); 30 images.push_back(o);
31 o.file_set(build_path("image.png"), ""); 31 eo_do(o._eo_ptr(), efl_file_set(build_path("image.png"), NULL)); // XXX
32 o.smooth_scale_set(1); 32 o.smooth_scale_set(1);
33 o.visibility_set(true); 33 o.visibility_set(true);
34 } 34 }
@@ -57,8 +57,8 @@ static void _loop(double t, int f)
57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
58 Evas_Coord y = (win_h / 2) - (h / 2); 58 Evas_Coord y = (win_h / 2) - (h / 2);
59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
60 img.position_set(x, y); 60 img.evas::object::position_set(x, y);
61 img.size_set(w, h); 61 img.evas::object::size_set(w, h);
62 img.fill_set(0, 0, w, h); 62 img.fill_set(0, 0, w, h);
63 ++i; 63 ++i;
64 } 64 }
diff --git a/src/bin/cxx/image_blend_smooth_solid_scaled.cc b/src/bin/cxx/image_blend_smooth_solid_scaled.cc
index 2322358..2bede1a 100644
--- a/src/bin/cxx/image_blend_smooth_solid_scaled.cc
+++ b/src/bin/cxx/image_blend_smooth_solid_scaled.cc
@@ -28,9 +28,9 @@ static void _setup(void)
28 { 28 {
29 evas::image o(efl::eo::parent = canvas); 29 evas::image o(efl::eo::parent = canvas);
30 images.push_back(o); 30 images.push_back(o);
31 efl_file_set(build_path("image.png"), ""); 31 eo_do(o._eo_ptr(), efl_file_set(build_path("image.png"), NULL)); // XXX
32 efl_image_smooth_scale_set(1); 32 o.smooth_scale_set(1);
33 evas_obj_visibility_set(true); 33 o.visibility_set(true);
34 } 34 }
35 done = 0; 35 done = 0;
36} 36}
@@ -54,11 +54,11 @@ static void _loop(double t, int f)
54 Evas_Coord w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2); 54 Evas_Coord w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
55 Evas_Coord h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2); 55 Evas_Coord h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
56 Evas_Coord x = (win_w / 2) - (w / 2); 56 Evas_Coord x = (win_w / 2) - (w / 2);
57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 57 x += ::sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
58 Evas_Coord y = (win_h / 2) - (h / 2); 58 Evas_Coord y = (win_h / 2) - (h / 2);
59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 59 y += ::cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
60 img.position_set(x, y); 60 img.evas::object::position_set(x, y);
61 img.size_set(w, h); 61 img.evas::object::size_set(w, h);
62 img.fill_set(0, 0, w, h); 62 img.fill_set(0, 0, w, h);
63 ++i; 63 ++i;
64 } 64 }
diff --git a/src/bin/cxx/image_blend_solid_border.cc b/src/bin/cxx/image_blend_solid_border.cc
index b4abefe..c29eeeb 100644
--- a/src/bin/cxx/image_blend_solid_border.cc
+++ b/src/bin/cxx/image_blend_solid_border.cc
@@ -28,7 +28,7 @@ static void _setup(void)
28 { 28 {
29 evas::image o(efl::eo::parent = canvas); 29 evas::image o(efl::eo::parent = canvas);
30 images.push_back(o); 30 images.push_back(o);
31 o.file_set(::build_path("frame.png"), ""); 31 eo_do(o._eo_ptr(), efl_file_set(::build_path("frame.png"), NULL)); // XXX
32 o.border_set(8, 8, 8, 8); 32 o.border_set(8, 8, 8, 8);
33 o.visibility_set(true); 33 o.visibility_set(true);
34 } 34 }
diff --git a/src/bin/cxx/image_blend_solid_fade_pow2_unscaled.cc b/src/bin/cxx/image_blend_solid_fade_pow2_unscaled.cc
index 6830d65..832f0f2 100644
--- a/src/bin/cxx/image_blend_solid_fade_pow2_unscaled.cc
+++ b/src/bin/cxx/image_blend_solid_fade_pow2_unscaled.cc
@@ -28,7 +28,7 @@ static void _setup(void)
28 { 28 {
29 evas::image o(efl::eo::parent = canvas); 29 evas::image o(efl::eo::parent = canvas);
30 images.push_back(o); 30 images.push_back(o);
31 o.file_set(::build_path("image.png"), ""); 31 eo_do(o._eo_ptr(), efl_file_set(::build_path("image.png"), NULL)); // XXX
32 o.fill_set(0, 0, 120, 160); 32 o.fill_set(0, 0, 120, 160);
33 o.evas::object::size_set(120, 160); 33 o.evas::object::size_set(120, 160);
34 int a = 256 - (1 << ((rnd() % 8) + 1)); 34 int a = 256 - (1 << ((rnd() % 8) + 1));
diff --git a/src/bin/cxx/image_blend_solid_fade_unscaled.cc b/src/bin/cxx/image_blend_solid_fade_unscaled.cc
index 7fa3ea1..5d63007 100644
--- a/src/bin/cxx/image_blend_solid_fade_unscaled.cc
+++ b/src/bin/cxx/image_blend_solid_fade_unscaled.cc
@@ -28,8 +28,7 @@ static void _setup(void)
28 { 28 {
29 evas::image o(efl::eo::parent = canvas); 29 evas::image o(efl::eo::parent = canvas);
30 images.push_back(o); 30 images.push_back(o);
31 31 eo_do(o._eo_ptr(), efl_file_set(::build_path("image.png"), NULL)); // XXX
32 o.file_set(::build_path("image.png"), "");
33 o.fill_set(0, 0, 120, 160); 32 o.fill_set(0, 0, 120, 160);
34 o.evas::object::size_set(120, 160); 33 o.evas::object::size_set(120, 160);
35 int a = rnd()&0xff; 34 int a = rnd()&0xff;
diff --git a/src/bin/cxx/image_blend_solid_middle_border.cc b/src/bin/cxx/image_blend_solid_middle_border.cc
index 80db5cb..24fec7f 100644
--- a/src/bin/cxx/image_blend_solid_middle_border.cc
+++ b/src/bin/cxx/image_blend_solid_middle_border.cc
@@ -28,7 +28,7 @@ static void _setup(void)
28 { 28 {
29 evas::image o(efl::eo::parent = canvas); 29 evas::image o(efl::eo::parent = canvas);
30 images.push_back(o); 30 images.push_back(o);
31 o.file_set(build_path("bar.png"), ""); 31 eo_do(o._eo_ptr(), efl_file_set(build_path("bar.png"), NULL)); // XXX
32 o.border_set(6, 6, 6, 6); 32 o.border_set(6, 6, 6, 6);
33 o.border_center_fill_set(EVAS_BORDER_FILL_SOLID); 33 o.border_center_fill_set(EVAS_BORDER_FILL_SOLID);
34 o.visibility_set(true); 34 o.visibility_set(true);
@@ -58,7 +58,7 @@ static void _loop(double t, int f)
58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
59 Evas_Coord y = (win_h / 2) - (h / 2); 59 Evas_Coord y = (win_h / 2) - (h / 2);
60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
61 img.position_set(x, y); 61 img.evas::object::position_set(x, y);
62 img.evas::object::size_set(w, h); 62 img.evas::object::size_set(w, h);
63 img.fill_set(0, 0, w, h); 63 img.fill_set(0, 0, w, h);
64 ++i; 64 ++i;
diff --git a/src/bin/cxx/image_blend_solid_middle_unscaled.cc b/src/bin/cxx/image_blend_solid_middle_unscaled.cc
index 155d5cb..4cfb370 100644
--- a/src/bin/cxx/image_blend_solid_middle_unscaled.cc
+++ b/src/bin/cxx/image_blend_solid_middle_unscaled.cc
@@ -28,7 +28,7 @@ static void _setup(void)
28 { 28 {
29 evas::image o(efl::eo::parent = canvas); 29 evas::image o(efl::eo::parent = canvas);
30 images.push_back(o); 30 images.push_back(o);
31 o.file_set(build_path("logo.png"), ""); 31 eo_do(o._eo_ptr(), efl_file_set(build_path("logo.png"), NULL)); // XXX
32 o.fill_set(0, 0, 120, 160); 32 o.fill_set(0, 0, 120, 160);
33 o.evas::object::size_set(120, 160); 33 o.evas::object::size_set(120, 160);
34 o.border_set(43, 48, 48, 83); 34 o.border_set(43, 48, 48, 83);
@@ -58,7 +58,7 @@ static void _loop(double t, int f)
58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
59 Evas_Coord y = (win_h / 2) - (h / 2); 59 Evas_Coord y = (win_h / 2) - (h / 2);
60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
61 img.position_set(x, y); 61 img.evas::object::position_set(x, y);
62 ++i; 62 ++i;
63 } 63 }
64 FPS_STD(NAME); 64 FPS_STD(NAME);
diff --git a/src/bin/cxx/image_blend_solid_unscaled.cc b/src/bin/cxx/image_blend_solid_unscaled.cc
index 163ae85..5927bec 100644
--- a/src/bin/cxx/image_blend_solid_unscaled.cc
+++ b/src/bin/cxx/image_blend_solid_unscaled.cc
@@ -28,7 +28,7 @@ static void _setup(void)
28 { 28 {
29 evas::image o(efl::eo::parent = canvas); 29 evas::image o(efl::eo::parent = canvas);
30 images.push_back(o); 30 images.push_back(o);
31 o.file_set(::build_path("image.png"), ""); 31 eo_do(o._eo_ptr(), efl_file_set(::build_path("image.png"), NULL)); // XXX
32 o.fill_set(0, 0, 120, 160); 32 o.fill_set(0, 0, 120, 160);
33 o.evas::object::size_set(120, 160); 33 o.evas::object::size_set(120, 160);
34 o.visibility_set(true); 34 o.visibility_set(true);
diff --git a/src/bin/cxx/image_blend_unscaled.cc b/src/bin/cxx/image_blend_unscaled.cc
index 479825e..dc0c76f 100644
--- a/src/bin/cxx/image_blend_unscaled.cc
+++ b/src/bin/cxx/image_blend_unscaled.cc
@@ -28,7 +28,7 @@ static void _setup(void)
28 { 28 {
29 evas::image o(efl::eo::parent = canvas); 29 evas::image o(efl::eo::parent = canvas);
30 images.push_back(o); 30 images.push_back(o);
31 o.file_set(build_path("logo.png"), ""); 31 eo_do(o._eo_ptr(), efl_file_set(build_path("logo.png"), NULL)); // XXX
32 o.fill_set(0, 0, 120, 160); 32 o.fill_set(0, 0, 120, 160);
33 o.evas::object::size_set(120, 160); 33 o.evas::object::size_set(120, 160);
34 o.visibility_set(true); 34 o.visibility_set(true);
@@ -56,7 +56,7 @@ static void _loop(double t, int f)
56 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 56 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
57 Evas_Coord y = (win_h / 2) - (h / 2); 57 Evas_Coord y = (win_h / 2) - (h / 2);
58 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 58 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
59 img.position_set(x, y); 59 img.evas::object::position_set(x, y);
60 ++i; 60 ++i;
61 } 61 }
62 FPS_STD(NAME); 62 FPS_STD(NAME);
diff --git a/src/bin/cxx/image_crossfade.cc b/src/bin/cxx/image_crossfade.cc
index e5a0136..f7036ed 100644
--- a/src/bin/cxx/image_crossfade.cc
+++ b/src/bin/cxx/image_crossfade.cc
@@ -28,14 +28,14 @@ static void _setup(void)
28 28
29 evas::image o1(efl::eo::parent = canvas); 29 evas::image o1(efl::eo::parent = canvas);
30 images.push_back(o1); 30 images.push_back(o1);
31 o1.file_set(build_path("im1.png"), ""); 31 eo_do(o1._eo_ptr(), efl_file_set(build_path("im1.png"), NULL)); // XXX
32 o1.fill_set(0, 0, 720, 420); 32 o1.fill_set(0, 0, 720, 420);
33 o1.evas::object::size_set(720, 420); 33 o1.evas::object::size_set(720, 420);
34 o1.visibility_set(true); 34 o1.visibility_set(true);
35 35
36 evas::image o2(efl::eo::parent = canvas); 36 evas::image o2(efl::eo::parent = canvas);
37 images.push_back(o2); 37 images.push_back(o2);
38 o2.file_set(build_path("im2.png"), ""); 38 eo_do(o2._eo_ptr(), efl_file_set(build_path("im2.png"), NULL)); // XXX
39 o2.fill_set(0, 0, 720, 420); 39 o2.fill_set(0, 0, 720, 420);
40 o2.evas::object::size_set(720, 420); 40 o2.evas::object::size_set(720, 420);
41 o2.visibility_set(true); 41 o2.visibility_set(true);
@@ -54,13 +54,11 @@ static void _cleanup(void)
54/* loop - do things */ 54/* loop - do things */
55static void _loop(double t, int f) 55static void _loop(double t, int f)
56{ 56{
57 if (!images.empty()) // XXX 57 if (images.empty()) return; // XXX
58 { 58 int a = f & 0x1f;
59 int a = f & 0x1f; 59 a = ((a << 3) | (a >> 2)) & 0xff;
60 a = ((a << 3) | (a >> 2)) & 0xff; 60 evas::image img = images.back();
61 evas::image& img = images.back(); 61 img.evas::object::color_set(a, a, a, a);
62 img.evas::object::color_set(a, a, a, a);
63 }
64 FPS_STD(NAME); 62 FPS_STD(NAME);
65} 63}
66 64
diff --git a/src/bin/cxx/image_data_argb.cc b/src/bin/cxx/image_data_argb.cc
index 5ec5211..2eecb82 100644
--- a/src/bin/cxx/image_data_argb.cc
+++ b/src/bin/cxx/image_data_argb.cc
@@ -43,6 +43,8 @@ static void _setup(void)
43/* cleanup */ 43/* cleanup */
44static void _cleanup(void) 44static void _cleanup(void)
45{ 45{
46 for (evas::image& img : images)
47 img.parent_set(efl::eo::base(nullptr));
46 images.clear(); 48 images.clear();
47} 49}
48 50
@@ -57,7 +59,7 @@ static void _loop(double t, int f)
57 Evas_Coord h = 480; 59 Evas_Coord h = 480;
58 Evas_Coord x = (win_w / 2) - (w / 2); 60 Evas_Coord x = (win_w / 2) - (w / 2);
59 Evas_Coord y = (win_h / 2) - (h / 2); 61 Evas_Coord y = (win_h / 2) - (h / 2);
60 img.position_set(x, y); 62 img.evas::object::position_set(x, y);
61 img.evas::object::size_set(w, h); 63 img.evas::object::size_set(w, h);
62 img.fill_set(0, 0, w, h); 64 img.fill_set(0, 0, w, h);
63 data = static_cast<unsigned int*>(img.data_get(1)); 65 data = static_cast<unsigned int*>(img.data_get(1));
diff --git a/src/bin/cxx/image_data_ycbcr601pl.cc b/src/bin/cxx/image_data_ycbcr601pl.cc
index 59814bb..6491814 100644
--- a/src/bin/cxx/image_data_ycbcr601pl.cc
+++ b/src/bin/cxx/image_data_ycbcr601pl.cc
@@ -90,7 +90,7 @@ static void _loop(double t, int f)
90 Evas_Coord h = 480; 90 Evas_Coord h = 480;
91 Evas_Coord x = (win_w / 2) - (w / 2); 91 Evas_Coord x = (win_w / 2) - (w / 2);
92 Evas_Coord y = (win_h / 2) - (h / 2); 92 Evas_Coord y = (win_h / 2) - (h / 2);
93 img.position_set(x, y); 93 img.evas::object::position_set(x, y);
94 img.evas::object::size_set(w, h); 94 img.evas::object::size_set(w, h);
95 img.fill_set(0, 0, w, h); 95 img.fill_set(0, 0, w, h);
96 img.data_update_add( 0, 0, 640, 480); 96 img.data_update_add( 0, 0, 640, 480);
diff --git a/src/bin/cxx/image_map_3d_1.cc b/src/bin/cxx/image_map_3d_1.cc
index 39e6204..4d3dd4f 100644
--- a/src/bin/cxx/image_map_3d_1.cc
+++ b/src/bin/cxx/image_map_3d_1.cc
@@ -22,7 +22,7 @@ typedef struct _Point
22 22
23typedef struct _Side 23typedef struct _Side
24{ 24{
25 Evas_Object *o; 25 evas::image o;
26 Point pt[4]; 26 Point pt[4];
27} Side; 27} Side;
28 28
@@ -47,6 +47,7 @@ static Cube *cubes[5];
47static Cube * 47static Cube *
48_cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d) 48_cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
49{ 49{
50 evas::canvas canvas(::eo_ref(G_evas));
50 Cube *c; 51 Cube *c;
51 52
52 w -= (w / 2); 53 w -= (w / 2);
@@ -55,17 +56,14 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
55 c = static_cast<Cube*>(calloc(1, sizeof(Cube))); 56 c = static_cast<Cube*>(calloc(1, sizeof(Cube)));
56 for (int i = 0; i < 6; i++) 57 for (int i = 0; i < 6; i++)
57 { 58 {
58 Evas_Object *o;
59 char buf[256]; 59 char buf[256];
60 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 60 c->side[i].o = evas::image(efl::eo::parent = canvas);
61 c->side[i].o = o;
62 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 61 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
63 eo_do(o, 62 eo_do(c->side[i].o._eo_ptr(), efl_file_set(build_path(buf), NULL)); // XXX
64 efl_file_set(build_path(buf), NULL), 63 c->side[i].o.fill_set(0, 0, 256, 256);
65 evas_obj_image_fill_set(0, 0, 256, 256), 64 c->side[i].o.evas::object::size_set(256, 256);
66 evas_obj_size_set(256, 256), 65 c->side[i].o.smooth_scale_set(0);
67 efl_image_smooth_scale_set(0), 66 c->side[i].o.visibility_set(true);
68 evas_obj_visibility_set(EINA_TRUE));
69 } 67 }
70 POINT(0, 0, -w, -h, -d, 0, 0); 68 POINT(0, 0, -w, -h, -d, 0, 0);
71 POINT(0, 1, w, -h, -d, 256, 0); 69 POINT(0, 1, w, -h, -d, 256, 0);
@@ -134,14 +132,13 @@ _cube_pos(Cube *c,
134 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512); 132 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
135 if (evas_map_util_clockwise_get(m)) 133 if (evas_map_util_clockwise_get(m))
136 { 134 {
137 eo_do(c->side[i].o, 135 c->side[i].o.map_enable_set(1);
138 evas_obj_map_enable_set(1), 136 c->side[i].o.map_set(m);
139 evas_obj_map_set(m), 137 c->side[i].o.visibility_set(true);
140 evas_obj_visibility_set(EINA_TRUE));
141 } 138 }
142 else 139 else
143 { 140 {
144 eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE)); 141 c->side[i].o.visibility_set(false);
145 } 142 }
146 143
147 order[i] = i; 144 order[i] = i;
@@ -166,16 +163,20 @@ _cube_pos(Cube *c,
166 } 163 }
167 while (!sorted); 164 while (!sorted);
168 165
169 eo_do(c->side[order[0]].o, evas_obj_raise()); 166 c->side[order[0]].o.evas::object::raise();
170 for (i = 1; i < 6; i++) 167 for (i = 1; i < 6; i++)
171 eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o)); 168 c->side[order[i]].o.evas::object::stack_below(c->side[order[i - 1]].o);
172} 169}
173 170
174static void 171static void
175_cube_free(Cube *c) 172_cube_free(Cube *c)
176{ 173{
177 174 for (int i = 0; i < 6; i++)
178 for (int i = 0; i < 6; i++) eo_del(c->side[i].o); 175 {
176 c->side[i].o.visibility_set(false); // XXX
177 c->side[i].o.parent_set(efl::eo::base(nullptr));
178 ::eo_unref(c->side[i].o._release());
179 }
179 free(c); 180 free(c);
180} 181}
181 182
@@ -204,20 +205,20 @@ static void _cleanup(void)
204/* loop - do things */ 205/* loop - do things */
205static void _loop(double t, int f) 206static void _loop(double t, int f)
206{ 207{
207 _cube_pos(cubes[0], 208 _cube_pos(cubes[0],
208 (win_w / 2) - 640, (win_h / 2) - 256, 512, 209 (win_w / 2) - 640, (win_h / 2) - 256, 512,
209 f / 2.0, f, f / 3.0); 210 f / 2.0, f, f / 3.0);
210 _cube_pos(cubes[1], 211 _cube_pos(cubes[1],
211 (win_w / 2) + 512, (win_h / 2) - 128, 384, 212 (win_w / 2) + 512, (win_h / 2) - 128, 384,
212 f / 3.0, f / 2.0, f / 4.0); 213 f / 3.0, f / 2.0, f / 4.0);
213 _cube_pos(cubes[2], 214 _cube_pos(cubes[2],
214 (win_w / 2) - 384, (win_h / 2) + 128, 256, 215 (win_w / 2) - 384, (win_h / 2) + 128, 256,
215 f / 2.0, f / 3.0, f); 216 f / 2.0, f / 3.0, f);
216 _cube_pos(cubes[3], 217 _cube_pos(cubes[3],
217 (win_w / 2) + 256, (win_h / 2) + 64, 128, 218 (win_w / 2) + 256, (win_h / 2) + 64, 128,
218 f, f / 5.0, f / 2.0); 219 f, f / 5.0, f / 2.0);
219 _cube_pos(cubes[4], 220 _cube_pos(cubes[4],
220 (win_w / 2), (win_h / 2), 0, 221 (win_w / 2), (win_h / 2), 0,
221 f / 4.0, f / 3.0, f / 5.0); 222 f / 4.0, f / 3.0, f / 5.0);
222 FPS_STD(NAME); 223 FPS_STD(NAME);
223} 224}
diff --git a/src/bin/cxx/image_map_3d_2.cc b/src/bin/cxx/image_map_3d_2.cc
index 50b6030..f39531f 100644
--- a/src/bin/cxx/image_map_3d_2.cc
+++ b/src/bin/cxx/image_map_3d_2.cc
@@ -22,7 +22,7 @@ typedef struct _Point
22 22
23typedef struct _Side 23typedef struct _Side
24{ 24{
25 Evas_Object *o; 25 evas::image o;
26 Point pt[4]; 26 Point pt[4];
27} Side; 27} Side;
28 28
@@ -47,24 +47,21 @@ static Cube *cubes[5];
47static Cube * 47static Cube *
48_cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d) 48_cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
49{ 49{
50 evas::canvas canvas(::eo_ref(G_evas));
50 Cube *c; 51 Cube *c;
51
52 w -= (w / 2); 52 w -= (w / 2);
53 h -= (h / 2); 53 h -= (h / 2);
54 d -= (d / 2); 54 d -= (d / 2);
55 c = static_cast<Cube*>(calloc(1, sizeof(Cube))); 55 c = static_cast<Cube*>(calloc(1, sizeof(Cube)));
56 for (int i = 0; i < 6; i++) 56 for (int i = 0; i < 6; i++)
57 { 57 {
58 Evas_Object *o;
59 char buf[256]; 58 char buf[256];
60 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 59 c->side[i].o = evas::image(efl::eo::parent = canvas);
61 c->side[i].o = o;
62 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 60 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
63 eo_do(o, 61 eo_do(c->side[i].o._eo_ptr(), efl_file_set(build_path(buf), NULL)); // XXX
64 efl_file_set(build_path(buf), NULL), 62 c->side[i].o.fill_set(0, 0, 256, 256);
65 evas_obj_image_fill_set(0, 0, 256, 256), 63 c->side[i].o.evas::object::size_set(256, 256);
66 evas_obj_size_set(256, 256), 64 c->side[i].o.visibility_set(true);
67 evas_obj_visibility_set(EINA_TRUE));
68 } 65 }
69 POINT(0, 0, -w, -h, -d, 0, 0); 66 POINT(0, 0, -w, -h, -d, 0, 0);
70 POINT(0, 1, w, -h, -d, 256, 0); 67 POINT(0, 1, w, -h, -d, 256, 0);
@@ -132,14 +129,13 @@ _cube_pos(Cube *c,
132 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512); 129 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
133 if (evas_map_util_clockwise_get(m)) 130 if (evas_map_util_clockwise_get(m))
134 { 131 {
135 eo_do(c->side[i].o, 132 c->side[i].o.map_enable_set(1);
136 evas_obj_map_enable_set(1), 133 c->side[i].o.map_set(m);
137 evas_obj_map_set(m), 134 c->side[i].o.visibility_set(true);
138 evas_obj_visibility_set(EINA_TRUE));
139 } 135 }
140 else 136 else
141 { 137 {
142 eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE)); 138 c->side[i].o.visibility_set(false);
143 } 139 }
144 140
145 order[i] = i; 141 order[i] = i;
@@ -164,16 +160,20 @@ _cube_pos(Cube *c,
164 } 160 }
165 while (!sorted); 161 while (!sorted);
166 162
167 eo_do(c->side[order[0]].o, evas_obj_raise()); 163 c->side[order[0]].o.raise();
168 for (i = 1; i < 6; i++) 164 for (i = 1; i < 6; i++)
169 eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o)); 165 c->side[order[i]].o.stack_below(c->side[order[i - 1]].o);
170} 166}
171 167
172static void 168static void
173_cube_free(Cube *c) 169_cube_free(Cube *c)
174{ 170{
175 171 for (int i = 0; i < 6; i++)
176 for (int i = 0; i < 6; i++) eo_del(c->side[i].o); 172 {
173 c->side[i].o.visibility_set(false); // XXX
174 c->side[i].o.parent_set(efl::eo::base(nullptr));
175 ::eo_unref(c->side[i].o._release());
176 }
177 free(c); 177 free(c);
178} 178}
179 179
diff --git a/src/bin/cxx/image_map_3d_3.cc b/src/bin/cxx/image_map_3d_3.cc
index 3812c6d..9038e92 100644
--- a/src/bin/cxx/image_map_3d_3.cc
+++ b/src/bin/cxx/image_map_3d_3.cc
@@ -22,7 +22,7 @@ typedef struct _Point
22 22
23typedef struct _Side 23typedef struct _Side
24{ 24{
25 Evas_Object *o; 25 evas::image o;
26 Point pt[4]; 26 Point pt[4];
27} Side; 27} Side;
28 28
@@ -47,6 +47,7 @@ static Cube *cubes[5];
47static Cube * 47static Cube *
48_cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d) 48_cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
49{ 49{
50 evas::canvas canvas(::eo_ref(G_evas));
50 Cube *c; 51 Cube *c;
51 52
52 w -= (w / 2); 53 w -= (w / 2);
@@ -55,17 +56,14 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
55 c = static_cast<Cube*>(calloc(1, sizeof(Cube))); 56 c = static_cast<Cube*>(calloc(1, sizeof(Cube)));
56 for (int i = 0; i < 6; i++) 57 for (int i = 0; i < 6; i++)
57 { 58 {
58 Evas_Object *o;
59 char buf[256]; 59 char buf[256];
60 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 60 c->side[i].o = evas::image(efl::eo::parent = canvas);
61 c->side[i].o = o;
62 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 61 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
63 eo_do(o, 62 eo_do(c->side[i].o._eo_ptr(), efl_file_set(build_path(buf), NULL)); // XXX
64 efl_file_set(build_path(buf), NULL), 63 c->side[i].o.fill_set(0, 0, 256, 256);
65 evas_obj_image_fill_set(0, 0, 256, 256), 64 c->side[i].o.evas::object::size_set(256, 256);
66 evas_obj_size_set(256, 256), 65 c->side[i].o.smooth_scale_set(0);
67 efl_image_smooth_scale_set(0), 66 c->side[i].o.visibility_set(true);
68 evas_obj_visibility_set(EINA_TRUE));
69 } 67 }
70 POINT(0, 0, -w, -h, -d, 0, 0); 68 POINT(0, 0, -w, -h, -d, 0, 0);
71 POINT(0, 1, w, -h, -d, 256, 0); 69 POINT(0, 1, w, -h, -d, 256, 0);
@@ -132,9 +130,8 @@ _cube_pos(Cube *c,
132 255, 255, 255, 130 255, 255, 255,
133 20, 20, 20); 131 20, 20, 20);
134 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512); 132 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
135 eo_do(c->side[i].o, 133 c->side[i].o.map_enable_set(1);
136 evas_obj_map_enable_set(1), 134 c->side[i].o.map_set(m);
137 evas_obj_map_set(m));
138 135
139 order[i] = i; 136 order[i] = i;
140 for (j = 0; j < 4; j++) 137 for (j = 0; j < 4; j++)
@@ -158,16 +155,20 @@ _cube_pos(Cube *c,
158 } 155 }
159 while (!sorted); 156 while (!sorted);
160 157
161 eo_do(c->side[order[0]].o, evas_obj_raise()); 158 c->side[order[0]].o.raise();
162 for (i = 1; i < 6; i++) 159 for (i = 1; i < 6; i++)
163 eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o)); 160 c->side[order[i]].o.stack_below(c->side[order[i - 1]].o);
164} 161}
165 162
166static void 163static void
167_cube_free(Cube *c) 164_cube_free(Cube *c)
168{ 165{
169 166 for (int i = 0; i < 6; i++)
170 for (int i = 0; i < 6; i++) eo_del(c->side[i].o); 167 {
168 c->side[i].o.visibility_set(false); // XXX
169 c->side[i].o.parent_set(efl::eo::base(nullptr));
170 ::eo_unref(c->side[i].o._release());
171 }
171 free(c); 172 free(c);
172} 173}
173 174
diff --git a/src/bin/cxx/image_map_3d_4.cc b/src/bin/cxx/image_map_3d_4.cc
index 5e48a19..cd360b7 100644
--- a/src/bin/cxx/image_map_3d_4.cc
+++ b/src/bin/cxx/image_map_3d_4.cc
@@ -1,4 +1,3 @@
1
2#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
3# include <config.h> 2# include <config.h>
4#endif 3#endif
@@ -22,7 +21,7 @@ typedef struct _Point
22 21
23typedef struct _Side 22typedef struct _Side
24{ 23{
25 Evas_Object *o; 24 evas::image o;
26 Point pt[4]; 25 Point pt[4];
27} Side; 26} Side;
28 27
@@ -47,6 +46,7 @@ static Cube *cubes[5];
47static Cube * 46static Cube *
48_cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d) 47_cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
49{ 48{
49 evas::canvas canvas(::eo_ref(G_evas));
50 Cube *c; 50 Cube *c;
51 51
52 w -= (w / 2); 52 w -= (w / 2);
@@ -55,16 +55,13 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
55 c = static_cast<Cube*>(calloc(1, sizeof(Cube))); 55 c = static_cast<Cube*>(calloc(1, sizeof(Cube)));
56 for (int i = 0; i < 6; i++) 56 for (int i = 0; i < 6; i++)
57 { 57 {
58 Evas_Object *o;
59 char buf[256]; 58 char buf[256];
60 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 59 c->side[i].o = evas::image(efl::eo::parent = canvas);
61 c->side[i].o = o;
62 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 60 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
63 eo_do(o, 61 eo_do(c->side[i].o._eo_ptr(), efl_file_set(build_path(buf), NULL)); // XXX
64 efl_file_set(build_path(buf), NULL), 62 c->side[i].o.fill_set(0, 0, 256, 256);
65 evas_obj_image_fill_set(0, 0, 256, 256), 63 c->side[i].o.evas::object::size_set(256, 256);
66 evas_obj_size_set(256, 256), 64 c->side[i].o.visibility_set(true);
67 evas_obj_visibility_set(EINA_TRUE));
68 } 65 }
69 POINT(0, 0, -w, -h, -d, 0, 0); 66 POINT(0, 0, -w, -h, -d, 0, 0);
70 POINT(0, 1, w, -h, -d, 256, 0); 67 POINT(0, 1, w, -h, -d, 256, 0);
@@ -130,9 +127,8 @@ _cube_pos(Cube *c,
130 255, 255, 255, 127 255, 255, 255,
131 20, 20, 20); 128 20, 20, 20);
132 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512); 129 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
133 eo_do(c->side[i].o, 130 c->side[i].o.map_enable_set(1);
134 evas_obj_map_enable_set(1), 131 c->side[i].o.map_set(m);
135 evas_obj_map_set(m));
136 132
137 order[i] = i; 133 order[i] = i;
138 for (j = 0; j < 4; j++) 134 for (j = 0; j < 4; j++)
@@ -156,16 +152,20 @@ _cube_pos(Cube *c,
156 } 152 }
157 while (!sorted); 153 while (!sorted);
158 154
159 eo_do(c->side[order[0]].o, evas_obj_raise()); 155 c->side[order[0]].o.raise();
160 for (i = 1; i < 6; i++) 156 for (i = 1; i < 6; i++)
161 eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o)); 157 c->side[order[i]].o.stack_below(c->side[order[i - 1]].o);
162} 158}
163 159
164static void 160static void
165_cube_free(Cube *c) 161_cube_free(Cube *c)
166{ 162{
167 163 for (int i = 0; i < 6; i++)
168 for (int i = 0; i < 6; i++) eo_del(c->side[i].o); 164 {
165 c->side[i].o.visibility_set(false); // XXX
166 c->side[i].o.parent_set(efl::eo::base(nullptr));
167 ::eo_unref(c->side[i].o._release());
168 }
169 free(c); 169 free(c);
170} 170}
171 171
diff --git a/src/bin/cxx/image_map_3d_5.cc b/src/bin/cxx/image_map_3d_5.cc
index fadb253..896ae8b 100644
--- a/src/bin/cxx/image_map_3d_5.cc
+++ b/src/bin/cxx/image_map_3d_5.cc
@@ -22,7 +22,7 @@ typedef struct _Point
22 22
23typedef struct _Side 23typedef struct _Side
24{ 24{
25 Evas_Object *o; 25 evas::image o;
26 Point pt[4]; 26 Point pt[4];
27} Side; 27} Side;
28 28
@@ -47,6 +47,7 @@ static Cube *cubes[1];
47static Cube * 47static Cube *
48_cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d) 48_cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
49{ 49{
50 evas::canvas canvas(::eo_ref(G_evas));
50 Cube *c; 51 Cube *c;
51 52
52 w -= (w / 2); 53 w -= (w / 2);
@@ -55,17 +56,14 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
55 c = static_cast<Cube*>(calloc(1, sizeof(Cube))); 56 c = static_cast<Cube*>(calloc(1, sizeof(Cube)));
56 for (int i = 0; i < 6; i++) 57 for (int i = 0; i < 6; i++)
57 { 58 {
58 Evas_Object *o;
59 char buf[256]; 59 char buf[256];
60 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 60 c->side[i].o = evas::image(efl::eo::parent = canvas);
61 c->side[i].o = o;
62 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1); 61 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
63 eo_do(o, 62 eo_do(c->side[i].o._eo_ptr(), efl_file_set(build_path(buf), NULL)); // XXX
64 efl_file_set(build_path(buf), NULL), 63 c->side[i].o.fill_set(0, 0, 720, 420);
65 evas_obj_image_fill_set(0, 0, 720, 420), 64 c->side[i].o.evas::object::size_set(720, 420);
66 evas_obj_size_set(720, 420), 65 c->side[i].o.smooth_scale_set(0);
67 efl_image_smooth_scale_set(0), 66 c->side[i].o.visibility_set(true);
68 evas_obj_visibility_set(EINA_TRUE));
69 } 67 }
70 POINT(0, 0, -w, -h, -d, 0, 0); 68 POINT(0, 0, -w, -h, -d, 0, 0);
71 POINT(0, 1, w, -h, -d, 720, 0); 69 POINT(0, 1, w, -h, -d, 720, 0);
@@ -134,14 +132,13 @@ _cube_pos(Cube *c,
134 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720); 132 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720);
135 if (evas_map_util_clockwise_get(m)) 133 if (evas_map_util_clockwise_get(m))
136 { 134 {
137 eo_do(c->side[i].o, 135 c->side[i].o.map_enable_set(1);
138 evas_obj_map_enable_set(1), 136 c->side[i].o.map_set(m);
139 evas_obj_map_set(m), 137 c->side[i].o.visibility_set(true);
140 evas_obj_visibility_set(EINA_TRUE));
141 } 138 }
142 else 139 else
143 { 140 {
144 eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE)); 141 c->side[i].o.visibility_set(false);
145 } 142 }
146 143
147 order[i] = i; 144 order[i] = i;
@@ -166,16 +163,20 @@ _cube_pos(Cube *c,
166 } 163 }
167 while (!sorted); 164 while (!sorted);
168 165
169 eo_do(c->side[order[0]].o, evas_obj_raise()); 166 c->side[order[0]].o.raise();
170 for (i = 1; i < 6; i++) 167 for (i = 1; i < 6; i++)
171 eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o)); 168 c->side[order[i]].o.stack_below(c->side[order[i - 1]].o);
172} 169}
173 170
174static void 171static void
175_cube_free(Cube *c) 172_cube_free(Cube *c)
176{ 173{
177 174 for (int i = 0; i < 6; i++)
178 for (int i = 0; i < 6; i++) eo_del(c->side[i].o); 175 {
176 c->side[i].o.visibility_set(false); // XXX
177 c->side[i].o.parent_set(efl::eo::base(nullptr));
178 ::eo_unref(c->side[i].o._release());
179 }
179 free(c); 180 free(c);
180} 181}
181 182
diff --git a/src/bin/cxx/image_map_3d_6.cc b/src/bin/cxx/image_map_3d_6.cc
index fe5f671..72f8aaa 100644
--- a/src/bin/cxx/image_map_3d_6.cc
+++ b/src/bin/cxx/image_map_3d_6.cc
@@ -22,7 +22,7 @@ typedef struct _Point
22 22
23typedef struct _Side 23typedef struct _Side
24{ 24{
25 Evas_Object *o; 25 evas::image o;
26 Point pt[4]; 26 Point pt[4];
27} Side; 27} Side;
28 28
@@ -47,6 +47,7 @@ static Cube *cubes[1];
47static Cube * 47static Cube *
48_cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d) 48_cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
49{ 49{
50 evas::canvas canvas(::eo_ref(G_evas));
50 Cube *c; 51 Cube *c;
51 52
52 w -= (w / 2); 53 w -= (w / 2);
@@ -55,17 +56,14 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
55 c = static_cast<Cube*>(calloc(1, sizeof(Cube))); 56 c = static_cast<Cube*>(calloc(1, sizeof(Cube)));
56 for (int i = 0; i < 6; i++) 57 for (int i = 0; i < 6; i++)
57 { 58 {
58 Evas_Object *o; // XXX
59 char buf[256]; 59 char buf[256];
60 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 60 c->side[i].o = evas::image(efl::eo::parent = canvas);
61 c->side[i].o = o;
62 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1); 61 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
63 eo_do(o, 62 eo_do(c->side[i].o._eo_ptr(), efl_file_set(build_path(buf), NULL)); // XXX
64 efl_file_set(build_path(buf), NULL), 63 c->side[i].o.fill_set(0, 0, 720, 420);
65 evas_obj_image_fill_set(0, 0, 720, 420), 64 c->side[i].o.evas::object::size_set(720, 420);
66 evas_obj_size_set(720, 420), 65 c->side[i].o.smooth_scale_set(0);
67 efl_image_smooth_scale_set(0), 66 c->side[i].o.visibility_set(true);
68 evas_obj_visibility_set(EINA_TRUE));
69 } 67 }
70 POINT(0, 0, -w, -h, -d, 0, 0); 68 POINT(0, 0, -w, -h, -d, 0, 0);
71 POINT(0, 1, w, -h, -d, 720, 0); 69 POINT(0, 1, w, -h, -d, 720, 0);
@@ -131,14 +129,13 @@ _cube_pos(Cube *c,
131 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720); 129 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720);
132 if (evas_map_util_clockwise_get(m)) 130 if (evas_map_util_clockwise_get(m))
133 { 131 {
134 eo_do(c->side[i].o, 132 c->side[i].o.map_enable_set(1);
135 evas_obj_map_enable_set(1), 133 c->side[i].o.map_set(m);
136 evas_obj_map_set(m), 134 c->side[i].o.visibility_set(true);
137 evas_obj_visibility_set(EINA_TRUE));
138 } 135 }
139 else 136 else
140 { 137 {
141 eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE)); 138 c->side[i].o.visibility_set(false);
142 } 139 }
143 140
144 order[i] = i; 141 order[i] = i;
@@ -163,16 +160,20 @@ _cube_pos(Cube *c,
163 } 160 }
164 while (!sorted); 161 while (!sorted);
165 162
166 eo_do(c->side[order[0]].o, evas_obj_raise()); 163 c->side[order[0]].o.raise();
167 for (i = 1; i < 6; i++) 164 for (i = 1; i < 6; i++)
168 eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o)); 165 c->side[order[i]].o.stack_below(c->side[order[i - 1]].o);
169} 166}
170 167
171static void 168static void
172_cube_free(Cube *c) 169_cube_free(Cube *c)
173{ 170{
174 171 for (int i = 0; i < 6; i++)
175 for (int i = 0; i < 6; i++) eo_del(c->side[i].o); 172 {
173 c->side[i].o.visibility_set(false); // XXX
174 c->side[i].o.parent_set(efl::eo::base(nullptr));
175 ::eo_unref(c->side[i].o._release());
176 }
176 free(c); 177 free(c);
177} 178}
178 179
diff --git a/src/bin/cxx/image_map_3d_flow.cc b/src/bin/cxx/image_map_3d_flow.cc
index 3c948eb..c8b22c0 100644
--- a/src/bin/cxx/image_map_3d_flow.cc
+++ b/src/bin/cxx/image_map_3d_flow.cc
@@ -34,7 +34,7 @@ static void _setup(void)
34 34
35 evas::image o1(efl::eo::parent = canvas); 35 evas::image o1(efl::eo::parent = canvas);
36 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); // XXX 36 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); // XXX
37 o1.file_set(build_path(buf), ""); 37 eo_do(o1._eo_ptr(), efl_file_set(build_path(buf), NULL)); // XXX
38 o1.fill_set(0, 0, 256, 256); 38 o1.fill_set(0, 0, 256, 256);
39 o1.evas::object::size_set(256, 256); 39 o1.evas::object::size_set(256, 256);
40 o1.smooth_scale_set(0); 40 o1.smooth_scale_set(0);
@@ -43,7 +43,7 @@ static void _setup(void)
43 43
44 evas::image o2(efl::eo::parent = canvas); 44 evas::image o2(efl::eo::parent = canvas);
45 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); // XXX 45 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); // XXX
46 o2.file_set(build_path(buf), ""); 46 eo_do(o2._eo_ptr(), efl_file_set(build_path(buf), NULL)); // XXX
47 o2.fill_set(0, 0, 256, 256); 47 o2.fill_set(0, 0, 256, 256);
48 o2.size_set(256, 256); 48 o2.size_set(256, 256);
49 o2.smooth_scale_set(0); 49 o2.smooth_scale_set(0);
@@ -59,6 +59,7 @@ static void _cleanup(void)
59 for (evas::image& i : images) 59 for (evas::image& i : images)
60 i.parent_set(efl::eo::base(nullptr)); 60 i.parent_set(efl::eo::base(nullptr));
61 images.clear(); 61 images.clear();
62
62 for (evas::image& i : reflec) 63 for (evas::image& i : reflec)
63 i.parent_set(efl::eo::base(nullptr)); 64 i.parent_set(efl::eo::base(nullptr));
64 reflec.clear(); 65 reflec.clear();
diff --git a/src/bin/cxx/image_map_color_alpha_nearest_rotate.cc b/src/bin/cxx/image_map_color_alpha_nearest_rotate.cc
index 6f9c403..754676c 100644
--- a/src/bin/cxx/image_map_color_alpha_nearest_rotate.cc
+++ b/src/bin/cxx/image_map_color_alpha_nearest_rotate.cc
@@ -29,7 +29,7 @@ static void _setup(void)
29 { 29 {
30 evas::image o(efl::eo::parent = canvas); 30 evas::image o(efl::eo::parent = canvas);
31 images.push_back(o); 31 images.push_back(o);
32 o.file_set(build_path("logo.png"), ""); 32 eo_do(o._eo_ptr(), efl_file_set(build_path("logo.png"), NULL)); // XXX
33 o.fill_set(0, 0, 120, 160); 33 o.fill_set(0, 0, 120, 160);
34 o.evas::object::size_set(120, 160); 34 o.evas::object::size_set(120, 160);
35 o.smooth_scale_set(0); 35 o.smooth_scale_set(0);
diff --git a/src/bin/cxx/image_map_color_alpha_nearest_solid_rotate.cc b/src/bin/cxx/image_map_color_alpha_nearest_solid_rotate.cc
index 6ef910e..a08f090 100644
--- a/src/bin/cxx/image_map_color_alpha_nearest_solid_rotate.cc
+++ b/src/bin/cxx/image_map_color_alpha_nearest_solid_rotate.cc
@@ -29,7 +29,7 @@ static void _setup(void)
29 { 29 {
30 evas::image o(efl::eo::parent = canvas); 30 evas::image o(efl::eo::parent = canvas);
31 images.push_back(o); 31 images.push_back(o);
32 o.file_set(build_path("image.png"), ""); 32 eo_do(o._eo_ptr(), efl_file_set(build_path("image.png"), NULL)); // XXX
33 o.fill_set(0, 0, 120, 160); 33 o.fill_set(0, 0, 120, 160);
34 o.evas::object::size_set(120, 160); 34 o.evas::object::size_set(120, 160);
35 o.smooth_scale_set(0); 35 o.smooth_scale_set(0);
diff --git a/src/bin/cxx/image_map_color_alpha_rotate.cc b/src/bin/cxx/image_map_color_alpha_rotate.cc
index 4fc4c88..c57fc70 100644
--- a/src/bin/cxx/image_map_color_alpha_rotate.cc
+++ b/src/bin/cxx/image_map_color_alpha_rotate.cc
@@ -29,7 +29,7 @@ static void _setup(void)
29 { 29 {
30 evas::image o(efl::eo::parent = canvas); 30 evas::image o(efl::eo::parent = canvas);
31 images.push_back(o); 31 images.push_back(o);
32 efl_file_set(build_path("logo.png"), ""); 32 eo_do(o._eo_ptr(), efl_file_set(build_path("logo.png"), NULL)); // XXX
33 o.fill_set(0, 0, 120, 160); 33 o.fill_set(0, 0, 120, 160);
34 o.evas::object::size_set(120, 160); 34 o.evas::object::size_set(120, 160);
35 o.visibility_set(true); 35 o.visibility_set(true);
diff --git a/src/bin/cxx/image_map_color_alpha_solid_rotate.cc b/src/bin/cxx/image_map_color_alpha_solid_rotate.cc
index d8f0a1f..b600dbf 100644
--- a/src/bin/cxx/image_map_color_alpha_solid_rotate.cc
+++ b/src/bin/cxx/image_map_color_alpha_solid_rotate.cc
@@ -29,7 +29,7 @@ static void _setup(void)
29 { 29 {
30 evas::image o(efl::eo::parent = canvas); 30 evas::image o(efl::eo::parent = canvas);
31 images.push_back(o); 31 images.push_back(o);
32 o.file_set(build_path("image.png"), ""); 32 eo_do(o._eo_ptr(), efl_file_set(build_path("image.png"), NULL)); // XXX
33 o.fill_set(0, 0, 120, 160); 33 o.fill_set(0, 0, 120, 160);
34 o.evas::object::size_set(120, 160); 34 o.evas::object::size_set(120, 160);
35 o.visibility_set(true); 35 o.visibility_set(true);
diff --git a/src/bin/cxx/image_map_color_nearest_rotate.cc b/src/bin/cxx/image_map_color_nearest_rotate.cc
index 28f3e7a..d225a15 100644
--- a/src/bin/cxx/image_map_color_nearest_rotate.cc
+++ b/src/bin/cxx/image_map_color_nearest_rotate.cc
@@ -29,7 +29,7 @@ static void _setup(void)
29 { 29 {
30 evas::image o(efl::eo::parent = canvas); 30 evas::image o(efl::eo::parent = canvas);
31 images.push_back(o); 31 images.push_back(o);
32 o.file_set(build_path("logo.png"), ""); 32 eo_do(o._eo_ptr(), efl_file_set(build_path("logo.png"), NULL)); // XXX
33 o.fill_set(0, 0, 120, 160); 33 o.fill_set(0, 0, 120, 160);
34 o.evas::object::size_set(120, 160); 34 o.evas::object::size_set(120, 160);
35 o.smooth_scale_set(0); 35 o.smooth_scale_set(0);
diff --git a/src/bin/cxx/image_map_color_nearest_solid_rotate.cc b/src/bin/cxx/image_map_color_nearest_solid_rotate.cc
index 488414a..4908e39 100644
--- a/src/bin/cxx/image_map_color_nearest_solid_rotate.cc
+++ b/src/bin/cxx/image_map_color_nearest_solid_rotate.cc
@@ -29,7 +29,7 @@ static void _setup(void)
29 { 29 {
30 evas::image o(efl::eo::parent = canvas); 30 evas::image o(efl::eo::parent = canvas);
31 images.push_back(o); 31 images.push_back(o);
32 o.file_set(build_path("image.png"), ""); 32 eo_do(o._eo_ptr(), efl_file_set(build_path("image.png"), NULL)); // XXX
33 o.fill_set(0, 0, 120, 160); 33 o.fill_set(0, 0, 120, 160);
34 o.evas::object::size_set(120, 160); 34 o.evas::object::size_set(120, 160);
35 o.smooth_scale_set(0); 35 o.smooth_scale_set(0);
diff --git a/src/bin/cxx/image_map_color_rotate.cc b/src/bin/cxx/image_map_color_rotate.cc
index 23e906e..787681a 100644
--- a/src/bin/cxx/image_map_color_rotate.cc
+++ b/src/bin/cxx/image_map_color_rotate.cc
@@ -29,7 +29,7 @@ static void _setup(void)
29 { 29 {
30 evas::image o(efl::eo::parent = canvas); 30 evas::image o(efl::eo::parent = canvas);
31 images.push_back(o); 31 images.push_back(o);
32 o.file_set(build_path("logo.png"), ""); 32 eo_do(o._eo_ptr(), efl_file_set(build_path("logo.png"), NULL)); // XXX
33 o.fill_set(0, 0, 120, 160); 33 o.fill_set(0, 0, 120, 160);
34 o.evas::object::size_set(120, 160); 34 o.evas::object::size_set(120, 160);
35 o.visibility_set(true); 35 o.visibility_set(true);
diff --git a/src/bin/cxx/image_map_color_solid_rotate.cc b/src/bin/cxx/image_map_color_solid_rotate.cc
index 8a30a41..b4f1426 100644
--- a/src/bin/cxx/image_map_color_solid_rotate.cc
+++ b/src/bin/cxx/image_map_color_solid_rotate.cc
@@ -29,7 +29,7 @@ static void _setup(void)
29 { 29 {
30 evas::image o(efl::eo::parent = canvas); 30 evas::image o(efl::eo::parent = canvas);
31 images.push_back(o); 31 images.push_back(o);
32 o.file_set(build_path("image.png"), ""); 32 eo_do(o._eo_ptr(), efl_file_set(build_path("image.png"), NULL)); // XXX
33 o.fill_set(0, 0, 120, 160); 33 o.fill_set(0, 0, 120, 160);
34 o.evas::object::size_set(120, 160); 34 o.evas::object::size_set(120, 160);
35 o.visibility_set(true); 35 o.visibility_set(true);
diff --git a/src/bin/cxx/image_map_nearest_rotate.cc b/src/bin/cxx/image_map_nearest_rotate.cc
index 92dd81c..8c6bb1f 100644
--- a/src/bin/cxx/image_map_nearest_rotate.cc
+++ b/src/bin/cxx/image_map_nearest_rotate.cc
@@ -29,7 +29,7 @@ static void _setup(void)
29 { 29 {
30 evas::image o(efl::eo::parent = canvas); 30 evas::image o(efl::eo::parent = canvas);
31 images.push_back(o); 31 images.push_back(o);
32 o.file_set(build_path("logo.png"), ""); 32 eo_do(o._eo_ptr(), efl_file_set(build_path("logo.png"), NULL)); // XXX
33 o.fill_set(0, 0, 120, 160); 33 o.fill_set(0, 0, 120, 160);
34 o.evas::object::size_set(120, 160); 34 o.evas::object::size_set(120, 160);
35 o.smooth_scale_set(0); 35 o.smooth_scale_set(0);
diff --git a/src/bin/cxx/image_map_nearest_solid_rotate.cc b/src/bin/cxx/image_map_nearest_solid_rotate.cc
index f50eee7..b7ce0ef 100644
--- a/src/bin/cxx/image_map_nearest_solid_rotate.cc
+++ b/src/bin/cxx/image_map_nearest_solid_rotate.cc
@@ -29,7 +29,7 @@ static void _setup(void)
29 { 29 {
30 evas::image o(efl::eo::parent = canvas); 30 evas::image o(efl::eo::parent = canvas);
31 images.push_back(o); 31 images.push_back(o);
32 o.file_set(build_path("image.png"), ""); 32 eo_do(o._eo_ptr(), efl_file_set(build_path("image.png"), NULL)); // XXX
33 o.fill_set(0, 0, 120, 160); 33 o.fill_set(0, 0, 120, 160);
34 o.evas::object::size_set(120, 160); 34 o.evas::object::size_set(120, 160);
35 o.smooth_scale_set(0); 35 o.smooth_scale_set(0);
diff --git a/src/bin/cxx/image_map_rotate.cc b/src/bin/cxx/image_map_rotate.cc
index 527939e..ca2502c 100644
--- a/src/bin/cxx/image_map_rotate.cc
+++ b/src/bin/cxx/image_map_rotate.cc
@@ -29,7 +29,7 @@ static void _setup(void)
29 { 29 {
30 evas::image o(efl::eo::parent = canvas); 30 evas::image o(efl::eo::parent = canvas);
31 images.push_back(o); 31 images.push_back(o);
32 o.file_set(build_path("logo.png"), ""); 32 eo_do(o._eo_ptr(), efl_file_set(build_path("logo.png"), NULL)); // XXX
33 o.fill_set(0, 0, 120, 160); 33 o.fill_set(0, 0, 120, 160);
34 o.evas::object::size_set(120, 160); 34 o.evas::object::size_set(120, 160);
35 o.visibility_set(true); 35 o.visibility_set(true);
diff --git a/src/bin/cxx/image_map_solid_rotate.cc b/src/bin/cxx/image_map_solid_rotate.cc
index 30eef29..e570285 100644
--- a/src/bin/cxx/image_map_solid_rotate.cc
+++ b/src/bin/cxx/image_map_solid_rotate.cc
@@ -29,7 +29,7 @@ static void _setup(void)
29 { 29 {
30 evas::image o(efl::eo::parent = canvas); 30 evas::image o(efl::eo::parent = canvas);
31 images.push_back(o); 31 images.push_back(o);
32 o.file_set(build_path("image.png"), ""); 32 eo_do(o._eo_ptr(), efl_file_set(build_path("image.png"), NULL)); // XXX
33 o.fill_set(0, 0, 120, 160); 33 o.fill_set(0, 0, 120, 160);
34 o.evas::object::size_set(120, 160); 34 o.evas::object::size_set(120, 160);
35 o.evas::object::visibility_set(EINA_TRUE); 35 o.evas::object::visibility_set(EINA_TRUE);
diff --git a/src/bin/cxx/image_quality_scale.cc b/src/bin/cxx/image_quality_scale.cc
index f3b42e9..35a0184 100644
--- a/src/bin/cxx/image_quality_scale.cc
+++ b/src/bin/cxx/image_quality_scale.cc
@@ -29,7 +29,7 @@ static void _setup(void)
29 { 29 {
30 evas::image o(efl::eo::parent = canvas); 30 evas::image o(efl::eo::parent = canvas);
31 images.push_back(o); 31 images.push_back(o);
32 o.file_set(build_path("tp.png"), ""); 32 eo_do(o._eo_ptr(), efl_file_set(build_path("tp.png"), NULL)); // XXX
33 o.fill_set(0, 0, 640, 480); 33 o.fill_set(0, 0, 640, 480);
34 o.evas::object::size_set(640, 480); 34 o.evas::object::size_set(640, 480);
35 o.visibility_set(true); 35 o.visibility_set(true);
@@ -56,8 +56,8 @@ static void _loop(double t, int f)
56 h *= (f / 100.0) * 4.0; 56 h *= (f / 100.0) * 4.0;
57 Evas_Coord x = (win_w / 2) - (w / 2); 57 Evas_Coord x = (win_w / 2) - (w / 2);
58 Evas_Coord y = (win_h / 2) - (h / 2); 58 Evas_Coord y = (win_h / 2) - (h / 2);
59 img.position_set(x, y); 59 img.evas::object::position_set(x, y);
60 img.size_set(w, h); 60 img.evas::object::size_set(w, h);
61 img.fill_set(0, 0, w, h); 61 img.fill_set(0, 0, w, h);
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
diff --git a/src/bin/cxx/line_blend.cc b/src/bin/cxx/line_blend.cc
index 2c2b655..41c71d3 100644
--- a/src/bin/cxx/line_blend.cc
+++ b/src/bin/cxx/line_blend.cc
@@ -33,7 +33,7 @@ static void _setup(void)
33 int r = ((rnd()&0xff) * a) / 255; 33 int r = ((rnd()&0xff) * a) / 255;
34 int g = ((rnd()&0xff) * a) / 255; 34 int g = ((rnd()&0xff) * a) / 255;
35 int b = ((rnd()&0xff) * a) / 255; 35 int b = ((rnd()&0xff) * a) / 255;
36 o.color_set(r, g, b, a); 36 o.evas::object::color_set(r, g, b, a);
37 o.xy_set(((win_w / 2) * (rnd()&0xff)) / 255, 37 o.xy_set(((win_w / 2) * (rnd()&0xff)) / 255,
38 ((win_h / 2) * (rnd()&0xff)) / 255, 38 ((win_h / 2) * (rnd()&0xff)) / 255,
39 ((win_w / 2) * (rnd()&0xff)) / 255 + (win_w / 2), 39 ((win_w / 2) * (rnd()&0xff)) / 255 + (win_w / 2),
@@ -46,6 +46,8 @@ static void _setup(void)
46/* cleanup */ 46/* cleanup */
47static void _cleanup() 47static void _cleanup()
48{ 48{
49 for (evas::line l : lines)
50 l.parent_set(efl::eo::base(nullptr));
49 lines.clear(); 51 lines.clear();
50} 52}
51 53
diff --git a/src/bin/cxx/proxy_image.cc b/src/bin/cxx/proxy_image.cc
index c8582d1..c9dc678 100644
--- a/src/bin/cxx/proxy_image.cc
+++ b/src/bin/cxx/proxy_image.cc
@@ -26,7 +26,7 @@ static void _setup(void)
26 evas::canvas canvas(::eo_ref(G_evas)); 26 evas::canvas canvas(::eo_ref(G_evas));
27 evas::image src(efl::eo::parent = canvas); 27 evas::image src(efl::eo::parent = canvas);
28 28
29 src.file_set(build_path("logo.png"), ""); 29 eo_do(src._eo_ptr(), efl_file_set(build_path("logo.png"), NULL)); // XXX
30 src.fill_set(0, 0, 120, 160); 30 src.fill_set(0, 0, 120, 160);
31 src.evas::object::size_set(120, 160); 31 src.evas::object::size_set(120, 160);
32 images.push_back(src); 32 images.push_back(src);
@@ -62,7 +62,7 @@ static void _loop(double t, int f)
62 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 62 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
63 Evas_Coord y = (win_h / 2) - (h / 2); 63 Evas_Coord y = (win_h / 2) - (h / 2);
64 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 64 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
65 img.position_set(x, y); 65 img.evas::object::position_set(x, y);
66 ++i; 66 ++i;
67 } 67 }
68 FPS_STD(NAME); 68 FPS_STD(NAME);
diff --git a/src/bin/cxx/proxy_image_offscreen.cc b/src/bin/cxx/proxy_image_offscreen.cc
index 0a492d5..68b5d58 100644
--- a/src/bin/cxx/proxy_image_offscreen.cc
+++ b/src/bin/cxx/proxy_image_offscreen.cc
@@ -26,7 +26,7 @@ static void _setup(void)
26 evas::canvas canvas(::eo_ref(G_evas)); 26 evas::canvas canvas(::eo_ref(G_evas));
27 evas::image o(efl::eo::parent = canvas); 27 evas::image o(efl::eo::parent = canvas);
28 28
29 o.file_set(build_path("logo.png"), ""); 29 eo_do(o._eo_ptr(), efl_file_set(build_path("logo.png"), NULL)); // XXX
30 o.fill_set(0, 0, 120, 160); 30 o.fill_set(0, 0, 120, 160);
31 o.evas::object::size_set(120, 160); 31 o.evas::object::size_set(120, 160);
32 o.evas::object::position_set(-400, -300); 32 o.evas::object::position_set(-400, -300);
diff --git a/src/bin/cxx/proxy_text_fixed.cc b/src/bin/cxx/proxy_text_fixed.cc
index 9d87d89..5eada1f 100644
--- a/src/bin/cxx/proxy_text_fixed.cc
+++ b/src/bin/cxx/proxy_text_fixed.cc
@@ -19,7 +19,7 @@
19static int done = 0; 19static int done = 0;
20 20
21/* private data */ 21/* private data */
22static efl::eina::list<evas::text> texts; 22static evas::object *texts[OBNUM];
23 23
24inline Evas_Text_Style_Type 24inline Evas_Text_Style_Type
25operator++(Evas_Text_Style_Type const& x) 25operator++(Evas_Text_Style_Type const& x)
@@ -31,71 +31,70 @@ operator++(Evas_Text_Style_Type const& x)
31/* setup */ 31/* setup */
32static void _setup(void) 32static void _setup(void)
33{ 33{
34#if 0 34 evas::canvas canvas(::eo_ref(G_evas));
35 Evas_Object *o,*s;
36 Evas_Text_Style_Type st, i; 35 Evas_Text_Style_Type st, i;
37 36
38 st = EVAS_TEXT_STYLE_SHADOW; 37 st = EVAS_TEXT_STYLE_SHADOW;
39 for (i = 0; st <= EVAS_TEXT_STYLE_FAR_SOFT_SHADOW; i++) 38 for (; st <= EVAS_TEXT_STYLE_FAR_SOFT_SHADOW; ++i)
40 { 39 {
41 o = eo_add(EVAS_TEXT_CLASS, G_evas); 40 evas::text* o = new evas::text(efl::eo::parent = canvas);
42 o_texts[i] = o; 41 o->font_set("Vera-Bold", 20);
43 efl_text_properties_font_set("Vera-Bold", 20); 42 o->text_set("This is a test string");
44 efl_text_set("This is a test string"); 43 o->style_set(st);
45 evas_obj_text_style_set(st); 44 o->evas::object::color_set(255, 255, 255, 255);
46 evas_obj_color_set(255, 255, 255, 255); 45 o->shadow_color_set(0, 0, 0, 24);
47 evas_obj_text_shadow_color_set(0, 0, 0, 24); 46 o->glow_color_set(100, 80, 40, 100);
48 evas_obj_text_glow_color_set(100, 80, 40, 100); 47 o->glow2_color_set(50, 10, 5, 50);
49 evas_obj_text_glow2_color_set(50, 10, 5, 50); 48 o->outline_color_set(0, 0, 0, 255);
50 evas_obj_text_outline_color_set(0, 0, 0, 255); 49 o->visibility_set(true);
51 evas_obj_visibility_set(true); 50 texts[i] = o;
52 st++; 51 ++st;
53 } 52 }
54 st = i; 53 st = i;
55 54
56 for ( ; i < OBNUM ; i ++) 55 for ( ; i < OBNUM ; ++i)
57 { 56 {
58 s = o_texts[i % st]; 57 evas::text s(::eo_ref(texts[i % st]->_eo_ptr()));
59 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 58 evas::image *o = new evas::image(efl::eo::parent = canvas);
60 o_texts[i] = o; 59 o->source_set(s);
61 eo_do(o, evas_obj_image_source_set(s));
62 /* FIXME s == NULL*/ 60 /* FIXME s == NULL*/
63 int w,h; 61 int w,h;
64 eo_do(s, evas_obj_size_get(&w, &h)); 62 s.evas::object::size_get(&w, &h);
65 eo_do(o, 63 o->evas::object::size_set(w, h);
66 evas_obj_size_set(w, h), 64 o->fill_set(0, 0, w, h);
67 evas_obj_image_fill_set(0, 0, w, h), 65 o->visibility_set(true);
68 evas_obj_visibility_set(EINA_TRUE)); 66 if (texts[i]) delete texts[i];
67 texts[i] = o;
69 } 68 }
70 69
71 done = 0; 70 done = 0;
72#endif // XXX
73} 71}
74 72
75/* cleanup */ 73/* cleanup */
76static void _cleanup(void) 74static void _cleanup(void)
77{ 75{
78 texts.clear(); 76 for (int i = 0; i < OBNUM; i++) // XXX
77 {
78 texts[i]->parent_set(efl::eo::base(nullptr));
79 texts[i]->_reset(nullptr);
80 delete texts[i];
81 }
79} 82}
80 83
81/* loop - do things */ 84/* loop - do things */
82static void _loop(double t, int f) 85static void _loop(double t, int f)
83{ 86{
84#if 0
85 int i;
86 Evas_Coord x, y, w, h; 87 Evas_Coord x, y, w, h;
87 for (i = 0; i < OBNUM; i++) 88 for (int i = 0; i < OBNUM; i++)
88 { 89 {
89 eo_do(o_texts[i], evas_obj_size_get(&w, &h)); 90 texts[i]->evas::object::size_get(&w, &h);
90 x = (win_w / 2) - (w / 2); 91 x = (win_w / 2) - (w / 2);
91 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 92 x += ::sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
92 y = (win_h / 2) - (h / 2); 93 y = (win_h / 2) - (h / 2);
93 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2); 94 y += ::cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
94 eo_do(o_texts[i], evas_obj_position_set(x, y)); 95 texts[i]->evas::object::position_set(x, y);
95 } 96 }
96 FPS_STD(NAME); 97 FPS_STD(NAME);
97#endif // XXX
98 FPS_STD(NAME);
99} 98}
100 99
101/* prepend special key handlers if interactive (before STD) */ 100/* prepend special key handlers if interactive (before STD) */
diff --git a/src/bin/cxx/rect_blend_pow2.cc b/src/bin/cxx/rect_blend_pow2.cc
index 4a3d9e2..1af953e 100644
--- a/src/bin/cxx/rect_blend_pow2.cc
+++ b/src/bin/cxx/rect_blend_pow2.cc
@@ -31,11 +31,11 @@ static void _setup(void)
31 rectangles.push_back(o); 31 rectangles.push_back(o);
32 int a = 256 - (1 << ((rnd() % 8) + 1)); 32 int a = 256 - (1 << ((rnd() % 8) + 1));
33 if (a < 128) a = 128; 33 if (a < 128) a = 128;
34 int r = ((rnd()&0xff) * a) / 255; 34 int r = ((::rnd()&0xff) * a) / 255;
35 int g = ((rnd()&0xff) * a) / 255; 35 int g = ((::rnd()&0xff) * a) / 255;
36 int b = ((rnd()&0xff) * a) / 255; 36 int b = ((::rnd()&0xff) * a) / 255;
37 o.evas::object::color_set(r, g, b, a); 37 o.evas::object::color_set(r, g, b, a);
38 o.evas::object::visibility_set(true); 38 o.visibility_set(true);
39 } 39 }
40 done = 0; 40 done = 0;
41} 41}
@@ -56,12 +56,12 @@ static void _loop(double t, int f)
56 { 56 {
57 Evas_Coord w0 = 80; 57 Evas_Coord w0 = 80;
58 Evas_Coord h0 = 80; 58 Evas_Coord h0 = 80;
59 Evas_Coord w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2); 59 Evas_Coord w = 5 + ((1.0 + ::cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
60 Evas_Coord h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2); 60 Evas_Coord h = 5 + ((1.0 + ::sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
61 Evas_Coord x = (win_w / 2) - (w / 2); 61 Evas_Coord x = (win_w / 2) - (w / 2);
62 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 62 x += ::sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
63 Evas_Coord y = (win_h / 2) - (h / 2); 63 Evas_Coord y = (win_h / 2) - (h / 2);
64 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 64 y += ::cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
65 rec.evas::object::position_set(x, y); 65 rec.evas::object::position_set(x, y);
66 rec.evas::object::size_set(w, h); 66 rec.evas::object::size_set(w, h);
67 ++i; 67 ++i;
diff --git a/src/bin/cxx/rect_blend_pow2_few.cc b/src/bin/cxx/rect_blend_pow2_few.cc
index a81d57d..5bcb1dc 100644
--- a/src/bin/cxx/rect_blend_pow2_few.cc
+++ b/src/bin/cxx/rect_blend_pow2_few.cc
@@ -21,7 +21,7 @@
21/* standard var */ 21/* standard var */
22static int done = 0; 22static int done = 0;
23/* private data */ 23/* private data */
24static efl::eina::list<evas::image> images; 24static efl::eina::list<evas::rectangle> rectangles;
25 25
26/* setup */ 26/* setup */
27static void _setup(void) 27static void _setup(void)
@@ -30,14 +30,14 @@ static void _setup(void)
30 srnd(); 30 srnd();
31 for (int i = 0; i < OBNUM; i++) 31 for (int i = 0; i < OBNUM; i++)
32 { 32 {
33 evas::image o(efl::eo::parent = canvas); 33 evas::rectangle o(efl::eo::parent = canvas);
34 images.push_back(o); 34 rectangles.push_back(o);
35 int a = 256 - (1 << ((rnd() % 8) + 1)); 35 int a = 256 - (1 << ((rnd() % 8) + 1));
36 if (a < 128) a = 128; 36 if (a < 128) a = 128;
37 int r = ((rnd()&0xff) * a) / 255; 37 int r = ((rnd()&0xff) * a) / 255;
38 int g = ((rnd()&0xff) * a) / 255; 38 int g = ((rnd()&0xff) * a) / 255;
39 int b = ((rnd()&0xff) * a) / 255; 39 int b = ((rnd()&0xff) * a) / 255;
40 o.color_set(r, g, b, a); 40 o.evas::object::color_set(r, g, b, a);
41 o.visibility_set(true); 41 o.visibility_set(true);
42 } 42 }
43 done = 0; 43 done = 0;
@@ -47,9 +47,9 @@ static void _setup(void)
47/* cleanup */ 47/* cleanup */
48static void _cleanup(void) 48static void _cleanup(void)
49{ 49{
50 for (evas::image& i : images) 50 for (evas::rectangle& rec : rectangles)
51 i.parent_set(efl::eo::base(nullptr)); 51 rec.parent_set(efl::eo::base(nullptr));
52 images.clear(); 52 rectangles.clear();
53} 53}
54 54
55 55
@@ -57,18 +57,18 @@ static void _cleanup(void)
57static void _loop(double t, int f) 57static void _loop(double t, int f)
58{ 58{
59 int i = 0; 59 int i = 0;
60 for (evas::image& img : images) 60 for (evas::rectangle& rec : rectangles)
61 { 61 {
62 Evas_Coord w0 = 80; 62 Evas_Coord w0 = 80;
63 Evas_Coord h0 = 80; 63 Evas_Coord h0 = 80;
64 Evas_Coord w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2); 64 Evas_Coord w = 5 + ((1.0 + ::cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
65 Evas_Coord h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2); 65 Evas_Coord h = 5 + ((1.0 + ::sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
66 Evas_Coord x = (win_w / 2) - (w / 2); 66 Evas_Coord x = (win_w / 2) - (w / 2);
67 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2); 67 x += ::sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
68 Evas_Coord y = (win_h / 2) - (h / 2); 68 Evas_Coord y = (win_h / 2) - (h / 2);
69 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2); 69 y += ::cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
70 img.evas::object::position_set(x, y); 70 rec.evas::object::position_set(x, y);
71 img.evas::object::size_set(w, h); 71 rec.evas::object::size_set(w, h);
72 ++i; 72 ++i;
73 } 73 }
74 FPS_STD(NAME); 74 FPS_STD(NAME);
diff --git a/src/bin/cxx/rect_solid.cc b/src/bin/cxx/rect_solid.cc
index 05ddfaf..93d1d7b 100644
--- a/src/bin/cxx/rect_solid.cc
+++ b/src/bin/cxx/rect_solid.cc
@@ -18,7 +18,7 @@
18/* standard var */ 18/* standard var */
19static int done = 0; 19static int done = 0;
20/* private data */ 20/* private data */
21static efl::eina::list<evas::image> images; 21static efl::eina::list<evas::rectangle> rectangles;
22 22
23/* setup */ 23/* setup */
24static void _setup(void) 24static void _setup(void)
@@ -27,8 +27,8 @@ static void _setup(void)
27 srnd(); 27 srnd();
28 for (int i = 0; i < OBNUM; i++) 28 for (int i = 0; i < OBNUM; i++)
29 { 29 {
30 evas::image o(efl::eo::parent = canvas); 30 evas::rectangle o(efl::eo::parent = canvas);
31 images.push_back(o); 31 rectangles.push_back(o);
32 int a = 0xff; 32 int a = 0xff;
33 int r = ((rnd()&0xff) * a) / 255; 33 int r = ((rnd()&0xff) * a) / 255;
34 int g = ((rnd()&0xff) * a) / 255; 34 int g = ((rnd()&0xff) * a) / 255;
@@ -42,16 +42,16 @@ static void _setup(void)
42/* cleanup */ 42/* cleanup */
43static void _cleanup(void) 43static void _cleanup(void)
44{ 44{
45 for (evas::image& i : images) 45 for (evas::rectangle& i : rectangles)
46 i.parent_set(efl::eo::base(nullptr)); 46 i.parent_set(efl::eo::base(nullptr));
47 images.clear(); 47 rectangles.clear();
48} 48}
49 49
50/* loop - do things */ 50/* loop - do things */
51static void _loop(double t, int f) 51static void _loop(double t, int f)
52{ 52{
53 int i = 0; 53 int i = 0;
54 for (evas::image& img : images) 54 for (evas::rectangle& rec : rectangles)
55 { 55 {
56 Evas_Coord w0 = 80; 56 Evas_Coord w0 = 80;
57 Evas_Coord h0 = 80; 57 Evas_Coord h0 = 80;
@@ -61,8 +61,8 @@ static void _loop(double t, int f)
61 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 61 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
62 Evas_Coord y = (win_h / 2) - (h / 2); 62 Evas_Coord y = (win_h / 2) - (h / 2);
63 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 63 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
64 img.evas::object::position_set(x, y); 64 rec.evas::object::position_set(x, y);
65 img.evas::object::size_set(w, h); 65 rec.evas::object::size_set(w, h);
66 ++i; 66 ++i;
67 } 67 }
68 FPS_STD(NAME); 68 FPS_STD(NAME);
diff --git a/src/bin/cxx/rect_solid_few.cc b/src/bin/cxx/rect_solid_few.cc
index 47419d4..7fb7965 100644
--- a/src/bin/cxx/rect_solid_few.cc
+++ b/src/bin/cxx/rect_solid_few.cc
@@ -21,7 +21,7 @@
21/* standard var */ 21/* standard var */
22static int done = 0; 22static int done = 0;
23/* private data */ 23/* private data */
24static efl::eina::list<evas::image> images; 24static efl::eina::list<evas::rectangle> rectangles;
25 25
26/* setup */ 26/* setup */
27static void _setup(void) 27static void _setup(void)
@@ -30,14 +30,14 @@ static void _setup(void)
30 srnd(); 30 srnd();
31 for (int i = 0; i < OBNUM; i++) 31 for (int i = 0; i < OBNUM; i++)
32 { 32 {
33 evas::image o(efl::eo::parent = canvas); 33 evas::rectangle o(efl::eo::parent = canvas);
34 images.push_back(o); 34 rectangles.push_back(o);
35 int a = 0xff; 35 int a = 0xff;
36 int r = ((rnd()&0xff) * a) / 255; 36 int r = ((rnd()&0xff) * a) / 255;
37 int g = ((rnd()&0xff) * a) / 255; 37 int g = ((rnd()&0xff) * a) / 255;
38 int b = ((rnd()&0xff) * a) / 255; 38 int b = ((rnd()&0xff) * a) / 255;
39 evas_obj_color_set(r, g, b, a); 39 o.evas::object::color_set(r, g, b, a);
40 evas_obj_visibility_set(true); 40 o.visibility_set(true);
41 } 41 }
42 done = 0; 42 done = 0;
43} 43}
@@ -45,27 +45,27 @@ static void _setup(void)
45/* cleanup */ 45/* cleanup */
46static void _cleanup(void) 46static void _cleanup(void)
47{ 47{
48 for (evas::image& i : images) 48 for (evas::rectangle& rec : rectangles)
49 i.parent_set(efl::eo::base(nullptr)); 49 rec.parent_set(efl::eo::base(nullptr));
50 images.clear(); 50 rectangles.clear();
51} 51}
52 52
53/* loop - do things */ 53/* loop - do things */
54static void _loop(double t, int f) 54static void _loop(double t, int f)
55{ 55{
56 int i = 0; 56 int i = 0;
57 for (evas::image& img : images) 57 for (evas::rectangle& rec : rectangles)
58 { 58 {
59 Evas_Coord w0 = 80; 59 Evas_Coord w0 = 80;
60 Evas_Coord h0 = 80; 60 Evas_Coord h0 = 80;
61 Evas_Coord w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2); 61 Evas_Coord w = 5 + ((1.0 + ::cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
62 Evas_Coord h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2); 62 Evas_Coord h = 5 + ((1.0 + ::sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
63 Evas_Coord x = (win_w / 2) - (w / 2); 63 Evas_Coord x = (win_w / 2) - (w / 2);
64 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2); 64 x += ::sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
65 Evas_Coord y = (win_h / 2) - (h / 2); 65 Evas_Coord y = (win_h / 2) - (h / 2);
66 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2); 66 y += ::cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
67 img.evas::object::position_set(x, y); 67 rec.evas::object::position_set(x, y);
68 img.evas::object::size_set(w, h); 68 rec.evas::object::size_set(w, h);
69 ++i; 69 ++i;
70 } 70 }
71 FPS_STD(NAME); 71 FPS_STD(NAME);
diff --git a/src/bin/cxx/tests.h b/src/bin/cxx/tests.h
index a0d524e..c7839e0 100644
--- a/src/bin/cxx/tests.h
+++ b/src/bin/cxx/tests.h
@@ -3,7 +3,6 @@
3extern "C" { 3extern "C" {
4#endif 4#endif
5 5
6#include "font_effect_blur_alpha_capi.h"
7#include "image_blend_border_capi.h" 6#include "image_blend_border_capi.h"
8#include "image_blend_border_recolor_capi.h" 7#include "image_blend_border_recolor_capi.h"
9#include "image_blend_fade_pow2_unscaled_capi.h" 8#include "image_blend_fade_pow2_unscaled_capi.h"
@@ -64,10 +63,10 @@ extern "C" {
64#include "image_map_solid_rotate_capi.h" 63#include "image_map_solid_rotate_capi.h"
65#include "image_quality_scale_capi.h" 64#include "image_quality_scale_capi.h"
66#include "line_blend_capi.h" 65#include "line_blend_capi.h"
67#include "proxy_image_capi.h" 66/* #include "proxy_image_capi.h" */
68#include "proxy_image_offscreen_capi.h" 67/* #include "proxy_image_offscreen_capi.h" */
69#include "proxy_text_fixed_capi.h" 68/* #include "proxy_text_fixed_capi.h" */
70#include "proxy_text_random_capi.h" 69/* #include "proxy_text_random_capi.h" */
71#include "rect_blend_capi.h" 70#include "rect_blend_capi.h"
72#include "rect_blend_few_capi.h" 71#include "rect_blend_few_capi.h"
73#include "rect_blend_pow2_capi.h" 72#include "rect_blend_pow2_capi.h"
@@ -97,6 +96,7 @@ extern "C" {
97#include "widgets_list_3_grouped_capi.h" 96#include "widgets_list_3_grouped_capi.h"
98#include "widgets_list_4_capi.h" 97#include "widgets_list_4_capi.h"
99#include "widgets_list_4_grouped_capi.h" 98#include "widgets_list_4_grouped_capi.h"
99#include "font_effect_blur_alpha_capi.h"
100 100
101#ifdef __cplusplus 101#ifdef __cplusplus
102} 102}
diff --git a/src/bin/cxx/text_basic.cc b/src/bin/cxx/text_basic.cc
index 825e936..c38834d 100644
--- a/src/bin/cxx/text_basic.cc
+++ b/src/bin/cxx/text_basic.cc
@@ -41,6 +41,8 @@ static void _setup(void)
41/* cleanup */ 41/* cleanup */
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 for (evas::text& t : texts)
45 t.parent_set(efl::eo::base(nullptr));
44 texts.clear(); 46 texts.clear();
45} 47}
46 48
diff --git a/src/bin/cxx/text_change.cc b/src/bin/cxx/text_change.cc
index d7ae2f1..723f242 100644
--- a/src/bin/cxx/text_change.cc
+++ b/src/bin/cxx/text_change.cc
@@ -59,6 +59,8 @@ static void _setup(void)
59/* cleanup */ 59/* cleanup */
60static void _cleanup(void) 60static void _cleanup(void)
61{ 61{
62 for (evas::text& t : texts)
63 t.parent_set(efl::eo::base(nullptr));
62 texts.clear(); 64 texts.clear();
63} 65}
64 66
diff --git a/src/bin/cxx/text_styles.cc b/src/bin/cxx/text_styles.cc
index 446ec22..d5d5e82 100644
--- a/src/bin/cxx/text_styles.cc
+++ b/src/bin/cxx/text_styles.cc
@@ -21,60 +21,61 @@ static int done = 0;
21/* private data */ 21/* private data */
22static efl::eina::list<evas::text> texts; 22static efl::eina::list<evas::text> texts;
23 23
24inline Evas_Text_Style_Type
25operator++(Evas_Text_Style_Type const& x)
26{
27 int val = static_cast<int>(x);
28 return static_cast<Evas_Text_Style_Type>(val++);
29}
30
24/* setup */ 31/* setup */
25static void _setup(void) 32static void _setup(void)
26{ 33{
27#if 0 34 evas::canvas canvas(::eo_ref(G_evas));
28 int i; 35 Evas_Text_Style_Type st = EVAS_TEXT_STYLE_SHADOW;
29 Evas_Object *o; 36 for (int i = 0; i < OBNUM; i++)
30 Evas_Text_Style_Type st;
31
32 st = EVAS_TEXT_STYLE_SHADOW;
33 for (i = 0; i < OBNUM; i++)
34 { 37 {
35 o = eo_add(EVAS_TEXT_CLASS, G_evas); 38 evas::text o(efl::eo::parent = canvas);
36 o_texts[i] = o; 39 texts.push_back(o);
37 eo_do(o, 40 o.font_set("Vera-Bold", 20);
38 efl_text_properties_font_set("Vera-Bold", 20), 41 o.text_set("This is a test string");
39 efl_text_set("This is a test string"), 42 o.style_set(st);
40 evas_obj_text_style_set(st), 43 o.evas::object::color_set(255, 255, 255, 255);
41 evas_obj_color_set(255, 255, 255, 255), 44 o.shadow_color_set(0, 0, 0, 24);
42 evas_obj_text_shadow_color_set(0, 0, 0, 24), 45 o.glow_color_set(100, 80, 40, 100);
43 evas_obj_text_glow_color_set(100, 80, 40, 100), 46 o.glow2_color_set(50, 10, 5, 50);
44 evas_obj_text_glow2_color_set(50, 10, 5, 50), 47 o.outline_color_set(0, 0, 0, 255);
45 evas_obj_text_outline_color_set(0, 0, 0, 255), 48 o.visibility_set(true);
46 evas_obj_visibility_set(EINA_TRUE)); 49 ++st;
47 st++;
48 if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW; 50 if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW;
49 } 51 }
50 done = 0; 52 done = 0;
51#endif // XXX
52} 53}
53 54
54/* cleanup */ 55/* cleanup */
55static void _cleanup(void) 56static void _cleanup(void)
56{ 57{
58 for (evas::text& t : texts)
59 t.parent_set(efl::eo::base(nullptr));
57 texts.clear(); 60 texts.clear();
58} 61}
59 62
60/* loop - do things */ 63/* loop - do things */
61static void _loop(double t, int f) 64static void _loop(double t, int f)
62{ 65{
63#if 0
64 int i;
65 Evas_Coord x, y, w, h; 66 Evas_Coord x, y, w, h;
66 for (i = 0; i < OBNUM; i++) 67 int i = 0;
68 for (evas::text& t : texts)
67 { 69 {
68 eo_do(o_texts[i], evas_obj_size_get(&w, &h)); 70 t.evas::object::size_get(&w, &h);
69 x = (win_w / 2) - (w / 2); 71 x = (win_w / 2) - (w / 2);
70 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 72 x += ::sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
71 y = (win_h / 2) - (h / 2); 73 y = (win_h / 2) - (h / 2);
72 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2); 74 y += ::cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
73 eo_do(o_texts[i], evas_obj_position_set(x, y)); 75 t.evas::object::position_set(x, y);
76 ++i;
74 } 77 }
75 FPS_STD(NAME); 78 FPS_STD(NAME);
76#endif // XXX
77 FPS_STD(NAME);
78} 79}
79 80
80static void _key(char *key) 81static void _key(char *key)
diff --git a/src/bin/cxx/text_styles_different_strings.cc b/src/bin/cxx/text_styles_different_strings.cc
index 736c371..8f9af94 100644
--- a/src/bin/cxx/text_styles_different_strings.cc
+++ b/src/bin/cxx/text_styles_different_strings.cc
@@ -31,8 +31,7 @@ operator++(Evas_Text_Style_Type const& x)
31/* setup */ 31/* setup */
32static void _setup(void) 32static void _setup(void)
33{ 33{
34#if 0 34 evas::canvas canvas(::eo_ref(G_evas));
35 Evas_Object *o;
36 Evas_Text_Style_Type st; 35 Evas_Text_Style_Type st;
37 char buf[1024]; 36 char buf[1024];
38 const char *strs[] = { 37 const char *strs[] = {
@@ -45,33 +44,34 @@ static void _setup(void)
45 st = EVAS_TEXT_STYLE_SHADOW; 44 st = EVAS_TEXT_STYLE_SHADOW;
46 for (int i = 0; i < OBNUM; i++) 45 for (int i = 0; i < OBNUM; i++)
47 { 46 {
48 o = eo_add(EVAS_TEXT_CLASS, G_evas); 47 evas::text o(efl::eo::parent = canvas);
49 o_texts[i] = o; 48 texts.push_back(o);
50 eo_do(o, efl_text_properties_font_set("Vera-Bold", 20)); 49 o.font_set("Vera-Bold", 20);
51 snprintf(buf, sizeof(buf), "%s %s %s %s.", 50 snprintf(buf, sizeof(buf), "%s %s %s %s.",
52 strs[rnd() % (sizeof(strs) / sizeof(char *))], 51 strs[rnd() % (sizeof(strs) / sizeof(char *))],
53 strs[rnd() % (sizeof(strs) / sizeof(char *))], 52 strs[rnd() % (sizeof(strs) / sizeof(char *))],
54 strs[rnd() % (sizeof(strs) / sizeof(char *))], 53 strs[rnd() % (sizeof(strs) / sizeof(char *))],
55 strs[rnd() % (sizeof(strs) / sizeof(char *))]); 54 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
56 eo_do(o, efl_text_set(buf), 55 o.text_set(buf);
57 evas_obj_text_style_set(st), 56 o.style_set(st);
58 evas_obj_color_set(255, 255, 255, 255), 57 o.evas::object::color_set(255, 255, 255, 255);
59 evas_obj_text_shadow_color_set(0, 0, 0, 24), 58 o.shadow_color_set(0, 0, 0, 24);
60 evas_obj_text_glow_color_set(100, 80, 40, 100), 59 o.glow_color_set(100, 80, 40, 100);
61 evas_obj_text_glow2_color_set(50, 10, 5, 50), 60 o.glow2_color_set(50, 10, 5, 50);
62 evas_obj_text_outline_color_set(0, 0, 0, 255), 61 o.outline_color_set(0, 0, 0, 255);
63 evas_obj_visibility_set(EINA_TRUE)); 62 o.visibility_set(true);
64 st++; 63 ++st;
65 if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW; 64 if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW;
66 } 65 }
67 done = 0; 66 done = 0;
68#endif
69} 67}
70 68
71 69
72/* cleanup */ 70/* cleanup */
73static void _cleanup(void) 71static void _cleanup(void)
74{ 72{
73 for (evas::text& t : texts)
74 t.parent_set(efl::eo::base(nullptr));
75 texts.clear(); 75 texts.clear();
76} 76}
77 77
diff --git a/src/bin/cxx/widgets_file_icons.cc b/src/bin/cxx/widgets_file_icons.cc
index 2c373f7..a3815cb 100644
--- a/src/bin/cxx/widgets_file_icons.cc
+++ b/src/bin/cxx/widgets_file_icons.cc
@@ -47,28 +47,26 @@ static const char *icons[] = // XXX
47/* setup */ 47/* setup */
48static void _setup(void) 48static void _setup(void)
49{ 49{
50#if 0
51 evas::canvas canvas(::eo_ref(G_evas)); 50 evas::canvas canvas(::eo_ref(G_evas));
52 for (int i = 0; i < NUM; i++) 51 for (int i = 0; i < NUM; i++)
53 { 52 {
54 evas::image o(efl::eo::parent = canvas); 53 evas::image o1(efl::eo::parent = canvas);
55 images.push_back(o); 54 images.push_back(o1);
56 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL), 55 eo_do(o1._eo_ptr(), efl_file_set(build_path(icons[i % 13]), NULL)); // XXX
57 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 56 o1.fill_set(0, 0, ICON_SIZE, ICON_SIZE);
58 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 57 o1.evas::object::size_set(ICON_SIZE, ICON_SIZE);
59 evas_obj_visibility_set(EINA_TRUE)); 58 o1.visibility_set(true);
60 59
61 o = eo_add(EVAS_TEXT_CLASS, G_evas); 60 evas::text o2(efl::eo::parent = canvas);
62 o_texts[i] = o; 61 texts.push_back(o2);
63 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), 62 o2.font_set("Vera-Bold", 10);
64 efl_text_set(icons[i % 13]), 63 o2.text_set(icons[i % 13]);
65 evas_obj_text_style_set(EVAS_TEXT_STYLE_FAR_SOFT_SHADOW), 64 o2.style_set(EVAS_TEXT_STYLE_FAR_SOFT_SHADOW);
66 evas_obj_color_set(255, 255, 255, 255), 65 o2.evas::object::color_set(255, 255, 255, 255);
67 evas_obj_text_shadow_color_set(0, 0, 0, 24), 66 o2.shadow_color_set(0, 0, 0, 24);
68 evas_obj_visibility_set(EINA_TRUE)); 67 o2.visibility_set(true);
69 } 68 }
70 done = 0; 69 done = 0;
71#endif
72} 70}
73 71
74/* cleanup */ 72/* cleanup */
@@ -77,6 +75,7 @@ static void _cleanup(void)
77 for (evas::image& i : images) 75 for (evas::image& i : images)
78 i.parent_set(efl::eo::base(nullptr)); 76 i.parent_set(efl::eo::base(nullptr));
79 images.clear(); 77 images.clear();
78
80 for (evas::text& t : texts) 79 for (evas::text& t : texts)
81 t.parent_set(efl::eo::base(nullptr)); 80 t.parent_set(efl::eo::base(nullptr));
82 texts.clear(); 81 texts.clear();
@@ -86,17 +85,21 @@ static void _cleanup(void)
86/* loop - do things */ 85/* loop - do things */
87static void _loop(double t, int f) 86static void _loop(double t, int f)
88{ 87{
89#if 0
90 int i;
91 Evas_Coord x, y, tw, th, cent; 88 Evas_Coord x, y, tw, th, cent;
92 x = 0; 89 x = 0;
93 y = 0 - f; 90 y = 0 - f;
94 for (i = 0; i < NUM; i++) 91 efl::eina::list<evas::image>::iterator
92 it1 = images.begin(),
93 end1 = images.end();
94 efl::eina::list<evas::text>::iterator
95 it2 = texts.begin(),
96 end2 = texts.end();
97 for (; it1 != end1 && it2 != end2; ++it1, ++it2)
95 { 98 {
96 eo_do(o_images[i], evas_obj_position_set(x + 8, y)); 99 (*it1).evas::object::position_set(x + 8, y);
97 eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); 100 (*it2).evas::object::size_get(&tw, &th);
98 cent = (ICON_SIZE + 16 - tw) / 2; 101 cent = (ICON_SIZE + 16 - tw) / 2;
99 eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4)); 102 (*it2).evas::object::position_set(x + cent, y + ICON_SIZE + 4);
100 x += ICON_SIZE + 16; 103 x += ICON_SIZE + 16;
101 if (x > win_w) 104 if (x > win_w)
102 { 105 {
@@ -105,8 +108,6 @@ static void _loop(double t, int f)
105 } 108 }
106 } 109 }
107 FPS_STD(NAME); 110 FPS_STD(NAME);
108#endif // XXX
109 FPS_STD(NAME);
110} 111}
111 112
112static void _key(char *key) 113static void _key(char *key)
diff --git a/src/bin/cxx/widgets_file_icons_2.cc b/src/bin/cxx/widgets_file_icons_2.cc
index b6766fd..5aa1e0c 100644
--- a/src/bin/cxx/widgets_file_icons_2.cc
+++ b/src/bin/cxx/widgets_file_icons_2.cc
@@ -46,27 +46,24 @@ static const char *icons[] = // XXX
46/* setup */ 46/* setup */
47static void _setup(void) 47static void _setup(void)
48{ 48{
49#if 0
50 int i;
51 evas::canvas canvas(::eo_ref(G_evas)); 49 evas::canvas canvas(::eo_ref(G_evas));
52 for (i = 0; i < NUM; i++) 50 for (int i = 0; i < NUM; i++)
53 { 51 {
54 evas::image o(efl::eo::parent = canvas); 52 evas::image o1(efl::eo::parent = canvas);
55 images.push_back(o); 53 images.push_back(o1);
56 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL), 54 eo_do(o1._eo_ptr(), efl_file_set(build_path(icons[i % 13]), NULL)); // XXX
57 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 55 o1.fill_set(0, 0, ICON_SIZE, ICON_SIZE);
58 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 56 o1.evas::object::size_set(ICON_SIZE, ICON_SIZE);
59 evas_obj_visibility_set(EINA_TRUE)); 57 o1.visibility_set(true);
60 58
61 o = eo_add(EVAS_TEXT_CLASS, G_evas); 59 evas::text o2(efl::eo::parent = canvas);
62 o_texts[i] = o; 60 texts.push_back(o2);
63 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), 61 o2.font_set("Vera-Bold", 10);
64 efl_text_set(icons[i % 13]), 62 o2.text_set(icons[i % 13]);
65 evas_obj_color_set(0, 0, 0, 255), 63 o2.evas::object::color_set(0, 0, 0, 255);
66 evas_obj_visibility_set(EINA_TRUE)); 64 o2.visibility_set(true);
67 } 65 }
68 done = 0; 66 done = 0;
69#endif
70} 67}
71 68
72/* cleanup */ 69/* cleanup */
@@ -75,6 +72,7 @@ static void _cleanup(void)
75 for (evas::image& i : images) 72 for (evas::image& i : images)
76 i.parent_set(efl::eo::base(nullptr)); 73 i.parent_set(efl::eo::base(nullptr));
77 images.clear(); 74 images.clear();
75
78 for (evas::text& t : texts) 76 for (evas::text& t : texts)
79 t.parent_set(efl::eo::base(nullptr)); 77 t.parent_set(efl::eo::base(nullptr));
80 texts.clear(); 78 texts.clear();
@@ -83,17 +81,22 @@ static void _cleanup(void)
83/* loop - do things */ 81/* loop - do things */
84static void _loop(double t, int f) 82static void _loop(double t, int f)
85{ 83{
86#if 0
87 int i;
88 Evas_Coord x, y, tw, th, cent; 84 Evas_Coord x, y, tw, th, cent;
89 x = 0; 85 x = 0;
90 y = 0 - f; 86 y = 0 - f;
91 for (i = 0; i < NUM; i++) 87 efl::eina::list<evas::image>::iterator
88 it1 = images.begin(),
89 end1 = images.end();
90 efl::eina::list<evas::text>::iterator
91 it2 = texts.begin(),
92 end2 = texts.end();
93 if (images.empty() || texts.empty()) goto fps; // XXX
94 for (int i = 0; i < NUM; i++)
92 { 95 {
93 eo_do(o_images[i], evas_obj_position_set(x + 8, y)); 96 (*it1).evas::object::position_set(x + 8, y);
94 eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); 97 (*it2).evas::object::size_get(&tw, &th);
95 cent = (ICON_SIZE + 16 - tw) / 2; 98 cent = (ICON_SIZE + 16 - tw) / 2;
96 eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4)); 99 (*it2).evas::object::position_set(x + cent, y + ICON_SIZE + 4);
97 x += ICON_SIZE + 16; 100 x += ICON_SIZE + 16;
98 if (x > win_w) 101 if (x > win_w)
99 { 102 {
@@ -101,8 +104,7 @@ static void _loop(double t, int f)
101 y += ICON_SIZE + 16; 104 y += ICON_SIZE + 16;
102 } 105 }
103 } 106 }
104 FPS_STD(NAME); 107 fps:
105#endif
106 FPS_STD(NAME); 108 FPS_STD(NAME);
107} 109}
108 110
diff --git a/src/bin/cxx/widgets_file_icons_2_grouped.cc b/src/bin/cxx/widgets_file_icons_2_grouped.cc
index 212b9e8..10f714b 100644
--- a/src/bin/cxx/widgets_file_icons_2_grouped.cc
+++ b/src/bin/cxx/widgets_file_icons_2_grouped.cc
@@ -47,36 +47,36 @@ static const char *icons[] =
47/* setup */ 47/* setup */
48static void _setup(void) 48static void _setup(void)
49{ 49{
50#if 0
51 int i;
52 evas::canvas canvas(::eo_ref(G_evas)); 50 evas::canvas canvas(::eo_ref(G_evas));
53 for (i = 0; i < NUM; i++) 51 for (int i = 0; i < NUM; i++)
54 { 52 {
55 evas::image o(efl::eo::parent = canvas); 53 evas::image o1(efl::eo::parent = canvas);
56 images.push_back(o); 54 images.push_back(o1);
57 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL), 55 eo_do(o1._eo_ptr(), efl_file_set(build_path(icons[i % 13]), NULL)); // XXX
58 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 56 o1.fill_set(0, 0, ICON_SIZE, ICON_SIZE);
59 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 57 o1.evas::object::size_set(win_w, ICON_SIZE);
60 evas_obj_visibility_set(EINA_TRUE)); 58 o1.visibility_set(true);
61 59
62 o = eo_add(EVAS_TEXT_CLASS, G_evas); 60 evas::text o2(efl::eo::parent = canvas);
63 o_texts[i] = o; 61 texts.push_back(o2);
64 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), 62 o2.font_set("Vera-Bold", 10);
65 efl_text_set(icons[i % 13]), 63 o2.text_set(icons[i % 13]);
66 evas_obj_color_set(0, 0, 0, 255), 64 o2.evas::object::color_set(0, 0, 0, 255);
67 evas_obj_visibility_set(EINA_TRUE)); 65 o2.visibility_set(true);
68 } 66 }
69 for (i = 0; i < NUM; i++) 67 for (evas::image& img : images)
70 { 68 {
71 eo_do(images[i], evas_obj_raise()); 69 img.raise();
72 } 70 }
73 for (i = 0; i < NUM; i++) 71 efl::eina::list<evas::image>::iterator
72 it1 = images.begin(),
73 it2 = images.begin();
74 for (int i = 0; i < NUM; i++, ++it1)
74 { 75 {
75 if (i > 13) 76 if (i > 13)
76 eo_do(images[i], evas_obj_stack_above(images[i - 13])); 77 (*it1).stack_above(*it2++);
77 } 78 }
78 done = 0; 79 done = 0;
79#endif // XXX
80} 80}
81 81
82/* cleanup */ 82/* cleanup */
@@ -85,6 +85,7 @@ static void _cleanup(void)
85 for (evas::image& i : images) 85 for (evas::image& i : images)
86 i.parent_set(efl::eo::base(nullptr)); 86 i.parent_set(efl::eo::base(nullptr));
87 images.clear(); 87 images.clear();
88
88 for (evas::text& t : texts) 89 for (evas::text& t : texts)
89 t.parent_set(efl::eo::base(nullptr)); 90 t.parent_set(efl::eo::base(nullptr));
90 texts.clear(); 91 texts.clear();
@@ -93,17 +94,21 @@ static void _cleanup(void)
93/* loop - do things */ 94/* loop - do things */
94static void _loop(double t, int f) 95static void _loop(double t, int f)
95{ 96{
96#if 0
97 int i;
98 Evas_Coord x, y, tw, th, cent; 97 Evas_Coord x, y, tw, th, cent;
99 x = 0; 98 x = 0;
100 y = 0 - f; 99 y = 0 - f;
101 for (i = 0; i < NUM; i++) 100 efl::eina::list<evas::image>::iterator
101 it1 = images.begin(),
102 end1 = images.end();
103 efl::eina::list<evas::text>::iterator
104 it2 = texts.begin(),
105 end2 = texts.end();
106 for (; it1 != end1 && it2 != end2; ++it1, ++it2)
102 { 107 {
103 eo_do(o_images[i], evas_obj_position_set(x + 8, y)); 108 (*it1).evas::object::position_set(x + 8, y);
104 eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); 109 (*it2).evas::object::size_get(&tw, &th);
105 cent = (ICON_SIZE + 16 - tw) / 2; 110 cent = (ICON_SIZE + 16 - tw) / 2;
106 eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4)); 111 (*it2).evas::object::position_set(x + cent, y + ICON_SIZE + 4);
107 x += ICON_SIZE + 16; 112 x += ICON_SIZE + 16;
108 if (x > win_w) 113 if (x > win_w)
109 { 114 {
@@ -112,8 +117,6 @@ static void _loop(double t, int f)
112 } 117 }
113 } 118 }
114 FPS_STD(NAME); 119 FPS_STD(NAME);
115#endif // XXX
116 FPS_STD(NAME);
117} 120}
118 121
119static void _key(char *key) 122static void _key(char *key)
diff --git a/src/bin/cxx/widgets_file_icons_2_same.cc b/src/bin/cxx/widgets_file_icons_2_same.cc
index 373e938..3802c64 100644
--- a/src/bin/cxx/widgets_file_icons_2_same.cc
+++ b/src/bin/cxx/widgets_file_icons_2_same.cc
@@ -32,27 +32,24 @@ static const char *icons[] = // XXX
32/* setup */ 32/* setup */
33static void _setup(void) 33static void _setup(void)
34{ 34{
35#if 0
36 int i;
37 evas::canvas canvas(::eo_ref(G_evas)); 35 evas::canvas canvas(::eo_ref(G_evas));
38 for (i = 0; i < NUM; i++) 36 for (int i = 0; i < NUM; i++)
39 { 37 {
40 evas::image o(efl::eo::parent = canvas); 38 evas::image o1(efl::eo::parent = canvas);
41 images.push_back(o); 39 images.push_back(o1);
42 eo_do(o, efl_file_set(build_path(icons[i % 1]), NULL), 40 eo_do(o1._eo_ptr(), efl_file_set(build_path(icons[i % 1]), NULL)); // XXX
43 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 41 o1.fill_set(0, 0, ICON_SIZE, ICON_SIZE);
44 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 42 o1.evas::object::size_set(ICON_SIZE, ICON_SIZE);
45 evas_obj_visibility_set(EINA_TRUE)); 43 o1.visibility_set(true);
46 44
47 o = eo_add(EVAS_TEXT_CLASS, G_evas); 45 evas::text o2(efl::eo::parent = canvas);
48 o_texts[i] = o; 46 texts.push_back(o2);
49 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), 47 o2.font_set("Vera-Bold", 10);
50 efl_text_set(icons[i % 1]), 48 o2.text_set(icons[i % 1]);
51 evas_obj_color_set(0, 0, 0, 255), 49 o2.evas::object::color_set(0, 0, 0, 255);
52 evas_obj_visibility_set(EINA_TRUE)); 50 o2.visibility_set(true);
53 } 51 }
54 done = 0; 52 done = 0;
55#endif // XXX
56} 53}
57 54
58/* cleanup */ 55/* cleanup */
@@ -69,17 +66,21 @@ static void _cleanup(void)
69/* loop - do things */ 66/* loop - do things */
70static void _loop(double t, int f) 67static void _loop(double t, int f)
71{ 68{
72#if 0
73 int i;
74 Evas_Coord x, y, tw, th, cent; 69 Evas_Coord x, y, tw, th, cent;
75 x = 0; 70 x = 0;
76 y = 0 - f; 71 y = 0 - f;
77 for (i = 0; i < NUM; i++) 72 efl::eina::list<evas::image>::iterator
73 it1 = images.begin(),
74 end1 = images.end();
75 efl::eina::list<evas::text>::iterator
76 it2 = texts.begin(),
77 end2 = texts.end();
78 for (; it1 != end1 && it2 != end2; ++it1, ++it2)
78 { 79 {
79 eo_do(o_images[i], evas_obj_position_set(x + 8, y)); 80 (*it1).evas::object::position_set(x + 8, y);
80 eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); 81 (*it2).evas::object::size_get(&tw, &th);
81 cent = (ICON_SIZE + 16 - tw) / 2; 82 cent = (ICON_SIZE + 16 - tw) / 2;
82 eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4)); 83 (*it2).evas::object::position_set(x + cent, y + ICON_SIZE + 4);
83 x += ICON_SIZE + 16; 84 x += ICON_SIZE + 16;
84 if (x > win_w) 85 if (x > win_w)
85 { 86 {
@@ -88,8 +89,6 @@ static void _loop(double t, int f)
88 } 89 }
89 } 90 }
90 FPS_STD(NAME); 91 FPS_STD(NAME);
91#endif
92 FPS_STD(NAME);
93} 92}
94 93
95static void _key(char *key) 94static void _key(char *key)
diff --git a/src/bin/cxx/widgets_file_icons_2_same_grouped.cc b/src/bin/cxx/widgets_file_icons_2_same_grouped.cc
index c0c72f8..688f705 100644
--- a/src/bin/cxx/widgets_file_icons_2_same_grouped.cc
+++ b/src/bin/cxx/widgets_file_icons_2_same_grouped.cc
@@ -31,60 +31,61 @@ static const char *icons[] =
31/* setup */ 31/* setup */
32static void _setup(void) 32static void _setup(void)
33{ 33{
34#if 0
35 int i;
36 evas::canvas canvas(::eo_ref(G_evas)); 34 evas::canvas canvas(::eo_ref(G_evas));
37 for (i = 0; i < NUM; i++) 35 for (int i = 0; i < NUM; i++)
38 { 36 {
39 evas::image o(efl::eo::parent = canvas); 37 evas::image o1(efl::eo::parent = canvas);
40 images.push_back(o); 38 images.push_back(o1);
41 eo_do(o, efl_file_set(build_path(icons[i % 1]), NULL), 39 eo_do(o1._eo_ptr(), efl_file_set(build_path(icons[i % 1]), NULL)); // XXX
42 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 40 o1.fill_set(0, 0, ICON_SIZE, ICON_SIZE);
43 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 41 o1.evas::object::size_set(ICON_SIZE, ICON_SIZE);
44 evas_obj_visibility_set(EINA_TRUE)); 42 o1.visibility_set(true);
45 43
46 o = eo_add(EVAS_TEXT_CLASS, G_evas); 44 evas::text o2(efl::eo::parent = canvas);
47 o_texts[i] = o; 45 texts.push_back(o2);
48 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), 46 o2.font_set("Vera-Bold", 10);
49 efl_text_set(icons[i % 1]), 47 o2.text_set(icons[i % 1]);
50 evas_obj_color_set(0, 0, 0, 255), 48 o2.evas::object::color_set(0, 0, 0, 255);
51 evas_obj_visibility_set(EINA_TRUE)); 49 o2.visibility_set(true);
52 } 50 }
53 for (i = 0; i < NUM; i++) 51 for (evas::image img : images)
54 { 52 {
55 eo_do(images[i], evas_obj_raise()); 53 img.raise();
56 } 54 }
55
57 done = 0; 56 done = 0;
58#endif // XXX
59} 57}
60 58
61/* cleanup */ 59/* cleanup */
62static void _cleanup(void) 60static void _cleanup(void)
63{ 61{
64#if 0 62 for (evas::image& i : images)
65 int i; 63 i.parent_set(efl::eo::base(nullptr));
66 for (i = 0; i < NUM; i++) 64 images.clear();
67 { 65
68 eo_del(images[i]); 66 for (evas::text& t : texts)
69 eo_del(o_texts[i]); 67 t.parent_set(efl::eo::base(nullptr));
70 } 68 texts.clear();
71#endif // XXX
72} 69}
73 70
74/* loop - do things */ 71/* loop - do things */
75static void _loop(double t, int f) 72static void _loop(double t, int f)
76{ 73{
77#if 0
78 int i;
79 Evas_Coord x, y, tw, th, cent; 74 Evas_Coord x, y, tw, th, cent;
80 x = 0; 75 x = 0;
81 y = 0 - f; 76 y = 0 - f;
82 for (i = 0; i < NUM; i++) 77 efl::eina::list<evas::image>::iterator
78 it1 = images.begin(),
79 end1 = images.end();
80 efl::eina::list<evas::text>::iterator
81 it2 = texts.begin(),
82 end2 = texts.end();
83 for (; it1 != end1 && it2 != end2; ++it1, ++it2)
83 { 84 {
84 eo_do(images[i], evas_obj_position_set(x + 8, y)); 85 (*it1).evas::object::position_set(x + 8, y);
85 eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); 86 (*it2).evas::object::size_get(&tw, &th);
86 cent = (ICON_SIZE + 16 - tw) / 2; 87 cent = (ICON_SIZE + 16 - tw) / 2;
87 eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4)); 88 (*it2).evas::object::position_set(x + cent, y + ICON_SIZE + 4);
88 x += ICON_SIZE + 16; 89 x += ICON_SIZE + 16;
89 if (x > win_w) 90 if (x > win_w)
90 { 91 {
@@ -92,9 +93,7 @@ static void _loop(double t, int f)
92 y += ICON_SIZE + 16; 93 y += ICON_SIZE + 16;
93 } 94 }
94 } 95 }
95#endif
96 FPS_STD(NAME); 96 FPS_STD(NAME);
97 FPS_STD(NAME);
98} 97}
99 98
100/* prepend special key handlers if interactive (before STD) */ 99/* prepend special key handlers if interactive (before STD) */
diff --git a/src/bin/cxx/widgets_file_icons_3.cc b/src/bin/cxx/widgets_file_icons_3.cc
index d7cfef8..56077ad 100644
--- a/src/bin/cxx/widgets_file_icons_3.cc
+++ b/src/bin/cxx/widgets_file_icons_3.cc
@@ -46,27 +46,24 @@ static const char *icons[] =
46/* setup */ 46/* setup */
47static void _setup(void) 47static void _setup(void)
48{ 48{
49#if 0
50 int i;
51 evas::canvas canvas(::eo_ref(G_evas)); 49 evas::canvas canvas(::eo_ref(G_evas));
52 for (i = 0; i < NUM; i++) 50 for (int i = 0; i < NUM; i++)
53 { 51 {
54 evas::image o(efl::eo::parent = canvas); 52 evas::image o1(efl::eo::parent = canvas);
55 images.push_back(o); 53 images.push_back(o1);
56 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL), 54 eo_do(o1._eo_ptr(), efl_file_set(build_path(icons[i % 13]), NULL)); // XXX
57 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 55 o1.fill_set(0, 0, ICON_SIZE, ICON_SIZE);
58 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 56 o1.evas::object::size_set(ICON_SIZE, ICON_SIZE);
59 evas_obj_visibility_set(EINA_TRUE)); 57 o1.visibility_set(true);
60 58
61 o = eo_add(EVAS_TEXT_CLASS, G_evas); 59 evas::text o2(efl::eo::parent = canvas);
62 o_texts[i] = o; 60 texts.push_back(o2);
63 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), 61 o2.font_set("Vera-Bold", 10);
64 efl_text_set(icons[i % 13]), 62 o2.text_set(icons[i % 13]);
65 evas_obj_color_set(0, 0, 0, 255), 63 o2.evas::object::color_set(0, 0, 0, 255);
66 evas_obj_visibility_set(EINA_TRUE)); 64 o2.visibility_set(true);
67 } 65 }
68 done = 0; 66 done = 0;
69#endif
70} 67}
71 68
72/* cleanup */ 69/* cleanup */
@@ -83,17 +80,22 @@ static void _cleanup(void)
83/* loop - do things */ 80/* loop - do things */
84static void _loop(double t, int f) 81static void _loop(double t, int f)
85{ 82{
86#if 0
87 int i;
88 Evas_Coord x, y, tw, th, cent; 83 Evas_Coord x, y, tw, th, cent;
89 x = 0; 84 x = 0;
90 y = 0 - f; 85 y = 0 - f;
91 for (i = 0; i < NUM; i++) 86 efl::eina::list<evas::image>::iterator
87 it1 = images.begin(),
88 end1 = images.end();
89 efl::eina::list<evas::text>::iterator
90 it2 = texts.begin(),
91 end2 = texts.end();
92 for (; it1 != end1 && it2 != end2; ++it1, ++it2)
92 { 93 {
93 eo_do(o_images[i], evas_obj_position_set(x + 8, y)); 94 (*it1).evas::object::position_set(x + 8, y);
94 eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); 95 (*it2).evas::object::size_get(&tw, &th);
95 cent = (ICON_SIZE + 16 - tw) / 2; 96 cent = (ICON_SIZE + 16 - tw) / 2;
96 eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4)); 97 (*it2).evas::object::position_set(x + cent, y + ICON_SIZE + 4);
98
97 x += ICON_SIZE + 16; 99 x += ICON_SIZE + 16;
98 if (x > win_w) 100 if (x > win_w)
99 { 101 {
@@ -102,8 +104,6 @@ static void _loop(double t, int f)
102 } 104 }
103 } 105 }
104 FPS_STD(NAME); 106 FPS_STD(NAME);
105#endif // XXX
106 FPS_STD(NAME);
107} 107}
108 108
109 109
diff --git a/src/bin/cxx/widgets_file_icons_4.cc b/src/bin/cxx/widgets_file_icons_4.cc
index d186c73..22ff1cd 100644
--- a/src/bin/cxx/widgets_file_icons_4.cc
+++ b/src/bin/cxx/widgets_file_icons_4.cc
@@ -46,27 +46,24 @@ static const char *icons[] =
46/* setup */ 46/* setup */
47static void _setup(void) 47static void _setup(void)
48{ 48{
49#if 0
50 int i;
51 evas::canvas canvas(::eo_ref(G_evas)); 49 evas::canvas canvas(::eo_ref(G_evas));
52 for (i = 0; i < NUM; i++) 50 for (int i = 0; i < NUM; i++)
53 { 51 {
54 evas::image o(efl::eo::parent = canvas); 52 evas::image o1(efl::eo::parent = canvas);
55 images.push_back(o); 53 images.push_back(o1);
56 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL), 54 eo_do(o1._eo_ptr(), efl_file_set(build_path(icons[i % 13]), NULL));
57 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 55 o1.fill_set(0, 0, ICON_SIZE, ICON_SIZE);
58 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 56 o1.size_set(ICON_SIZE, ICON_SIZE);
59 evas_obj_visibility_set(EINA_TRUE)); 57 o1.visibility_set(true);
60 58
61 o = eo_add(EVAS_TEXT_CLASS, G_evas); 59 evas::text o2(efl::eo::parent = canvas);
62 o_texts[i] = o; 60 texts.push_back(o2);
63 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), 61 o2.font_set("Vera-Bold", 10);
64 efl_text_set(icons[i % 13]), 62 o2.text_set(icons[i % 13]);
65 evas_obj_color_set(0, 0, 0, 255), 63 o2.evas::object::color_set(0, 0, 0, 255);
66 evas_obj_visibility_set(EINA_TRUE)); 64 o2.visibility_set(true);
67 } 65 }
68 done = 0; 66 done = 0;
69#endif
70} 67}
71 68
72/* cleanup */ 69/* cleanup */
@@ -83,17 +80,21 @@ static void _cleanup(void)
83/* loop - do things */ 80/* loop - do things */
84static void _loop(double t, int f) 81static void _loop(double t, int f)
85{ 82{
86#if 0
87 int i;
88 Evas_Coord x, y, tw, th, cent; 83 Evas_Coord x, y, tw, th, cent;
89 x = 0; 84 x = 0;
90 y = 0 - f; 85 y = 0 - f;
91 for (i = 0; i < NUM; i++) 86 efl::eina::list<evas::image>::iterator
87 it1 = images.begin(),
88 end1 = images.end();
89 efl::eina::list<evas::text>::iterator
90 it2 = texts.begin(),
91 end2 = texts.end();
92 for (; it1 != end1 && it2 != end2; ++it1, ++it2)
92 { 93 {
93 eo_do(o_images[i], evas_obj_position_set(x + 8, y)); 94 (*it1).evas::object::position_set(x + 8, y);
94 eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); 95 (*it2).evas::object::size_get(&tw, &th);
95 cent = (ICON_SIZE + 16 - tw) / 2; 96 cent = (ICON_SIZE + 16 - tw) / 2;
96 eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4)); 97 (*it2).evas::object::position_set(x + cent, y + ICON_SIZE + 4);
97 x += ICON_SIZE + 16; 98 x += ICON_SIZE + 16;
98 if (x > win_w) 99 if (x > win_w)
99 { 100 {
@@ -102,8 +103,6 @@ static void _loop(double t, int f)
102 } 103 }
103 } 104 }
104 FPS_STD(NAME); 105 FPS_STD(NAME);
105#endif
106 FPS_STD(NAME);
107} 106}
108 107
109static void _key(char *key) 108static void _key(char *key)
diff --git a/src/bin/cxx/widgets_list_1.cc b/src/bin/cxx/widgets_list_1.cc
index 15ce04c..2d820b6 100644
--- a/src/bin/cxx/widgets_list_1.cc
+++ b/src/bin/cxx/widgets_list_1.cc
@@ -63,28 +63,25 @@ static const char *labels[] =
63/* setup */ 63/* setup */
64static void _setup(void) 64static void _setup(void)
65{ 65{
66#if 0
67 int i;
68 evas::canvas canvas(::eo_ref(G_evas)); 66 evas::canvas canvas(::eo_ref(G_evas));
69 for (i = 0; i < NUM; i++) 67 for (int i = 0; i < NUM; i++)
70 { 68 {
71 evas::image o(efl::eo::parent = canvas); 69 evas::image o1(efl::eo::parent = canvas);
72 images.push_back(o); 70 images.push_back(o1);
73 eo_do(o, evas_obj_image_filled_set(1), 71 o1.filled_set(1);
74 evas_obj_image_border_set(2, 2, 2, 2), 72 o1.border_set(2, 2, 2, 2);
75 efl_file_set(build_path("pan.png"), NULL), 73 eo_do(o1._eo_ptr(), efl_file_set(build_path("pan.png"), NULL));
76 evas_obj_size_set(win_w, ICON_SIZE), 74 o1.evas::object::size_set(win_w, ICON_SIZE);
77 evas_obj_visibility_set(EINA_TRUE)); 75 o1.visibility_set(true);
78 76
79 o = eo_add(EVAS_TEXT_CLASS, G_evas); 77 evas::text o2(efl::eo::parent = canvas);
80 o_texts[i] = o; 78 texts.push_back(o2);
81 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), 79 o2.font_set("Vera-Bold", 10);
82 efl_text_set(labels[i % 26]), 80 o2.text_set(labels[i % 26]);
83 evas_obj_color_set(0, 0, 0, 255), 81 o2.evas::object::color_set(0, 0, 0, 255);
84 evas_obj_visibility_set(EINA_TRUE)); 82 o2.visibility_set(true);
85 } 83 }
86 done = 0; 84 done = 0;
87#endif // XXX
88} 85}
89 86
90/* cleanup */ 87/* cleanup */
@@ -93,6 +90,7 @@ static void _cleanup(void)
93 for (evas::image& i : images) 90 for (evas::image& i : images)
94 i.parent_set(efl::eo::base(nullptr)); 91 i.parent_set(efl::eo::base(nullptr));
95 images.clear(); 92 images.clear();
93
96 for (evas::text& t : texts) 94 for (evas::text& t : texts)
97 t.parent_set(efl::eo::base(nullptr)); 95 t.parent_set(efl::eo::base(nullptr));
98 texts.clear(); 96 texts.clear();
@@ -101,22 +99,25 @@ static void _cleanup(void)
101/* loop - do things */ 99/* loop - do things */
102static void _loop(double t, int f) 100static void _loop(double t, int f)
103{ 101{
104#if 0 102
105 int i;
106 Evas_Coord x, y, tw, th, cent; 103 Evas_Coord x, y, tw, th, cent;
107 x = 0; 104 x = 0;
108 y = 0 - f; 105 y = 0 - f;
109 for (i = 0; i < NUM; i++) 106 efl::eina::list<evas::image>::iterator
107 it1 = images.begin(),
108 end1 = images.end();
109 efl::eina::list<evas::text>::iterator
110 it2 = texts.begin(),
111 end2 = texts.end();
112 for (; it1 != end1 && it2 != end2; ++it1, ++it2)
110 { 113 {
111 eo_do(o_images[i], evas_obj_position_set(x, y)); 114 (*it1).evas::object::position_set(x, y);
112 eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); 115 (*it2).evas::object::size_get(&tw, &th);
113 cent = (ICON_SIZE - th) / 2; 116 cent = (ICON_SIZE - th) / 2;
114 eo_do(o_texts[i], evas_obj_position_set(x + 8, y + cent)); 117 (*it2).evas::object::position_set(x + 8, y + cent);
115 y += ICON_SIZE; 118 y += ICON_SIZE;
116 } 119 }
117 FPS_STD(NAME); 120 FPS_STD(NAME);
118#endif // XXX
119 FPS_STD(NAME);
120} 121}
121 122
122static void _key(char *key) 123static void _key(char *key)
diff --git a/src/bin/cxx/widgets_list_1_grouped.cc b/src/bin/cxx/widgets_list_1_grouped.cc
index 29db00d..11e9569 100644
--- a/src/bin/cxx/widgets_list_1_grouped.cc
+++ b/src/bin/cxx/widgets_list_1_grouped.cc
@@ -62,36 +62,33 @@ static const char *labels[] =
62/* setup */ 62/* setup */
63static void _setup(void) 63static void _setup(void)
64{ 64{
65#if 0
66 int i;
67 evas::canvas canvas(::eo_ref(G_evas)); 65 evas::canvas canvas(::eo_ref(G_evas));
68 for (i = 0; i < NUM; i++) 66 for (int i = 0; i < NUM; i++)
69 { 67 {
70 evas::image o(efl::eo::parent = canvas); 68 evas::image o1(efl::eo::parent = canvas);
71 images.push_back(o); 69 images.push_back(o1);
72 eo_do(o, evas_obj_image_filled_set(1), 70 o1.filled_set(1);
73 evas_obj_image_border_set(2, 2, 2, 2), 71 o1.border_set(2, 2, 2, 2);
74 efl_file_set(build_path("pan.png"), NULL), 72 eo_do(o1._eo_ptr(), efl_file_set(build_path("pan.png"), NULL)); // XXX
75 evas_obj_size_set(win_w, ICON_SIZE), 73 o1.evas::object::size_set(win_w, ICON_SIZE);
76 evas_obj_visibility_set(EINA_TRUE)); 74 o1.visibility_set(true);
77 75
78 o = eo_add(EVAS_TEXT_CLASS, G_evas); 76 evas::text o2(efl::eo::parent = canvas);
79 o_texts[i] = o; 77 texts.push_back(o2);
80 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), 78 o2.font_set("Vera-Bold", 10);
81 efl_text_set(labels[i % 26]), 79 o2.text_set(labels[i % 26]);
82 evas_obj_color_set(0, 0, 0, 255), 80 o2.evas::object::color_set(0, 0, 0, 255);
83 evas_obj_visibility_set(EINA_TRUE)); 81 o2.visibility_set(true);
84 } 82 }
85 for (i = 0; i < NUM; i++) 83 for (evas::image& img : images)
86 { 84 {
87 eo_do(images[i], evas_obj_raise()); 85 img.raise();
88 } 86 }
89 for (i = 0; i < NUM; i++) 87 for (evas::text& text : texts)
90 { 88 {
91 eo_do(o_texts[i], evas_obj_raise()); 89 text.raise();
92 } 90 }
93 done = 0; 91 done = 0;
94#endif // XXX
95} 92}
96 93
97/* cleanup */ 94/* cleanup */
@@ -100,6 +97,7 @@ static void _cleanup(void)
100 for (evas::image& i : images) 97 for (evas::image& i : images)
101 i.parent_set(efl::eo::base(nullptr)); 98 i.parent_set(efl::eo::base(nullptr));
102 images.clear(); 99 images.clear();
100
103 for (evas::text& t : texts) 101 for (evas::text& t : texts)
104 t.parent_set(efl::eo::base(nullptr)); 102 t.parent_set(efl::eo::base(nullptr));
105 texts.clear(); 103 texts.clear();
@@ -108,22 +106,24 @@ static void _cleanup(void)
108/* loop - do things */ 106/* loop - do things */
109static void _loop(double t, int f) 107static void _loop(double t, int f)
110{ 108{
111#if 0
112 int i;
113 Evas_Coord x, y, tw, th, cent; 109 Evas_Coord x, y, tw, th, cent;
114 x = 0; 110 x = 0;
115 y = 0 - f; 111 y = 0 - f;
116 for (i = 0; i < NUM; i++) 112 efl::eina::list<evas::image>::iterator
113 it1 = images.begin(),
114 end1 = images.end();
115 efl::eina::list<evas::text>::iterator
116 it2 = texts.begin(),
117 end2 = texts.end();
118 for (; it1 != end1 && it2 != end2; ++it1, ++it2)
117 { 119 {
118 eo_do(o_images[i], evas_obj_position_set(x, y)); 120 (*it1).evas::object::position_set(x, y);
119 eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); 121 (*it2).evas::object::size_get(&tw, &th);
120 cent = (ICON_SIZE - th) / 2; 122 cent = (ICON_SIZE - th) / 2;
121 eo_do(o_texts[i], evas_obj_position_set(x + 8, y + cent)); 123 (*it2).evas::object::position_set(x + 8 + ICON_SIZE + 8, y + cent);
122 y += ICON_SIZE; 124 y += ICON_SIZE;
123 } 125 }
124 FPS_STD(NAME); 126 FPS_STD(NAME);
125#endif // XXX
126 FPS_STD(NAME);
127} 127}
128 128
129static void _key(char *key) 129static void _key(char *key)
diff --git a/src/bin/cxx/widgets_list_2.cc b/src/bin/cxx/widgets_list_2.cc
index 20b7a80..06c3e13 100644
--- a/src/bin/cxx/widgets_list_2.cc
+++ b/src/bin/cxx/widgets_list_2.cc
@@ -63,28 +63,25 @@ static const char *labels[] = // XXX
63/* setup */ 63/* setup */
64static void _setup(void) 64static void _setup(void)
65{ 65{
66#if 0
67 int i;
68 evas::canvas canvas(::eo_ref(G_evas)); 66 evas::canvas canvas(::eo_ref(G_evas));