summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSavio Sena <savio.sena@acm.org>2014-09-24 04:30:22 -0300
committerSavio Sena <savio.sena@acm.org>2014-09-24 07:03:33 -0300
commitc43478a98455723430d6a15eb6d99ad23c91e298 (patch)
tree2b728facc141fe0f01edea32d0866e6a37876cd6
parentb4070dde1cb48e49197c19e99672932a1116c13f (diff)
More translation. Now compiling.
-rw-r--r--src/bin/cxx/image_blend_border.cc1
-rw-r--r--src/bin/cxx/image_blend_nearest_same_scaled.cc2
-rw-r--r--src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc18
-rw-r--r--src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc6
-rw-r--r--src/bin/cxx/image_map_color_alpha_nearest_rotate.cc17
-rw-r--r--src/bin/cxx/image_map_color_alpha_nearest_solid_rotate.cc28
-rw-r--r--src/bin/cxx/image_map_color_alpha_rotate.cc2
-rw-r--r--src/bin/cxx/image_map_color_alpha_solid_rotate.cc26
-rw-r--r--src/bin/cxx/image_map_color_nearest_rotate.cc28
-rw-r--r--src/bin/cxx/image_map_color_nearest_solid_rotate.cc28
-rw-r--r--src/bin/cxx/image_map_color_rotate.cc8
-rw-r--r--src/bin/cxx/image_map_color_solid_rotate.cc26
-rw-r--r--src/bin/cxx/image_map_nearest_rotate.cc8
-rw-r--r--src/bin/cxx/image_map_nearest_solid_rotate.cc2
-rw-r--r--src/bin/cxx/image_quality_scale.cc6
-rw-r--r--src/bin/cxx/line_blend.cc47
-rw-r--r--src/bin/cxx/proxy_image.cc49
-rw-r--r--src/bin/cxx/proxy_image_offscreen.cc47
-rw-r--r--src/bin/cxx/proxy_text_fixed.cc39
-rw-r--r--src/bin/cxx/rect_blend.cc46
-rw-r--r--src/bin/cxx/rect_blend_few.cc43
-rw-r--r--src/bin/cxx/rect_blend_pow2.cc45
-rw-r--r--src/bin/cxx/rect_blend_pow2_few.cc68
-rw-r--r--src/bin/cxx/rect_solid.cc31
-rw-r--r--src/bin/cxx/rect_solid_few.cc65
-rw-r--r--src/bin/cxx/text_basic.cc69
-rw-r--r--src/bin/cxx/text_change.cc70
-rw-r--r--src/bin/cxx/text_styles.cc6
-rw-r--r--src/bin/cxx/text_styles_different_strings.cc63
-rw-r--r--src/bin/cxx/textblock_auto_align.cc58
-rw-r--r--src/bin/cxx/textblock_basic.cc4
-rw-r--r--src/bin/cxx/textblock_intl.cc54
-rw-r--r--src/bin/cxx/textblock_text_append.cc4
-rw-r--r--src/bin/cxx/widgets_file_icons.cc30
-rw-r--r--src/bin/cxx/widgets_file_icons_2.cc57
-rw-r--r--src/bin/cxx/widgets_file_icons_2_grouped.cc4
-rw-r--r--src/bin/cxx/widgets_file_icons_2_same.cc28
-rw-r--r--src/bin/cxx/widgets_file_icons_2_same_grouped.cc8
-rw-r--r--src/bin/cxx/widgets_file_icons_3.cc55
-rw-r--r--src/bin/cxx/widgets_file_icons_4.cc4
-rw-r--r--src/bin/cxx/widgets_file_icons_capi.h2
-rw-r--r--src/bin/cxx/widgets_list_1.cc7
-rw-r--r--src/bin/cxx/widgets_list_1_grouped.cc50
-rw-r--r--src/bin/cxx/widgets_list_2.cc4
-rw-r--r--src/bin/cxx/widgets_list_2_grouped.cc4
-rw-r--r--src/bin/cxx/widgets_list_3.cc37
-rw-r--r--src/bin/cxx/widgets_list_3_grouped.cc16
-rw-r--r--src/bin/cxx/widgets_list_4.cc28
-rw-r--r--src/bin/cxx/widgets_list_4_grouped.cc36
49 files changed, 858 insertions, 526 deletions
diff --git a/src/bin/cxx/image_blend_border.cc b/src/bin/cxx/image_blend_border.cc
index 37b55d2..b6c37f4 100644
--- a/src/bin/cxx/image_blend_border.cc
+++ b/src/bin/cxx/image_blend_border.cc
@@ -15,6 +15,7 @@
15#define EXPEDITE_CXX_TEST_IMPL 15#define EXPEDITE_CXX_TEST_IMPL
16#include "image_blend_border_capi.h" 16#include "image_blend_border_capi.h"
17 17
18
18static efl::eina::list<evas::image> images; 19static efl::eina::list<evas::image> images;
19 20
20/* standard var */ 21/* standard var */
diff --git a/src/bin/cxx/image_blend_nearest_same_scaled.cc b/src/bin/cxx/image_blend_nearest_same_scaled.cc
index 55bd802..be6533c 100644
--- a/src/bin/cxx/image_blend_nearest_same_scaled.cc
+++ b/src/bin/cxx/image_blend_nearest_same_scaled.cc
@@ -13,7 +13,7 @@
13#include "main.h" 13#include "main.h"
14 14
15#define EXPEDITE_CXX_TEST_IMPL 15#define EXPEDITE_CXX_TEST_IMPL
16#include "image_blend_occlude1_few_capi.h" 16#include "image_blend_nearest_same_scaled_capi.h"
17 17
18/* standard var */ 18/* standard var */
19static int done = 0; 19static int done = 0;
diff --git a/src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc b/src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc
index 3387844..23befa8 100644
--- a/src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc
+++ b/src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc
@@ -83,22 +83,20 @@ static void _cleanup(void)
83static void _loop(double t, int f) 83static void _loop(double t, int f)
84{ 84{
85 static Evas_Map *m = NULL; 85 static Evas_Map *m = NULL;
86 Evas_Coord x, y, w, h;
87 if (!m) m = evas_map_new(4); 86 if (!m) m = evas_map_new(4);
88 for (int i = 0; i < 1; i++) 87 auto itr = images.begin();
88 for (int i = 0; i < 1; i++, ++itr)
89 { 89 {
90 w = 640; 90 Evas_Coord w = 640;
91 h = 480; 91 Evas_Coord h = 480;
92 x = (win_w / 2) - (w / 2); 92 Evas_Coord x = (win_w / 2) - (w / 2);
93 y = (win_h / 2) - (h / 2); 93 Evas_Coord y = (win_h / 2) - (h / 2);
94 94
95 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0); 95 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
96
97 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 96 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
98 97
99 eo_do(images[i], 98 (*itr).map_enable_set(1);
100 evas_obj_map_enable_set(1), 99 (*itr).map_set(m);
101 evas_obj_map_set(m));
102 } 100 }
103 FPS_STD(NAME); 101 FPS_STD(NAME);
104} 102}
diff --git a/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc b/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc
index e7ffcb5..831bf53 100644
--- a/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc
+++ b/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc
@@ -104,7 +104,7 @@ static void _loop(double t, int f)
104 w &= ~0x1; 104 w &= ~0x1;
105 105
106 (*itr).size_set(w, 480); 106 (*itr).size_set(w, 480);
107 unsigned char **data = static_cast<unsigned char*>((*itr).data_get(1)); 107 unsigned char **data = static_cast<unsigned char**>((*itr).data_get(1));
108 if (data) 108 if (data)
109 { 109 {
110 unsigned char **lp = data; 110 unsigned char **lp = data;
@@ -123,8 +123,8 @@ static void _loop(double t, int f)
123 *lp = vp + (y * 320); 123 *lp = vp + (y * 320);
124 lp++; 124 lp++;
125 } 125 }
126 o.data_set(data); 126 (*itr).data_set(data);
127 o.data_update_add(0, 0, w, 480); 127 (*itr).data_update_add(0, 0, w, 480);
128 } 128 }
129 } 129 }
130 FPS_STD(NAME); 130 FPS_STD(NAME);
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 1771efb..048ace9 100644
--- a/src/bin/cxx/image_map_color_alpha_nearest_rotate.cc
+++ b/src/bin/cxx/image_map_color_alpha_nearest_rotate.cc
@@ -48,16 +48,16 @@ static void _cleanup(void)
48static void _loop(double t, int f) 48static void _loop(double t, int f)
49{ 49{
50 static Evas_Map *m = NULL; 50 static Evas_Map *m = NULL;
51 Evas_Coord x, y, w, h;
52 if (!m) m = evas_map_new(4); 51 if (!m) m = evas_map_new(4);
53 evas_map_smooth_set(m, 0); 52 evas_map_smooth_set(m, 0);
54 for (int i = 0; i < (OBNUM / 2); i++) 53 auto itr = images.begin();
54 for (int i = 0; i < (OBNUM / 2); i++, ++itr)
55 { 55 {
56 w = 120; 56 Evas_Coord w = 120;
57 h = 160; 57 Evas_Coord h = 160;
58 x = (win_w / 2) - (w / 2); 58 Evas_Coord x = (win_w / 2) - (w / 2);
59 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 59 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
60 y = (win_h / 2) - (h / 2); 60 Evas_Coord y = (win_h / 2) - (h / 2);
61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
62 62
63 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0); 63 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
@@ -69,9 +69,8 @@ static void _loop(double t, int f)
69 69
70 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 70 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
71 71
72 eo_do(images[i], 72 (*itr).map_enable_set(1);
73 evas_obj_map_enable_set(1), 73 (*itr).map_set(m);
74 evas_obj_map_set(m));
75 } 74 }
76 FPS_STD(NAME); 75 FPS_STD(NAME);
77} 76}
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 edbb713..b2be1a6 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,12 +29,11 @@ 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 eo_do(o, 32 o.file_set(build_path("image.png"), "");
33 efl_file_set(build_path("image.png"), NULL), 33 o.fill_set(0, 0, 120, 160);
34 evas_obj_image_fill_set(0, 0, 120, 160), 34 o.evas::object::size_set(120, 160);
35 evas_obj_size_set(120, 160), 35 o.smooth_scale_set(0);
36 efl_image_smooth_scale_set(0), 36 o.visibility_set(true);
37 evas_obj_visibility_set(EINA_TRUE));
38 } 37 }
39 done = 0; 38 done = 0;
40} 39}
@@ -49,16 +48,16 @@ static void _cleanup(void)
49static void _loop(double t, int f) 48static void _loop(double t, int f)
50{ 49{
51 static Evas_Map *m = NULL; 50 static Evas_Map *m = NULL;
52 Evas_Coord x, y, w, h;
53 if (!m) m = evas_map_new(4); 51 if (!m) m = evas_map_new(4);
54 evas_map_smooth_set(m, 0); 52 evas_map_smooth_set(m, 0);
55 for (int i = 0; i < (OBNUM / 2); i++) 53 auto itr = images.begin();
54 for (int i = 0; i < (OBNUM / 2); i++, ++itr)
56 { 55 {
57 w = 120; 56 Evas_Coord w = 120;
58 h = 160; 57 Evas_Coord h = 160;
59 x = (win_w / 2) - (w / 2); 58 Evas_Coord x = (win_w / 2) - (w / 2);
60 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 59 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
61 y = (win_h / 2) - (h / 2); 60 Evas_Coord y = (win_h / 2) - (h / 2);
62 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
63 62
64 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0); 63 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
@@ -70,9 +69,8 @@ static void _loop(double t, int f)
70 69
71 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 70 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
72 71
73 eo_do(images[i], 72 (*itr).map_enable_set(1);
74 evas_obj_map_enable_set(1), 73 (*itr).map_set(m);
75 evas_obj_map_set(m));
76 } 74 }
77 FPS_STD(NAME); 75 FPS_STD(NAME);
78} 76}
diff --git a/src/bin/cxx/image_map_color_alpha_rotate.cc b/src/bin/cxx/image_map_color_alpha_rotate.cc
index 47893a8..e445361 100644
--- a/src/bin/cxx/image_map_color_alpha_rotate.cc
+++ b/src/bin/cxx/image_map_color_alpha_rotate.cc
@@ -30,7 +30,7 @@ static void _setup(void)
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 efl_file_set(build_path("logo.png"), "");
33 o.image_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);
36 } 36 }
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 57e203f..6158fab 100644
--- a/src/bin/cxx/image_map_color_alpha_solid_rotate.cc
+++ b/src/bin/cxx/image_map_color_alpha_solid_rotate.cc
@@ -29,11 +29,10 @@ 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 eo_do(o, 32 o.file_set(build_path("image.png"), "");
33 efl_file_set(build_path("image.png"), NULL), 33 o.fill_set(0, 0, 120, 160);
34 evas_obj_image_fill_set(0, 0, 120, 160), 34 o.evas::object::size_set(120, 160);
35 evas_obj_size_set(120, 160), 35 o.visibility_set(true);
36 evas_obj_visibility_set(EINA_TRUE));
37 } 36 }
38 done = 0; 37 done = 0;
39} 38}
@@ -48,15 +47,15 @@ static void _cleanup(void)
48static void _loop(double t, int f) 47static void _loop(double t, int f)
49{ 48{
50 static Evas_Map *m = NULL; 49 static Evas_Map *m = NULL;
51 Evas_Coord x, y, w, h;
52 if (!m) m = evas_map_new(4); 50 if (!m) m = evas_map_new(4);
53 for (int i = 0; i < (OBNUM / 2); i++) 51 auto itr = images.begin();
52 for (int i = 0; i < (OBNUM / 2); i++, ++itr)
54 { 53 {
55 w = 120; 54 Evas_Coord w = 120;
56 h = 160; 55 Evas_Coord h = 160;
57 x = (win_w / 2) - (w / 2); 56 Evas_Coord x = (win_w / 2) - (w / 2);
58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
59 y = (win_h / 2) - (h / 2); 58 Evas_Coord y = (win_h / 2) - (h / 2);
60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
61 60
62 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0); 61 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
@@ -67,9 +66,8 @@ static void _loop(double t, int f)
67 evas_map_point_color_set(m, 3, 0, 0, 0, 0); 66 evas_map_point_color_set(m, 3, 0, 0, 0, 0);
68 67
69 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 68 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
70 eo_do(images[i], 69 (*itr).map_enable_set(1);
71 evas_obj_map_enable_set(1), 70 (*itr).map_set(m);
72 evas_obj_map_set(m));
73 } 71 }
74 FPS_STD(NAME); 72 FPS_STD(NAME);
75} 73}
diff --git a/src/bin/cxx/image_map_color_nearest_rotate.cc b/src/bin/cxx/image_map_color_nearest_rotate.cc
index 52248d8..ec12efe 100644
--- a/src/bin/cxx/image_map_color_nearest_rotate.cc
+++ b/src/bin/cxx/image_map_color_nearest_rotate.cc
@@ -29,12 +29,11 @@ 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 eo_do(o, 32 o.file_set(build_path("logo.png"), "");
33 efl_file_set(build_path("logo.png"), NULL), 33 o.fill_set(0, 0, 120, 160);
34 evas_obj_image_fill_set(0, 0, 120, 160), 34 o.evas::object::size_set(120, 160);
35 evas_obj_size_set(120, 160), 35 o.smooth_scale_set(0);
36 efl_image_smooth_scale_set(0), 36 o.visibility_set(true);
37 evas_obj_visibility_set(EINA_TRUE));
38 } 37 }
39 done = 0; 38 done = 0;
40} 39}
@@ -49,16 +48,16 @@ static void _cleanup(void)
49static void _loop(double t, int f) 48static void _loop(double t, int f)
50{ 49{
51 static Evas_Map *m = NULL; 50 static Evas_Map *m = NULL;
52 Evas_Coord x, y, w, h;
53 if (!m) m = evas_map_new(4); 51 if (!m) m = evas_map_new(4);
54 evas_map_smooth_set(m, 0); 52 evas_map_smooth_set(m, 0);
55 for (int i = 0; i < (OBNUM / 2); i++) 53 auto itr = images.begin();
54 for (int i = 0; i < (OBNUM / 2); i++, ++itr)
56 { 55 {
57 w = 120; 56 Evas_Coord w = 120;
58 h = 160; 57 Evas_Coord h = 160;
59 x = (win_w / 2) - (w / 2); 58 Evas_Coord x = (win_w / 2) - (w / 2);
60 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 59 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
61 y = (win_h / 2) - (h / 2); 60 Evas_Coord y = (win_h / 2) - (h / 2);
62 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
63 62
64 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0); 63 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
@@ -70,9 +69,8 @@ static void _loop(double t, int f)
70 69
71 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 70 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
72 71
73 eo_do(images[i], 72 evas_obj_map_enable_set(1);
74 evas_obj_map_enable_set(1), 73 evas_obj_map_set(m);
75 evas_obj_map_set(m));
76 } 74 }
77 FPS_STD(NAME); 75 FPS_STD(NAME);
78} 76}
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 71f6648..c242afa 100644
--- a/src/bin/cxx/image_map_color_nearest_solid_rotate.cc
+++ b/src/bin/cxx/image_map_color_nearest_solid_rotate.cc
@@ -29,12 +29,11 @@ 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 eo_do(o, 32 o.file_set(build_path("image.png"), "");
33 efl_file_set(build_path("image.png"), NULL), 33 o.fill_set(0, 0, 120, 160);
34 evas_obj_image_fill_set(0, 0, 120, 160), 34 o.size_set(120, 160);
35 evas_obj_size_set(120, 160), 35 o.smooth_scale_set(0);
36 efl_image_smooth_scale_set(0), 36 o.visibility_set(true);
37 evas_obj_visibility_set(EINA_TRUE));
38 } 37 }
39 done = 0; 38 done = 0;
40} 39}
@@ -49,16 +48,16 @@ static void _cleanup(void)
49static void _loop(double t, int f) 48static void _loop(double t, int f)
50{ 49{
51 static Evas_Map *m = NULL; 50 static Evas_Map *m = NULL;
52 Evas_Coord x, y, w, h;
53 if (!m) m = evas_map_new(4); 51 if (!m) m = evas_map_new(4);
54 evas_map_smooth_set(m, 0); 52 evas_map_smooth_set(m, 0);
55 for (int i = 0; i < (OBNUM / 2); i++) 53 auto itr = images.begin();
54 for (int i = 0; i < (OBNUM / 2); i++, ++itr)
56 { 55 {
57 w = 120; 56 Evas_Coord w = 120;
58 h = 160; 57 Evas_Coord h = 160;
59 x = (win_w / 2) - (w / 2); 58 Evas_Coord x = (win_w / 2) - (w / 2);
60 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 59 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
61 y = (win_h / 2) - (h / 2); 60 Evas_Coord y = (win_h / 2) - (h / 2);
62 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
63 62
64 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0); 63 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
@@ -70,9 +69,8 @@ static void _loop(double t, int f)
70 69
71 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 70 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
72 71
73 eo_do(images[i], 72 (*itr).map_enable_set(1);
74 evas_obj_map_enable_set(1), 73 (*itr).map_set(m);
75 evas_obj_map_set(m));
76 } 74 }
77 FPS_STD(NAME); 75 FPS_STD(NAME);
78} 76}
diff --git a/src/bin/cxx/image_map_color_rotate.cc b/src/bin/cxx/image_map_color_rotate.cc
index 3ec4921..c497f24 100644
--- a/src/bin/cxx/image_map_color_rotate.cc
+++ b/src/bin/cxx/image_map_color_rotate.cc
@@ -51,11 +51,11 @@ static void _loop(double t, int f)
51 auto itr = images.begin(); 51 auto itr = images.begin();
52 for (int i = 0; i < (OBNUM / 2); i++, ++itr) 52 for (int i = 0; i < (OBNUM / 2); i++, ++itr)
53 { 53 {
54 Eavs_Coord w = 120; 54 Evas_Coord w = 120;
55 Eavs_Coord h = 160; 55 Evas_Coord h = 160;
56 Eavs_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)) * (w / 2); 57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
58 Eavs_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)) * (h / 2); 59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
60 60
61 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0); 61 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
diff --git a/src/bin/cxx/image_map_color_solid_rotate.cc b/src/bin/cxx/image_map_color_solid_rotate.cc
index 3a2ade0..7f2f0e6 100644
--- a/src/bin/cxx/image_map_color_solid_rotate.cc
+++ b/src/bin/cxx/image_map_color_solid_rotate.cc
@@ -29,11 +29,10 @@ 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 eo_do(o, 32 o.file_set(build_path("image.png"), "");
33 efl_file_set(build_path("image.png"), NULL), 33 o.fill_set(0, 0, 120, 160);
34 evas_obj_image_fill_set(0, 0, 120, 160), 34 o.evas::object::size_set(120, 160);
35 evas_obj_size_set(120, 160), 35 o.visibility_set(true);
36 evas_obj_visibility_set(EINA_TRUE));
37 } 36 }
38 done = 0; 37 done = 0;
39} 38}
@@ -48,15 +47,15 @@ static void _cleanup(void)
48static void _loop(double t, int f) 47static void _loop(double t, int f)
49{ 48{
50 static Evas_Map *m = NULL; 49 static Evas_Map *m = NULL;
51 Evas_Coord x, y, w, h;
52 if (!m) m = evas_map_new(4); 50 if (!m) m = evas_map_new(4);
53 for (int i = 0; i < (OBNUM / 2); i++) 51 auto itr = images.begin();
52 for (int i = 0; i < (OBNUM / 2); i++, itr++)
54 { 53 {
55 w = 120; 54 Evas_Coord w = 120;
56 h = 160; 55 Evas_Coord h = 160;
57 x = (win_w / 2) - (w / 2); 56 Evas_Coord x = (win_w / 2) - (w / 2);
58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
59 y = (win_h / 2) - (h / 2); 58 Evas_Coord y = (win_h / 2) - (h / 2);
60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
61 60
62 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0); 61 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
@@ -68,9 +67,8 @@ static void _loop(double t, int f)
68 67
69 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 68 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
70 69
71 eo_do(images[i], 70 (*itr).map_enable_set(1);
72 evas_obj_map_enable_set(1), 71 (*itr).map_set(m);
73 evas_obj_map_set(m));
74 } 72 }
75 FPS_STD(NAME); 73 FPS_STD(NAME);
76} 74}
diff --git a/src/bin/cxx/image_map_nearest_rotate.cc b/src/bin/cxx/image_map_nearest_rotate.cc
index b6f1d95..962d401 100644
--- a/src/bin/cxx/image_map_nearest_rotate.cc
+++ b/src/bin/cxx/image_map_nearest_rotate.cc
@@ -56,16 +56,16 @@ static void _loop(double t, int f)
56 Evas_Coord w = 120; 56 Evas_Coord w = 120;
57 Evas_Coord h = 160; 57 Evas_Coord h = 160;
58 Evas_Coord x = (win_w / 2) - (w / 2); 58 Evas_Coord x = (win_w / 2) - (w / 2);
59 Evas_Coord x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 59 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
60 Evas_Coord y = (win_h / 2) - (h / 2); 60 Evas_Coord y = (win_h / 2) - (h / 2);
61 Evas_Coord y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
62 62
63 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0); 63 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
64 64
65 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 65 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
66 66
67 (*itr).evas_obj_map_enable_set(1); 67 (*itr).map_enable_set(1);
68 (*itr).evas_obj_map_set(m); 68 (*itr).map_set(m);
69 } 69 }
70 FPS_STD(NAME); 70 FPS_STD(NAME);
71} 71}
diff --git a/src/bin/cxx/image_map_nearest_solid_rotate.cc b/src/bin/cxx/image_map_nearest_solid_rotate.cc
index 7f38ce9..b82c1aa 100644
--- a/src/bin/cxx/image_map_nearest_solid_rotate.cc
+++ b/src/bin/cxx/image_map_nearest_solid_rotate.cc
@@ -64,7 +64,7 @@ static void _loop(double t, int f)
64 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 64 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
65 65
66 (*itr).map_enable_set(1); 66 (*itr).map_enable_set(1);
67 (*itr).map_set(m)); 67 (*itr).map_set(m);
68 } 68 }
69 FPS_STD(NAME); 69 FPS_STD(NAME);
70} 70}
diff --git a/src/bin/cxx/image_quality_scale.cc b/src/bin/cxx/image_quality_scale.cc
index 2be2af4..e93f52c 100644
--- a/src/bin/cxx/image_quality_scale.cc
+++ b/src/bin/cxx/image_quality_scale.cc
@@ -51,12 +51,12 @@ static void _loop(double t, int f)
51 { 51 {
52 Evas_Coord w = 640; 52 Evas_Coord w = 640;
53 Evas_Coord h = 480; 53 Evas_Coord h = 480;
54 Evas_Coord w *= (f / 100.0) * 4.0; 54 w *= (f / 100.0) * 4.0;
55 Evas_Coord h *= (f / 100.0) * 4.0; 55 h *= (f / 100.0) * 4.0;
56 Evas_Coord x = (win_w / 2) - (w / 2); 56 Evas_Coord x = (win_w / 2) - (w / 2);
57 Evas_Coord y = (win_h / 2) - (h / 2); 57 Evas_Coord y = (win_h / 2) - (h / 2);
58 (*itr).position_set(x, y); 58 (*itr).position_set(x, y);
59 (*itr).msize_set(w, h); 59 (*itr).size_set(w, h);
60 (*itr).fill_set(0, 0, w, h); 60 (*itr).fill_set(0, 0, w, h);
61 } 61 }
62 FPS_STD(NAME); 62 FPS_STD(NAME);
diff --git a/src/bin/cxx/line_blend.cc b/src/bin/cxx/line_blend.cc
index 0ca72d0..d491f62 100644
--- a/src/bin/cxx/line_blend.cc
+++ b/src/bin/cxx/line_blend.cc
@@ -18,33 +18,27 @@
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::line> lines;
22 22
23/* setup */ 23/* setup */
24static void _setup(void) 24static void _setup(void)
25{ 25{
26 int i;
27 evas::canvas canvas(::eo_ref(G_evas)); 26 evas::canvas canvas(::eo_ref(G_evas));
28 srnd(); 27 srnd();
29 for (i = 0; i < OBNUM; i++) 28 for (int i = 0; i < OBNUM; i++)
30 { 29 {
31 int r, g, b, a; 30 evas::line o(efl::eo::parent = canvas);
32 31 lines.push_back(o);
33 evas::image o(efl::eo::parent = canvas); 32 int a = (rnd()&0xff) / 2;
34 images.push_back(o); 33 int r = ((rnd()&0xff) * a) / 255;
35 a = (rnd()&0xff) / 2; 34 int g = ((rnd()&0xff) * a) / 255;
36 r = ((rnd()&0xff) * a) / 255; 35 int b = ((rnd()&0xff) * a) / 255;
37 g = ((rnd()&0xff) * a) / 255; 36 o.color_set(r, g, b, a);
38 b = ((rnd()&0xff) * a) / 255; 37 o.xy_set(((win_w / 2) * (rnd()&0xff)) / 255,
39 eo_do(o, 38 ((win_h / 2) * (rnd()&0xff)) / 255,
40 evas_obj_color_set(r, g, b, a), 39 ((win_w / 2) * (rnd()&0xff)) / 255 + (win_w / 2),
41 evas_obj_line_xy_set(((win_w / 2) * (rnd()&0xff)) / 255, 40 ((win_h / 2) * (rnd()&0xff)) / 255 + (win_h / 2));
42 ((win_h / 2) * (rnd()&0xff)) / 255, 41 o.visibility_set(true);
43 ((win_w / 2) * (rnd()&0xff)) / 255 + (win_w / 2),
44 ((win_h / 2) * (rnd()&0xff)) / 255 + (win_h / 2)),
45 evas_obj_visibility_set(EINA_TRUE));
46
47
48 } 42 }
49 done = 0; 43 done = 0;
50} 44}
@@ -52,7 +46,7 @@ static void _setup(void)
52/* cleanup */ 46/* cleanup */
53static void _cleanup() 47static void _cleanup()
54{ 48{
55 images.clear(); 49 lines.clear();
56} 50}
57 51
58#define PI (double) 3.141592654 52#define PI (double) 3.141592654
@@ -87,18 +81,15 @@ _rotate_point(Evas_Coord *ox, Evas_Coord *oy, int r)
87/* loop - do things */ 81/* loop - do things */
88static void _loop(double t, int f) 82static void _loop(double t, int f)
89{ 83{
90 int i;
91 Evas_Coord ox1, oy1, ox2, oy2; 84 Evas_Coord ox1, oy1, ox2, oy2;
92 Evas_Object *o; 85 Evas_Object *o;
93 86 auto itr = lines.begin();
94 for (i = 0; i < OBNUM; i++) 87 for (int i = 0; i < OBNUM; i++, ++itr)
95 { 88 {
96 o = images[i]; 89 (*itr).xy_get(&ox1, &oy1, &ox2, &oy2);
97 eo_do(o, evas_obj_line_xy_get(&ox1, &oy1, &ox2, &oy2));
98
99 _rotate_point(&ox1, &oy1, i); 90 _rotate_point(&ox1, &oy1, i);
100 _rotate_point(&ox2, &oy2, i); 91 _rotate_point(&ox2, &oy2, i);
101 eo_do(o, evas_obj_line_xy_set(ox1, oy1, ox2, oy2)); 92 (*itr).xy_set(ox1, oy1, ox2, oy2);
102 } 93 }
103 FPS_STD(NAME); 94 FPS_STD(NAME);
104} 95}
diff --git a/src/bin/cxx/proxy_image.cc b/src/bin/cxx/proxy_image.cc
index a349220..6bff11f 100644
--- a/src/bin/cxx/proxy_image.cc
+++ b/src/bin/cxx/proxy_image.cc
@@ -23,27 +23,21 @@ static efl::eina::list<evas::image> images;
23/* setup */ 23/* setup */
24static void _setup(void) 24static void _setup(void)
25{ 25{
26 int i; 26 evas::canvas canvas(::eo_ref(G_evas));
27 Evas_Object *o,*src; 27 evas::image src(efl::eo::parent = canvas);
28 28
29 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 29 src.file_set(build_path("logo.png"), "");
30 eo_do(o, 30 src.fill_set(0, 0, 120, 160);
31 efl_file_set(build_path("logo.png"), NULL), 31 src.evas::object::size_set(120, 160);
32 evas_obj_image_fill_set(0, 0, 120, 160), 32 images.push_back(src);
33 evas_obj_size_set(120, 160), 33 for (int i = 1; i < OBNUM; i++)
34 evas::canvas canvas(::eo_ref(G_evas));
35 src = o;
36 images[0] = src;
37
38 for (i = 1; i < OBNUM; i++)
39 { 34 {
40 evas::image o(efl::eo::parent = canvas); 35 evas::image o(efl::eo::parent = canvas);
41 images.push_back(o); 36 images.push_back(o);
42 eo_do(o, 37 o.source_set(src);
43 evas_obj_image_source_set(src), 38 o.evas::object::size_set(120, 160);
44 evas_obj_size_set(120, 160), 39 o.fill_set(0,0,120,160);
45 evas_obj_image_fill_set(0,0,120,160), 40 o.visibility_set(true);
46 evas_obj_visibility_set(EINA_TRUE));
47 } 41 }
48 done = 0; 42 done = 0;
49} 43}
@@ -57,17 +51,16 @@ static void _cleanup()
57/* loop - do things */ 51/* loop - do things */
58static void _loop(double t, int f) 52static void _loop(double t, int f)
59{ 53{
60 int i; 54 auto itr = images.begin();
61 Evas_Coord x, y, w, h; 55 for (int i = 0; i < OBNUM; i++, ++itr)
62 for (i = 0; i < OBNUM; i++)
63 { 56 {
64 w = 120; 57 Evas_Coord w = 120;
65 h = 160; 58 Evas_Coord h = 160;
66 x = (win_w / 2) - (w / 2); 59 Evas_Coord x = (win_w / 2) - (w / 2);
67 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 60 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
68 y = (win_h / 2) - (h / 2); 61 Evas_Coord y = (win_h / 2) - (h / 2);
69 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 62 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
70 eo_do(images[i], evas_obj_position_set(x, y)); 63 (*itr).position_set(x, y);
71 } 64 }
72 FPS_STD(NAME); 65 FPS_STD(NAME);
73} 66}
@@ -78,9 +71,9 @@ static void _key(char *key)
78 KEY_STD; 71 KEY_STD;
79} 72}
80 73
81 74extern "C" void FNAME(void)
82extern "C" { 75{
83 ui_func_set(_key, _loop); 76 ui_func_set(_key, _loop);
84 _setup(); 77 _setup();
85} 78}
86# endif 79
diff --git a/src/bin/cxx/proxy_image_offscreen.cc b/src/bin/cxx/proxy_image_offscreen.cc
index 68fe68a..ab93554 100644
--- a/src/bin/cxx/proxy_image_offscreen.cc
+++ b/src/bin/cxx/proxy_image_offscreen.cc
@@ -23,24 +23,20 @@ static efl::eina::list<evas::image> images;
23/* setup */ 23/* setup */
24static void _setup(void) 24static void _setup(void)
25{ 25{
26 int i; 26 evas::canvas canvas(::eo_ref(G_evas));
27 Evas_Object *o,*src; 27 evas::image o(efl::eo::parent = canvas);
28 28 o.file_set(build_path("logo.png"), "");
29 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 29 o.fill_set(0, 0, 120, 160);
30 eo_do(o, efl_file_set(build_path("logo.png"), NULL), 30 o.evas::object::size_set(120, 160);
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 evas::image src = o;
32 evas_obj_size_set(120, 160), 32 for (int i = 0; i < OBNUM / 2; i++)
33 evas::canvas canvas(::eo_ref(G_evas));
34 src = o;
35
36 for (i = 0; i < OBNUM / 2; i++)
37 { 33 {
38 evas::image o(efl::eo::parent = canvas); 34 evas::image o(efl::eo::parent = canvas);
39 images.push_back(o); 35 images.push_back(o);
40 eo_do(o, evas_obj_image_source_set(src, NULL), 36 o.source_set(src);
41 evas_obj_size_set(120, 160), 37 o.evas::object::size_set(120, 160);
42 evas_obj_image_fill_set(0,0,120,160), 38 o.fill_set(0,0,120,160);
43 evas_obj_visibility_set(EINA_TRUE)); 39 o.visibility_set(true);
44 } 40 }
45 done = 0; 41 done = 0;
46} 42}
@@ -54,17 +50,16 @@ static void _cleanup()
54/* loop - do things */ 50/* loop - do things */
55static void _loop(double t, int f) 51static void _loop(double t, int f)
56{ 52{
57 int i; 53 auto itr = images.begin();
58 Evas_Coord x, y, w, h; 54 for (int i = 0; i < OBNUM; i++, ++itr)
59 for (i = 0; i < OBNUM; i++)
60 { 55 {
61 w = 120; 56 Evas_Coord w = 120;
62 h = 160; 57 Evas_Coord h = 160;
63 x = (win_w / 2) - (w / 2); 58 Evas_Coord x = (win_w / 2) - (w / 2);
64 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 59 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
65 y = (win_h / 2) - (h / 2); 60 Evas_Coord y = (win_h / 2) - (h / 2);
66 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
67 eo_do(images[i], evas_obj_position_set(x, y)); 62 (*itr).position_set(x, y);
68 } 63 }
69 FPS_STD(NAME); 64 FPS_STD(NAME);
70} 65}
@@ -75,9 +70,9 @@ static void _key(char *key)
75 KEY_STD; 70 KEY_STD;
76} 71}
77 72
78 73extern "C" void FNAME(void)
79extern "C" { 74{
80 ui_func_set(_key, _loop); 75 ui_func_set(_key, _loop);
81 _setup(); 76 _setup();
82} 77}
83# endif 78
diff --git a/src/bin/cxx/proxy_text_fixed.cc b/src/bin/cxx/proxy_text_fixed.cc
index 29240b0..0f6cc67 100644
--- a/src/bin/cxx/proxy_text_fixed.cc
+++ b/src/bin/cxx/proxy_text_fixed.cc
@@ -19,30 +19,36 @@
19static int done = 0; 19static int done = 0;
20 20
21/* private data */ 21/* private data */
22static Evas_Object *o_texts[OBNUM]; 22static efl::eina::list<evas::text> texts;
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}
23 30
24/* setup */ 31/* setup */
25static void _setup(void) 32static void _setup(void)
26{ 33{
27 int i,w,h; 34#if 0
28 Evas_Object *o,*s; 35 Evas_Object *o,*s;
29 Evas_Text_Style_Type st; 36 Evas_Text_Style_Type st, i;
30 37
31 st = EVAS_TEXT_STYLE_SHADOW; 38 st = EVAS_TEXT_STYLE_SHADOW;
32 for (i = 0; st <= EVAS_TEXT_STYLE_FAR_SOFT_SHADOW; i++) 39 for (i = 0; st <= EVAS_TEXT_STYLE_FAR_SOFT_SHADOW; i++)
33 { 40 {
34 o = eo_add(EVAS_TEXT_CLASS, G_evas); 41 o = eo_add(EVAS_TEXT_CLASS, G_evas);
35 o_texts[i] = o; 42 o_texts[i] = o;
36 eo_do(o, 43 efl_text_properties_font_set("Vera-Bold", 20);
37 efl_text_properties_font_set("Vera-Bold", 20), 44 efl_text_set("This is a test string");
38 efl_text_set("This is a test string"), 45 evas_obj_text_style_set(st);
39 evas_obj_text_style_set(st), 46 evas_obj_color_set(255, 255, 255, 255);
40 evas_obj_color_set(255, 255, 255, 255), 47 evas_obj_text_shadow_color_set(0, 0, 0, 24);
41 evas_obj_text_shadow_color_set(0, 0, 0, 24), 48 evas_obj_text_glow_color_set(100, 80, 40, 100);
42 evas_obj_text_glow_color_set(100, 80, 40, 100), 49 evas_obj_text_glow2_color_set(50, 10, 5, 50);
43 evas_obj_text_glow2_color_set(50, 10, 5, 50), 50 evas_obj_text_outline_color_set(0, 0, 0, 255);
44 evas_obj_text_outline_color_set(0, 0, 0, 255), 51 evas_obj_visibility_set(true);
45 evas_obj_visibility_set(EINA_TRUE));
46 st++; 52 st++;
47 } 53 }
48 st = i; 54 st = i;
@@ -54,6 +60,7 @@ static void _setup(void)
54 o_texts[i] = o; 60 o_texts[i] = o;
55 eo_do(o, evas_obj_image_source_set(s)); 61 eo_do(o, evas_obj_image_source_set(s));
56 /* FIXME s == NULL*/ 62 /* FIXME s == NULL*/
63 int w,h;
57 eo_do(s, evas_obj_size_get(&w, &h)); 64 eo_do(s, evas_obj_size_get(&w, &h));
58 eo_do(o, 65 eo_do(o,
59 evas_obj_size_set(w, h), 66 evas_obj_size_set(w, h),
@@ -62,18 +69,19 @@ static void _setup(void)
62 } 69 }
63 70
64 done = 0; 71 done = 0;
72#endif // XXX
65} 73}
66 74
67/* cleanup */ 75/* cleanup */
68static void _cleanup(void) 76static void _cleanup(void)
69{ 77{
70 int i; 78 texts.clear();
71 for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
72} 79}
73 80
74/* loop - do things */ 81/* loop - do things */
75static void _loop(double t, int f) 82static void _loop(double t, int f)
76{ 83{
84#if 0
77 int i; 85 int i;
78 Evas_Coord x, y, w, h; 86 Evas_Coord x, y, w, h;
79 for (i = 0; i < OBNUM; i++) 87 for (i = 0; i < OBNUM; i++)
@@ -86,6 +94,7 @@ static void _loop(double t, int f)
86 eo_do(o_texts[i], evas_obj_position_set(x, y)); 94 eo_do(o_texts[i], evas_obj_position_set(x, y));
87 } 95 }
88 FPS_STD(NAME); 96 FPS_STD(NAME);
97#endif // XXX
89} 98}
90 99
91/* 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.cc b/src/bin/cxx/rect_blend.cc
index 5d22b0c..ca34adc 100644
--- a/src/bin/cxx/rect_blend.cc
+++ b/src/bin/cxx/rect_blend.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,17 +27,14 @@ 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 int r, g, b, a; 30 evas::rectangle o(efl::eo::parent = canvas);
31 31 rectangles.push_back(o);
32 o = eo_add(EVAS_RECTANGLE_CLASS, G_evas); 32 int a = rnd()&0xff;
33 images[i] = o; 33 int r = ((rnd()&0xff) * a) / 255;
34 a = rnd()&0xff; 34 int g = ((rnd()&0xff) * a) / 255;
35 r = ((rnd()&0xff) * a) / 255; 35 int b = ((rnd()&0xff) * a) / 255;
36 g = ((rnd()&0xff) * a) / 255; 36 o.color_set(r, g, b, a);
37 b = ((rnd()&0xff) * a) / 255; 37 o.visibility_set(true);
38 eo_do(o,
39 evas_obj_color_set(r, g, b, a),
40 evas_obj_visibility_set(EINA_TRUE));
41 } 38 }
42 done = 0; 39 done = 0;
43} 40}
@@ -45,27 +42,26 @@ static void _setup(void)
45/* cleanup */ 42/* cleanup */
46static void _cleanup() 43static void _cleanup()
47{ 44{
48 images.clear(); 45 rectangles.clear();
49} 46}
50 47
51/* loop - do things */ 48/* loop - do things */
52static void _loop(double t, int f) 49static void _loop(double t, int f)
53{ 50{
54 int i; 51 auto itr = rectangles.begin();
55 Evas_Coord x, y, w, h, w0, h0; 52 for (int i = 0; i < OBNUM; i++, ++itr)
56 for (i = 0; i < OBNUM; i++)
57 { 53 {
58 w0 = 80; 54 Evas_Coord w0 = 80;
59 h0 = 80; 55 Evas_Coord h0 = 80;
60 w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2); 56 Evas_Coord w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
61 h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2); 57 Evas_Coord h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
62 x = (win_w / 2) - (w / 2); 58 Evas_Coord x = (win_w / 2) - (w / 2);
63 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 59 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
64 y = (win_h / 2) - (h / 2); 60 Evas_Coord y = (win_h / 2) - (h / 2);
65 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
66 eo_do(o_images[i], 62
67 evas_obj_position_set(x, y), 63 (*itr).evas::object::position_set(x, y);
68 evas_obj_size_set(w, h)); 64 (*itr).evas::object::size_set(w, h);
69 } 65 }
70 FPS_STD(NAME); 66 FPS_STD(NAME);
71} 67}
diff --git a/src/bin/cxx/rect_blend_few.cc b/src/bin/cxx/rect_blend_few.cc
index 62705d6..6021616 100644
--- a/src/bin/cxx/rect_blend_few.cc
+++ b/src/bin/cxx/rect_blend_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)
@@ -31,16 +31,14 @@ static void _setup(void)
31 srnd(); 31 srnd();
32 for (i = 0; i < OBNUM; i++) 32 for (i = 0; i < OBNUM; i++)
33 { 33 {
34 int r, g, b, a; 34 evas::rectangle o(efl::eo::parent = canvas);
35 35 rectangles.push_back(o);
36 evas::image o(efl::eo::parent = canvas); 36 int a = rnd()&0xff;
37 images.push_back(o); 37 int r = ((rnd()&0xff) * a) / 255;
38 a = rnd()&0xff; 38 int g = ((rnd()&0xff) * a) / 255;
39 r = ((rnd()&0xff) * a) / 255; 39 int b = ((rnd()&0xff) * a) / 255;
40 g = ((rnd()&0xff) * a) / 255; 40 o.color_set(r, g, b, a);
41 b = ((rnd()&0xff) * a) / 255; 41 o.visibility_set(true);
42 eo_do(o, evas_obj_color_set(r, g, b, a),
43 evas_obj_visibility_set(EINA_TRUE));
44 } 42 }
45 done = 0; 43 done = 0;
46} 44}
@@ -48,26 +46,25 @@ static void _setup(void)
48/* cleanup */ 46/* cleanup */
49static void _cleanup(void) 47static void _cleanup(void)
50{ 48{
51 images.clear(); 49 rectangles.clear();
52} 50}
53 51
54/* loop - do things */ 52/* loop - do things */
55static void _loop(double t, int f) 53static void _loop(double t, int f)
56{ 54{
57 int i; 55 auto itr = rectangles.begin();
58 Evas_Coord x, y, w, h, w0, h0; 56 for (int i = 0; i < OBNUM; i++, ++itr)
59 for (i = 0; i < OBNUM; i++)
60 { 57 {
61 w0 = 80; 58 Evas_Coord w0 = 80;
62 h0 = 80; 59 Evas_Coord h0 = 80;
63 w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2); 60 Evas_Coord w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
64 h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2); 61 Evas_Coord h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
65 x = (win_w / 2) - (w / 2); 62 Evas_Coord x = (win_w / 2) - (w / 2);
66 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2); 63 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
67 y = (win_h / 2) - (h / 2); 64 Evas_Coord y = (win_h / 2) - (h / 2);
68 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2); 65 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
69 eo_do(o_images[i], evas_obj_position_set(x, y), 66 (*itr).evas::object::position_set(x, y);
70 evas_obj_size_set(w, h)); 67 (*itr).evas::object::size_set(w, h);
71 } 68 }
72 FPS_STD(NAME); 69 FPS_STD(NAME);
73} 70}
diff --git a/src/bin/cxx/rect_blend_pow2.cc b/src/bin/cxx/rect_blend_pow2.cc
index 99216a2..cca68fb 100644
--- a/src/bin/cxx/rect_blend_pow2.cc
+++ b/src/bin/cxx/rect_blend_pow2.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,18 +27,15 @@ 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 int r, g, b, a; 30 evas::rectangle o(efl::eo::parent = canvas);
31 31 rectangles.push_back(o);
32 evas::image o(efl::eo::parent = canvas); 32 int a = 256 - (1 << ((rnd() % 8) + 1));
33 images.push_back(o);
34 a = 256 - (1 << ((rnd() % 8) + 1));
35 if (a < 128) a = 128; 33 if (a < 128) a = 128;
36 r = ((rnd()&0xff) * a) / 255; 34 int r = ((rnd()&0xff) * a) / 255;
37 g = ((rnd()&0xff) * a) / 255; 35 int g = ((rnd()&0xff) * a) / 255;
38 b = ((rnd()&0xff) * a) / 255; 36 int b = ((rnd()&0xff) * a) / 255;
39 eo_do(o, 37 o.evas::object::color_set(r, g, b, a);
40 evas_obj_color_set(r, g, b, a), 38 o.evas::object::visibility_set(true);
41 evas_obj_visibility_set(EINA_TRUE));
42 } 39 }
43 done = 0; 40 done = 0;
44} 41}
@@ -46,27 +43,25 @@ static void _setup(void)
46/* cleanup */ 43/* cleanup */
47static void _cleanup(void) 44static void _cleanup(void)
48{ 45{
49 images.clear(); 46 rectangles.clear();
50} 47}
51 48
52/* loop - do things */ 49/* loop - do things */
53static void _loop(double t, int f) 50static void _loop(double t, int f)
54{ 51{
55 int i; 52 auto itr = rectangles.begin();
56 Evas_Coord x, y, w, h, w0, h0; 53 for (int i = 0; i < OBNUM; i++, ++itr)
57 for (i = 0; i < OBNUM; i++)
58 { 54 {
59 w0 = 80; 55 Evas_Coord w0 = 80;
60 h0 = 80; 56 Evas_Coord h0 = 80;
61 w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2); 57 Evas_Coord w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
62 h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2); 58 Evas_Coord h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
63 x = (win_w / 2) - (w / 2); 59 Evas_Coord x = (win_w / 2) - (w / 2);
64 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 60 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
65 y = (win_h / 2) - (h / 2); 61 Evas_Coord y = (win_h / 2) - (h / 2);
66 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 62 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
67 eo_do(o_images[i], 63 (*itr).evas::object::position_set(x, y);
68 evas_obj_position_set(x, y), 64 (*itr).evas::object::size_set(w, h);
69 evas_obj_size_set(w, h));
70 } 65 }
71 FPS_STD(NAME); 66 FPS_STD(NAME);
72} 67}
diff --git a/src/bin/cxx/rect_blend_pow2_few.cc b/src/bin/cxx/rect_blend_pow2_few.cc
index e959b95..1a5370e 100644
--- a/src/bin/cxx/rect_blend_pow2_few.cc
+++ b/src/bin/cxx/rect_blend_pow2_few.cc
@@ -1,15 +1,19 @@
1#undef FNAME
2#undef NAME
3#undef ICON
4 1
5/* metadata */ 2#ifdef HAVE_CONFIG_H
6#define FNAME rect_blend_pow2_few_start 3# include <config.h>
7#define NAME "Rect Blend Power 2 Few" 4#endif
8#define ICON "rect.png"
9 5
10#ifndef PROTO 6#include "Eo.h"
11# ifndef UI 7#include "Evas.h"
12# include "main.h" 8
9#include "Eo.hh"
10#include "Eina.hh"
11#include "Evas.hh"
12
13#include "main.h"
14
15#define EXPEDITE_CXX_TEST_IMPL
16#include "rect_blend_pow2_few_capi.h"
13 17
14#undef OBNUM 18#undef OBNUM
15#define OBNUM 3 19#define OBNUM 3
@@ -22,30 +26,52 @@ static efl::eina::list<evas::image> images;
22/* setup */ 26/* setup */
23static void _setup(void) 27static void _setup(void)
24{ 28{
25 int i;
26 evas::canvas canvas(::eo_ref(G_evas)); 29 evas::canvas canvas(::eo_ref(G_evas));
27 srnd(); 30 srnd();
28 for (i = 0; i < OBNUM; i++) 31 for (int i = 0; i < OBNUM; i++)
29 { 32 {
30 int r, g, b, a;
31
32 evas::image o(efl::eo::parent = canvas); 33 evas::image o(efl::eo::parent = canvas);
33 images.push_back(o); 34 images.push_back(o);
34 a = 256 - (1 << ((rnd() % 8) + 1)); 35 int a = 256 - (1 << ((rnd() % 8) + 1));
35 if (a < 128) a = 128; 36 if (a < 128) a = 128;
36 r = ((rnd()&0xff) * a) / 255; 37 int r = ((rnd()&0xff) * a) / 255;
37 g = ((rnd()&0xff) * a) / 255; 38 int g = ((rnd()&0xff) * a) / 255;
38 b = ((rnd()&0xff) * a) / 255; 39 int b = ((rnd()&0xff) * a) / 255;
39 eo_do(o, evas_obj_color_set(r, g, b, a), 40 o.color_set(r, g, b, a);
40 evas_obj_visibility_set(EINA_TRUE)); 41 o.visibility_set(true);
41 } 42 }
42 done = 0; 43 done = 0;
43} 44}
44 45
46
45/* cleanup */ 47/* cleanup */
46static void _cleanup(void) 48static void _cleanup(void)
47{ 49{
48 int i; 50 images.clear();
51}
52
53
54/* loop - do things */
55static void _loop(double t, int f)
56{
57 auto itr = images.begin();
58 for (int i = 0; i < OBNUM; i++, ++itr)
59 {
60 Evas_Coord w0 = 80;
61 Evas_Coord h0 = 80;
62 Evas_Coord w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
63 Evas_Coord h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
64 Evas_Coord x = (win_w / 2) - (w / 2);
65 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
66 Evas_Coord y = (win_h / 2) - (h / 2);
67 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
68 (*itr).evas::object::position_set(x, y);
69 (*itr).evas::object::size_set(w, h);
70 }
71 FPS_STD(NAME);
72}
73
74
49static void _key(char *key) 75static void _key(char *key)
50{ 76{
51 KEY_STD; 77 KEY_STD;
diff --git a/src/bin/cxx/rect_solid.cc b/src/bin/cxx/rect_solid.cc
index 9e7bef7..60d5b42 100644
--- a/src/bin/cxx/rect_solid.cc
+++ b/src/bin/cxx/rect_solid.cc
@@ -27,13 +27,12 @@ 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 int r, g, b, a;
31 evas::image o(efl::eo::parent = canvas); 30 evas::image o(efl::eo::parent = canvas);
32 images.push_back(o); 31 images.push_back(o);
33 a = 0xff; 32 int a = 0xff;
34 r = ((rnd()&0xff) * a) / 255; 33 int r = ((rnd()&0xff) * a) / 255;
35 g = ((rnd()&0xff) * a) / 255; 34 int g = ((rnd()&0xff) * a) / 255;
36 b = ((rnd()&0xff) * a) / 255; 35 int b = ((rnd()&0xff) * a) / 255;
37 o.color_set(r, g, b, a); 36 o.color_set(r, g, b, a);
38 o.visibility_set(true); 37 o.visibility_set(true);
39 } 38 }
@@ -49,21 +48,19 @@ static void _cleanup(void)
49/* loop - do things */ 48/* loop - do things */
50static void _loop(double t, int f) 49static void _loop(double t, int f)
51{ 50{
52 int i; 51 auto itr = images.begin();
53 Evas_Coord x, y, w, h, w0, h0; 52 for (int i = 0; i < OBNUM; i++, ++itr)
54 for (i = 0; i < OBNUM; i++)
55 { 53 {
56 w0 = 80; 54 Evas_Coord w0 = 80;
57 h0 = 80; 55 Evas_Coord h0 = 80;
58 w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2); 56 Evas_Coord w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
59 h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2); 57 Evas_Coord h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
60 x = (win_w / 2) - (w / 2); 58 Evas_Coord x = (win_w / 2) - (w / 2);
61 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 59 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
62 y = (win_h / 2) - (h / 2); 60 Evas_Coord y = (win_h / 2) - (h / 2);
63 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
64 eo_do(o_images[i], 62 (*itr).evas::object::position_set(x, y);
65 evas_obj_position_set(x, y), 63 (*itr).evas::object::size_set(w, h);
66 evas_obj_size_set(w, h));
67 } 64 }
68 FPS_STD(NAME); 65 FPS_STD(NAME);
69} 66}
diff --git a/src/bin/cxx/rect_solid_few.cc b/src/bin/cxx/rect_solid_few.cc
index cdee5a6..6fa498d 100644
--- a/src/bin/cxx/rect_solid_few.cc
+++ b/src/bin/cxx/rect_solid_few.cc
@@ -1,15 +1,19 @@
1#undef FNAME
2#undef NAME
3#undef ICON
4 1
5/* metadata */ 2#ifdef HAVE_CONFIG_H
6#define FNAME rect_solid_few_start 3# include <config.h>
7#define NAME "Rect Solid Few" 4#endif
8#define ICON "rect.png"
9 5
10#ifndef PROTO 6#include "Eo.h"
11# ifndef UI 7#include "Evas.h"
12# include "main.h" 8
9#include "Eo.hh"
10#include "Eina.hh"
11#include "Evas.hh"
12
13#include "main.h"
14
15#define EXPEDITE_CXX_TEST_IMPL
16#include "rect_solid_few_capi.h"
13 17
14#undef OBNUM 18#undef OBNUM
15#define OBNUM 3 19#define OBNUM 3
@@ -22,21 +26,18 @@ static efl::eina::list<evas::image> images;
22/* setup */ 26/* setup */
23static void _setup(void) 27static void _setup(void)
24{ 28{
25 int i;
26 evas::canvas canvas(::eo_ref(G_evas)); 29 evas::canvas canvas(::eo_ref(G_evas));
27 srnd(); 30 srnd();
28 for (i = 0; i < OBNUM; i++) 31 for (int i = 0; i < OBNUM; i++)
29 { 32 {
30 int r, g, b, a;
31
32 evas::image o(efl::eo::parent = canvas); 33 evas::image o(efl::eo::parent = canvas);
33 images.push_back(o); 34 images.push_back(o);
34 a = 0xff; 35 int a = 0xff;
35 r = ((rnd()&0xff) * a) / 255; 36 int r = ((rnd()&0xff) * a) / 255;
36 g = ((rnd()&0xff) * a) / 255; 37 int g = ((rnd()&0xff) * a) / 255;
37 b = ((rnd()&0xff) * a) / 255; 38 int b = ((rnd()&0xff) * a) / 255;
38 eo_do(o, evas_obj_color_set(r, g, b, a), 39 evas_obj_color_set(r, g, b, a);
39 evas_obj_visibility_set(EINA_TRUE)); 40 evas_obj_visibility_set(true);
40 } 41 }
41 done = 0; 42 done = 0;
42} 43}
@@ -44,27 +45,25 @@ static void _setup(void)
44/* cleanup */ 45/* cleanup */
45static void _cleanup(void) 46static void _cleanup(void)
46{ 47{
47 int i; 48 images.clear();
48 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
49} 49}
50 50
51/* loop - do things */ 51/* loop - do things */
52static void _loop(double t, int f) 52static void _loop(double t, int f)
53{ 53{
54 int i; 54 auto itr = images.begin();
55 Evas_Coord x, y, w, h, w0, h0; 55 for (int i = 0; i < OBNUM; i++, ++itr)
56 for (i = 0; i < OBNUM; i++)
57 { 56 {
58 w0 = 80; 57 Evas_Coord w0 = 80;
59 h0 = 80; 58 Evas_Coord h0 = 80;
60 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);
61 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);
62 x = (win_w / 2) - (w / 2); 61 Evas_Coord x = (win_w / 2) - (w / 2);
63 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2); 62 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
64 y = (win_h / 2) - (h / 2); 63 Evas_Coord y = (win_h / 2) - (h / 2);
65 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2); 64 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
66 eo_do(o_images[i], evas_obj_position_set(x, y), 65 (*itr).evas::object::position_set(x, y);
67 evas_obj_size_set(w, h)); 66 (*itr).evas::object::size_set(w, h);
68 } 67 }
69 FPS_STD(NAME); 68 FPS_STD(NAME);
70} 69}
diff --git a/src/bin/cxx/text_basic.cc b/src/bin/cxx/text_basic.cc
index c1f565a..894e885 100644
--- a/src/bin/cxx/text_basic.cc
+++ b/src/bin/cxx/text_basic.cc
@@ -1,40 +1,67 @@
1#undef FNAME
2#undef NAME
3#undef ICON
4 1
5/* metadata */ 2#ifdef HAVE_CONFIG_H
6#define FNAME text_basic_start 3# include <config.h>
7#define NAME "Text Basic" 4#endif
8#define ICON "text.png"
9 5
10#ifndef PROTO 6#include "Eo.h"
11# ifndef UI 7#include "Evas.h"
12# include "main.h" 8
9#include "Eo.hh"
10#include "Eina.hh"
11#include "Evas.hh"
12
13#include "main.h"
14
15#define EXPEDITE_CXX_TEST_IMPL
16#include "text_basic_capi.h"
13 17
14/* standard var */ 18/* standard var */
15static int done = 0; 19static int done = 0;
16 20
17/* private data */ 21/* private data */
18static Evas_Object *o_texts[OBNUM]; 22static efl::eina::list<evas::text> texts;
19 23
20/* setup */ 24/* setup */
21static void _setup(void) 25static void _setup(void)
22{ 26{
23 int i; 27 evas::canvas canvas(::eo_ref(G_evas));
24 Evas_Object *o; 28 for (int i = 0; i < OBNUM; i++)
25
26 for (i = 0; i < OBNUM; i++)
27 { 29 {
28 o = eo_add(EVAS_TEXT_CLASS, G_evas); 30 evas::text o(efl::eo::parent = canvas);
29 o_texts[i] = o; 31 texts.push_back(o);
30 eo_do(o, efl_text_properties_font_set("Vera-Bold", 20), 32 o.font_set("Vera-Bold", 20);
31 efl_text_set("This is a test string"), 33 o.text_set("This is a test string");
32 evas_obj_color_set(0, 0, 0, 255), 34 o.evas::object::color_set(0, 0, 0, 255);
33 evas_obj_visibility_set(EINA_TRUE)); 35 o.evas::object::visibility_set(true);
34 } 36 }
35 done = 0; 37 done = 0;
36} 38}
37 39
40
41/* cleanup */
42static void _cleanup(void)
43{
44 texts.clear();
45}
46
47/* loop - do things */
48static void _loop(double t, int f)
49{
50 auto itr = texts.begin();
51 for (int i = 0; i < OBNUM; i++, ++itr)
52 {
53 Evas_Coord w = 0, h = 0;
54 (*itr).size_get(&w, &h);
55 Evas_Coord x = (win_w / 2) - (w / 2);
56 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
57 Evas_Coord y = (win_h / 2) - (h / 2);
58 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
59 (*itr).evas::object::position_set(x, y);
60 }
61 FPS_STD(NAME);
62}
63
64
38static void _key(char *key) 65static void _key(char *key)
39{ 66{
40 KEY_STD; 67 KEY_STD;
diff --git a/src/bin/cxx/text_change.cc b/src/bin/cxx/text_change.cc
index 34dea5c..53680b7 100644
--- a/src/bin/cxx/text_change.cc
+++ b/src/bin/cxx/text_change.cc
@@ -1,28 +1,30 @@
1#undef FNAME
2#undef NAME
3#undef ICON
4 1
5/* metadata */ 2#ifdef HAVE_CONFIG_H
6#define FNAME text_change_start 3# include <config.h>
7#define NAME "Text Change" 4#endif
8#define ICON "text.png"
9 5
10#ifndef PROTO 6#include "Eo.h"
11# ifndef UI 7#include "Evas.h"
12# include "main.h" 8
9#include "Eo.hh"
10#include "Eina.hh"
11#include "Evas.hh"
12
13#include "main.h"
14
15#define EXPEDITE_CXX_TEST_IMPL
16#include "text_change_capi.h"
13 17
14/* standard var */ 18/* standard var */
15static int done = 0; 19static int done = 0;
16 20
17/* private data */ 21/* private data */
18static Evas_Object *o_texts[OBNUM]; 22static efl::eina::list<evas::text> texts;
19 23
20/* setup */ 24/* setup */
21static void _setup(void) 25static void _setup(void)
22{ 26{
23 int i; 27 evas::canvas canvas(::eo_ref(G_evas));
24 Evas_Object *o;
25 Evas_Coord x, y, w, h;
26 char buf[1024]; 28 char buf[1024];
27 const char *strs[] = { 29 const char *strs[] = {
28 "Big", "Smelly", "Fish", "Pants", "Octopus", "Garden", "There", "I", 30 "Big", "Smelly", "Fish", "Pants", "Octopus", "Garden", "There", "I",
@@ -30,52 +32,54 @@ static void _setup(void)
30 "Fiddly", "Family", "Lair", "Monkeys", "Magazine" 32 "Fiddly", "Family", "Lair", "Monkeys", "Magazine"
31 }; 33 };
32 srnd(); 34 srnd();
33 for (i = 0; i < OBNUM; i++) 35 for (int i = 0; i < OBNUM; i++)
34 { 36 {
35 o = eo_add(EVAS_TEXT_CLASS, G_evas); 37 evas::text o(efl::eo::parent = canvas);
36 o_texts[i] = o; 38 texts.push_back(o);
37 eo_do(o, efl_text_properties_font_set("Vera-Bold", 20)); 39 o.font_set("Vera-Bold", 20);
38 snprintf(buf, sizeof(buf), "%s %s %s %s.", 40 snprintf(buf, sizeof(buf), "%s %s %s %s.", // XXX
39 strs[rnd() % (sizeof(strs) / sizeof(char *))], 41 strs[rnd() % (sizeof(strs) / sizeof(char *))],
40 strs[rnd() % (sizeof(strs) / sizeof(char *))], 42 strs[rnd() % (sizeof(strs) / sizeof(char *))],
41 strs[rnd() % (sizeof(strs) / sizeof(char *))], 43 strs[rnd() % (sizeof(strs) / sizeof(char *))],
42 strs[rnd() % (sizeof(strs) / sizeof(char *))]); 44 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
43 eo_do(o, efl_text_set(buf), 45 Evas_Coord w, h;
44 evas_obj_color_set(0, 0, 0, 255), 46 o.text_set(buf);
45 evas_obj_size_get(&w, &h)); 47 o.evas::object::color_set(0, 0, 0, 255);
46 x = (win_w / 2) - (w / 2); 48 o.evas::object::size_get(&w, &h);
49 Evas_Coord x = (win_w / 2) - (w / 2);
47 x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2); 50 x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2);
48 y = (win_h / 2) - (h / 2); 51 Evas_Coord y = (win_h / 2) - (h / 2);
49 y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2); 52 y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2);
50 eo_do(o, evas_obj_position_set(x, y), 53 o.evas::object::position_set(x, y);
51 evas_obj_visibility_set(EINA_TRUE)); 54 o.evas::object::visibility_set(true);
52 } 55 }
53 done = 0; 56 done = 0;
54} 57}
55 58
56 59/* cleanup */
57 60static void _cleanup(void)
58 61{
59 62 texts.clear();
63}
60 64
61/* loop - do things */ 65/* loop - do things */
62static void _loop(double t, int f) 66static void _loop(double t, int f)
63{ 67{
64 int i;
65 char buf[1024]; 68 char buf[1024];
66 const char *strs[] = { 69 const char *strs[] = {
67 "Big", "Smelly", "Fish", "Pants", "Octopus", "Garden", "There", "I", 70 "Big", "Smelly", "Fish", "Pants", "Octopus", "Garden", "There", "I",
68 "Am", "You", "Are", "Erogenous", "We", "Stick", "Wet", "Fishy", 71 "Am", "You", "Are", "Erogenous", "We", "Stick", "Wet", "Fishy",
69 "Fiddly", "Family", "Lair", "Monkeys", "Magazine" 72 "Fiddly", "Family", "Lair", "Monkeys", "Magazine"
70 }; 73 };
71 for (i = 0; i < OBNUM; i++) 74 auto itr = texts.begin();
75 for (int i = 0; i < OBNUM; i++, ++itr)
72 { 76 {
73 snprintf(buf, sizeof(buf), "%s %s %s %s.", 77 snprintf(buf, sizeof(buf), "%s %s %s %s.",
74 strs[rnd() % (sizeof(strs) / sizeof(char *))], 78 strs[rnd() % (sizeof(strs) / sizeof(char *))],
75 strs[rnd() % (sizeof(strs) / sizeof(char *))], 79 strs[rnd() % (sizeof(strs) / sizeof(char *))],
76 strs[rnd() % (sizeof(strs) / sizeof(char *))], 80 strs[rnd() % (sizeof(strs) / sizeof(char *))],
77 strs[rnd() % (sizeof(strs) / sizeof(char *))]); 81 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
78 eo_do(o_texts[i], efl_text_set(buf)); 82 (*itr).text_set(buf);
79 } 83 }
80 FPS_STD(NAME); 84 FPS_STD(NAME);
81} 85}
diff --git a/src/bin/cxx/text_styles.cc b/src/bin/cxx/text_styles.cc
index d874b1c..6299954 100644
--- a/src/bin/cxx/text_styles.cc
+++ b/src/bin/cxx/text_styles.cc
@@ -19,11 +19,12 @@
19static int done = 0; 19static int done = 0;
20 20
21/* private data */ 21/* private data */
22static eina::list<evas::text> texts; 22static efl::eina::list<evas::text> texts;
23 23
24/* setup */ 24/* setup */
25static void _setup(void) 25static void _setup(void)
26{ 26{
27#if 0
27 int i; 28 int i;
28 Evas_Object *o; 29 Evas_Object *o;
29 Evas_Text_Style_Type st; 30 Evas_Text_Style_Type st;
@@ -47,6 +48,7 @@ static void _setup(void)
47 if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW; 48 if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW;
48 } 49 }
49 done = 0; 50 done = 0;
51#endif // XXX
50} 52}
51 53
52/* cleanup */ 54/* cleanup */
@@ -58,6 +60,7 @@ static void _cleanup(void)
58/* loop - do things */ 60/* loop - do things */
59static void _loop(double t, int f) 61static void _loop(double t, int f)
60{ 62{
63#if 0
61 int i; 64 int i;
62 Evas_Coord x, y, w, h; 65 Evas_Coord x, y, w, h;
63 for (i = 0; i < OBNUM; i++) 66 for (i = 0; i < OBNUM; i++)
@@ -70,6 +73,7 @@ static void _loop(double t, int f)
70 eo_do(o_texts[i], evas_obj_position_set(x, y)); 73 eo_do(o_texts[i], evas_obj_position_set(x, y));
71 } 74 }
72 FPS_STD(NAME); 75 FPS_STD(NAME);
76#endif // XXX
73} 77}
74 78
75static void _key(char *key) 79static 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 24087e3..21c303e 100644
--- a/src/bin/cxx/text_styles_different_strings.cc
+++ b/src/bin/cxx/text_styles_different_strings.cc
@@ -1,26 +1,37 @@
1#undef FNAME
2#undef NAME
3#undef ICON
4 1
5/* metadata */ 2#ifdef HAVE_CONFIG_H
6#define FNAME text_styles_different_strings_start 3# include <config.h>
7#define NAME "Text Styles Different Strings" 4#endif
8#define ICON "text.png"
9 5
10#ifndef PROTO 6#include "Eo.h"
11# ifndef UI 7#include "Evas.h"
12# include "main.h" 8
9#include "Eo.hh"
10#include "Eina.hh"
11#include "Evas.hh"
12
13#include "main.h"
14
15#define EXPEDITE_CXX_TEST_IMPL
16#include "text_styles_different_strings_capi.h"
13 17
14/* standard var */ 18/* standard var */
15static int done = 0; 19static int done = 0;
16 20
17/* private data */ 21/* private data */
18static Evas_Object *o_texts[OBNUM]; 22static efl::eina::list<evas::text> texts;
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}
19 30
20/* setup */ 31/* setup */
21static void _setup(void) 32static void _setup(void)
22{ 33{
23 int i; 34#if 0
24 Evas_Object *o; 35 Evas_Object *o;
25 Evas_Text_Style_Type st; 36 Evas_Text_Style_Type st;
26 char buf[1024]; 37 char buf[1024];
@@ -32,7 +43,7 @@ static void _setup(void)
32 43
33 srnd(); 44 srnd();
34 st = EVAS_TEXT_STYLE_SHADOW; 45 st = EVAS_TEXT_STYLE_SHADOW;
35 for (i = 0; i < OBNUM; i++) 46 for (int i = 0; i < OBNUM; i++)
36 { 47 {
37 o = eo_add(EVAS_TEXT_CLASS, G_evas); 48 o = eo_add(EVAS_TEXT_CLASS, G_evas);
38 o_texts[i] = o; 49 o_texts[i] = o;
@@ -54,8 +65,34 @@ static void _setup(void)
54 if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW; 65 if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW;
55 } 66 }
56 done = 0; 67 done = 0;
68#endif
69}
70
71
72/* cleanup */
73static void _cleanup(void)
74{
75 texts.clear();
76}
77
78/* loop - do things */
79static void _loop(double t, int f)
80{
81 auto itr = texts.begin();
82 for (int i = 0; i < OBNUM; i++, ++itr)
83 {
84 Evas_Coord w, h;
85 (*itr).size_get(&w, &h);
86 Evas_Coord x = (win_w / 2) - (w / 2);
87 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
88 Evas_Coord y = (win_h / 2) - (h / 2);
89 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
90 (*itr).evas::object::position_set(x, y);
91 }
92 FPS_STD(NAME);
57} 93}
58 94
95
59static void _key(char *key) 96static void _key(char *key)
60{ 97{
61 KEY_STD; 98 KEY_STD;
diff --git a/src/bin/cxx/textblock_auto_align.cc b/src/bin/cxx/textblock_auto_align.cc
index 082d135..bf23787 100644
--- a/src/bin/cxx/textblock_auto_align.cc
+++ b/src/bin/cxx/textblock_auto_align.cc
@@ -1,26 +1,31 @@
1#undef FNAME
2#undef NAME
3#undef ICON
4 1
5/* metadata */ 2#ifdef HAVE_CONFIG_H
6#define FNAME textblock_auto_align_start 3# include <config.h>
7#define NAME "Textblock auto align" 4#endif
8#define ICON "text.png"
9 5
10#ifndef PROTO 6#include "Eo.h"
11# ifndef UI 7#include "Evas.h"
12# include "main.h" 8
9#include "Eo.hh"
10#include "Eina.hh"
11#include "Evas.hh"
12
13#include "main.h"
14
15#define EXPEDITE_CXX_TEST_IMPL
16#include "textblock_auto_align_capi.h"
13 17
14/* standard var */ 18/* standard var */
15static int done = 0; 19static int done = 0;
16 20
17/* private data */ 21/* private data */
18static Evas_Object *o_text; 22static evas::textblock text;
19 23
20/* setup */ 24/* setup */
21static void _setup(void) 25static void _setup(void)
22{ 26{
23 Evas_Object *o; 27#if 0
28 evas::canvas canvas(::eo_ref(G_evas));
24 Evas_Textblock_Style *st; 29 Evas_Textblock_Style *st;
25 30
26 o = eo_add(EVAS_TEXTBLOCK_CLASS, G_evas); 31 o = eo_add(EVAS_TEXTBLOCK_CLASS, G_evas);
@@ -56,12 +61,33 @@ static void _setup(void)
56 evas_textblock_style_free(st); 61 evas_textblock_style_free(st);
57 62
58 done = 0; 63 done = 0;
64#endif // XXX
59} 65}
60 66
61/* cleanup */ 67/* cleanup */
62static void _cleanup(void) 68static void _cleanup(void)
63{ 69{
64 eo_del(o_text); 70}
71
72/* loop - do things */
73static void _loop(double t, int f)
74{
75#if 0
76 Evas_Coord x, y, w, h, w0, h0;
77 int i = 0;
78
79 eo_do(o_text, evas_obj_textblock_size_native_get(&w0, &h0));
80 w = w0;
81 h = h0;
82 w += fabs(sin((double)(f + (i * 13)) / (31.1 * SLOW))) * (w0);
83 x = (win_w / 2) - (w / 2);
84 y = (win_h / 2) - (h0 / 2);
85 eo_do(o_text,
86 evas_obj_position_set(x, y),
87 evas_obj_size_set(w, h));
88
89 FPS_STD(NAME);
90#endif /// XXX
65} 91}
66 92
67static void _key(char *key) 93static void _key(char *key)
@@ -69,3 +95,9 @@ static void _key(char *key)
69 KEY_STD; 95 KEY_STD;
70} 96}
71 97
98extern "C" void FNAME(void)
99{
100 ui_func_set(_key, _loop);
101 _setup();
102}
103
diff --git a/src/bin/cxx/textblock_basic.cc b/src/bin/cxx/textblock_basic.cc
index 085b56f..54ce27f 100644
--- a/src/bin/cxx/textblock_basic.cc
+++ b/src/bin/cxx/textblock_basic.cc
@@ -24,6 +24,7 @@ static evas::text text;
24/* setup */ 24/* setup */
25static void _setup(void) 25static void _setup(void)
26{ 26{
27#if 0
27 Evas_Object *o; 28 Evas_Object *o;
28 Evas_Textblock_Style *st; 29 Evas_Textblock_Style *st;
29 30
@@ -121,6 +122,7 @@ static void _setup(void)
121 evas_textblock_style_free(st); 122 evas_textblock_style_free(st);
122 123
123 done = 0; 124 done = 0;
125#endif // XXX
124} 126}
125 127
126/* cleanup */ 128/* cleanup */
@@ -131,6 +133,7 @@ static void _cleanup(void)
131/* loop - do things */ 133/* loop - do things */
132static void _loop(double t, int f) 134static void _loop(double t, int f)
133{ 135{
136#if 0
134 Evas_Coord x, y, w, h, w0, h0; 137 Evas_Coord x, y, w, h, w0, h0;
135 int i = 0; 138 int i = 0;
136 139
@@ -147,6 +150,7 @@ static void _loop(double t, int f)
147 evas_obj_size_set(w, 5000)); 150 evas_obj_size_set(w, 5000));
148 151
149 FPS_STD(NAME); 152 FPS_STD(NAME);
153#endif
150} 154}
151 155
152static void _key(char *key) 156static void _key(char *key)
diff --git a/src/bin/cxx/textblock_intl.cc b/src/bin/cxx/textblock_intl.cc
index eae2cc2..0ebd9c9 100644
--- a/src/bin/cxx/textblock_intl.cc
+++ b/src/bin/cxx/textblock_intl.cc
@@ -1,25 +1,30 @@
1#undef FNAME
2#undef NAME
3#undef ICON
4 1
5/* metadata */ 2#ifdef HAVE_CONFIG_H
6#define FNAME textblock_intl_start 3# include <config.h>
7#define NAME "Textblock Intl" 4#endif
8#define ICON "text.png"
9 5
10#ifndef PROTO 6#include "Eo.h"
11# ifndef UI 7#include "Evas.h"
12# include "main.h" 8
9#include "Eo.hh"
10#include "Eina.hh"
11#include "Evas.hh"
12
13#include "main.h"
14
15#define EXPEDITE_CXX_TEST_IMPL
16#include "textblock_intl_capi.h"
13 17
14/* standard var */ 18/* standard var */
15static int done = 0; 19static int done = 0;
16 20
17/* private data */ 21/* private data */
18static Evas_Object *o_text; 22evas::text text;
19 23
20/* setup */ 24/* setup */
21static void _setup(void) 25static void _setup(void)
22{ 26{
27#if 0
23 Evas_Object *o; 28 Evas_Object *o;
24 Evas_Textblock_Style *st; 29 Evas_Textblock_Style *st;
25 30
@@ -88,9 +93,36 @@ static void _setup(void)
88 evas_textblock_style_free(st); 93 evas_textblock_style_free(st);
89 94
90 done = 0; 95 done = 0;
96#endif // XXX
91} 97}
92 98
93/* cleanup */ 99/* cleanup */
100static void _cleanup(void)
101{
102}
103
104/* loop - do things */
105static void _loop(double t, int f)
106{
107#if 0
108 Evas_Coord x, y, w, h, w0, h0;
109 int i = 0;
110
111 eo_do(o_text, evas_obj_textblock_size_native_get(&w0, &h0));
112 w = w0;
113 h = h0;
114 x = (win_w / 2) - (w / 2);
115 x += sin((double)(f + (i * 13)) / (31.1 * SLOW)) * (w0 / (2 * 2));
116 y = (win_h / 2) - (h / 2);
117 y += cos((double)(f + (i * 28)) / (19.6 * SLOW)) * (h0 / (2 * 2));
118 eo_do(o_text,
119 evas_obj_position_set(x, y),
120 evas_obj_size_set(w, h));
121
122 FPS_STD(NAME);
123#endif // XXX
124}
125
94static void _key(char *key) 126static void _key(char *key)
95{ 127{
96 KEY_STD; 128 KEY_STD;
diff --git a/src/bin/cxx/textblock_text_append.cc b/src/bin/cxx/textblock_text_append.cc
index ad88732..67a7c31 100644
--- a/src/bin/cxx/textblock_text_append.cc
+++ b/src/bin/cxx/textblock_text_append.cc
@@ -24,6 +24,7 @@ static evas::text text;
24/* setup */ 24/* setup */
25static void _setup(void) 25static void _setup(void)
26{ 26{
27#if 0
27 Evas_Object *o; 28 Evas_Object *o;
28 Evas_Textblock_Style *st; 29 Evas_Textblock_Style *st;
29 30
@@ -104,6 +105,7 @@ static void _setup(void)
104 evas_textblock_style_free(st); 105 evas_textblock_style_free(st);
105 106
106 done = 0; 107 done = 0;
108#endif // XXX
107} 109}
108 110
109/* cleanup */ 111/* cleanup */
@@ -114,6 +116,7 @@ static void _cleanup(void)
114/* loop - do things */ 116/* loop - do things */
115static void _loop(double t, int f) 117static void _loop(double t, int f)
116{ 118{
119#if 0
117 Evas_Textblock_Cursor *cur; 120 Evas_Textblock_Cursor *cur;
118 static Evas_Textblock_Cursor *cur2; 121 static Evas_Textblock_Cursor *cur2;
119 eo_do(o_text, cur = evas_obj_textblock_cursor_get()); 122 eo_do(o_text, cur = evas_obj_textblock_cursor_get());
@@ -133,6 +136,7 @@ static void _loop(double t, int f)
133 evas_textblock_cursor_paragraph_next(cur); 136 evas_textblock_cursor_paragraph_next(cur);
134 137
135 FPS_STD(NAME); 138 FPS_STD(NAME);
139#endif // XXX
136} 140}
137 141
138static void _key(char *key) 142static void _key(char *key)
diff --git a/src/bin/cxx/widgets_file_icons.cc b/src/bin/cxx/widgets_file_icons.cc
index c556779..6f0f9d8 100644
--- a/src/bin/cxx/widgets_file_icons.cc
+++ b/src/bin/cxx/widgets_file_icons.cc
@@ -22,7 +22,7 @@ static int done = 0;
22#define ICON_SIZE 64 22#define ICON_SIZE 64
23 23
24static efl::eina::list<evas::image> images; 24static efl::eina::list<evas::image> images;
25static efl::eina::list<evas::text> text; 25static efl::eina::list<evas::text> texts;
26 26
27static const char *icons[] = // XXX 27static const char *icons[] = // XXX
28{ 28{
@@ -47,6 +47,7 @@ static const char *icons[] = // XXX
47/* setup */ 47/* setup */
48static void _setup(void) 48static void _setup(void)
49{ 49{
50#if 0
50 evas::canvas canvas(::eo_ref(G_evas)); 51 evas::canvas canvas(::eo_ref(G_evas));
51 for (int i = 0; i < NUM; i++) 52 for (int i = 0; i < NUM; i++)
52 { 53 {
@@ -67,6 +68,7 @@ static void _setup(void)
67 evas_obj_visibility_set(EINA_TRUE)); 68 evas_obj_visibility_set(EINA_TRUE));
68 } 69 }
69 done = 0; 70 done = 0;
71#endif
70} 72}
71 73
72/* cleanup */ 74/* cleanup */
@@ -76,6 +78,32 @@ static void _cleanup(void)
76 texts.clear(); 78 texts.clear();
77} 79}
78 80
81
82/* loop - do things */
83static void _loop(double t, int f)
84{
85#if 0
86 int i;
87 Evas_Coord x, y, tw, th, cent;
88 x = 0;
89 y = 0 - f;
90 for (i = 0; i < NUM; i++)
91 {
92 eo_do(o_images[i], evas_obj_position_set(x + 8, y));
93 eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
94 cent = (ICON_SIZE + 16 - tw) / 2;
95 eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4));
96 x += ICON_SIZE + 16;
97 if (x > win_w)
98 {
99 x = 0;
100 y += ICON_SIZE + 16;
101 }
102 }
103 FPS_STD(NAME);
104#endif // XXX
105}
106
79static void _key(char *key) 107static void _key(char *key)
80{ 108{
81 KEY_STD; 109 KEY_STD;
diff --git a/src/bin/cxx/widgets_file_icons_2.cc b/src/bin/cxx/widgets_file_icons_2.cc
index 867b364..53d9294 100644
--- a/src/bin/cxx/widgets_file_icons_2.cc
+++ b/src/bin/cxx/widgets_file_icons_2.cc
@@ -1,15 +1,19 @@
1#undef FNAME
2#undef NAME
3#undef ICON
4 1
5/* metadata */ 2#ifdef HAVE_CONFIG_H
6#define FNAME widgets_file_icons_2_start 3# include <config.h>
7#define NAME "Widgets File Icons 2" 4#endif
8#define ICON "widgets.png"
9 5
10#ifndef PROTO 6#include "Eo.h"
11# ifndef UI 7#include "Evas.h"
12# include "main.h" 8
9#include "Eo.hh"
10#include "Eina.hh"
11#include "Evas.hh"
12
13#include "main.h"
14
15#define EXPEDITE_CXX_TEST_IMPL
16#include "widgets_file_icons_2_capi.h"
13 17
14/* standard var */ 18/* standard var */
15static int done = 0; 19static int done = 0;
@@ -17,9 +21,9 @@ static int done = 0;
17#define NUM 512 21#define NUM 512
18#define ICON_SIZE 64 22#define ICON_SIZE 64
19static efl::eina::list<evas::image> images; 23static efl::eina::list<evas::image> images;
20static Evas_Object *o_texts[NUM]; 24static efl::eina::list<evas::text> texts;
21 25
22static const char *icons[] = 26static const char *icons[] = // XXX
23{ 27{
24 "bug.png", 28 "bug.png",
25 "bulb.png", 29 "bulb.png",
@@ -42,6 +46,7 @@ static const char *icons[] =
42/* setup */ 46/* setup */
43static void _setup(void) 47static void _setup(void)
44{ 48{
49#if 0
45 int i; 50 int i;
46 evas::canvas canvas(::eo_ref(G_evas)); 51 evas::canvas canvas(::eo_ref(G_evas));
47 for (i = 0; i < NUM; i++) 52 for (i = 0; i < NUM; i++)
@@ -61,6 +66,7 @@ static void _setup(void)
61 evas_obj_visibility_set(EINA_TRUE)); 66 evas_obj_visibility_set(EINA_TRUE));
62 } 67 }
63 done = 0; 68 done = 0;
69#endif
64} 70}
65 71
66/* cleanup */ 72/* cleanup */
@@ -69,6 +75,33 @@ static void _cleanup(void)
69 images.clear(); 75 images.clear();
70 texts.clear(); 76 texts.clear();
71} 77}
78
79/* loop - do things */
80static void _loop(double t, int f)
81{
82#if 0
83 int i;
84 Evas_Coord x, y, tw, th, cent;
85 x = 0;
86 y = 0 - f;
87 for (i = 0; i < NUM; i++)
88 {
89 eo_do(o_images[i], evas_obj_position_set(x + 8, y));
90 eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
91 cent = (ICON_SIZE + 16 - tw) / 2;
92 eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4));
93 x += ICON_SIZE + 16;
94 if (x > win_w)
95 {
96 x = 0;
97 y += ICON_SIZE + 16;
98 }
99 }
100 FPS_STD(NAME);
101#endif
102}
103
104
72static void _key(char *key) 105static void _key(char *key)
73{ 106{
74 KEY_STD; 107 KEY_STD;
diff --git a/src/bin/cxx/widgets_file_icons_2_grouped.cc b/src/bin/cxx/widgets_file_icons_2_grouped.cc
index a46e442..aa63752 100644
--- a/src/bin/cxx/widgets_file_icons_2_grouped.cc
+++ b/src/bin/cxx/widgets_file_icons_2_grouped.cc
@@ -47,6 +47,7 @@ static const char *icons[] =
47/* setup */ 47/* setup */
48static void _setup(void) 48static void _setup(void)
49{ 49{
50#if 0
50 int i; 51 int i;
51 evas::canvas canvas(::eo_ref(G_evas)); 52 evas::canvas canvas(::eo_ref(G_evas));
52 for (i = 0; i < NUM; i++) 53 for (i = 0; i < NUM; i++)
@@ -75,6 +76,7 @@ static void _setup(void)
75 eo_do(images[i], evas_obj_stack_above(images[i - 13])); 76 eo_do(images[i], evas_obj_stack_above(images[i - 13]));
76 } 77 }
77 done = 0; 78 done = 0;
79#endif // XXX
78} 80}
79 81
80/* cleanup */ 82/* cleanup */
@@ -87,6 +89,7 @@ static void _cleanup(void)
87/* loop - do things */ 89/* loop - do things */
88static void _loop(double t, int f) 90static void _loop(double t, int f)
89{ 91{
92#if 0
90 int i; 93 int i;
91 Evas_Coord x, y, tw, th, cent; 94 Evas_Coord x, y, tw, th, cent;
92 x = 0; 95 x = 0;
@@ -105,6 +108,7 @@ static void _loop(double t, int f)
105 } 108 }
106 } 109 }
107 FPS_STD(NAME); 110 FPS_STD(NAME);
111#endif // XXX
108} 112}
109 113
110static void _key(char *key) 114static 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 d89113b..2b58c91 100644
--- a/src/bin/cxx/widgets_file_icons_2_same.cc
+++ b/src/bin/cxx/widgets_file_icons_2_same.cc
@@ -1,15 +1,19 @@
1#undef FNAME
2#undef NAME
3#undef ICON
4 1
5/* metadata */ 2#ifdef HAVE_CONFIG_H
6#define FNAME widgets_file_icons_2_same_start 3# include <config.h>
7#define NAME "Widgets File Icons 2 Same" 4#endif
8#define ICON "widgets.png"
9 5
10#ifndef PROTO 6#include "Eo.h"
11# ifndef UI 7#include "Evas.h"
12# include "main.h" 8
9#include "Eo.hh"
10#include "Eina.hh"
11#include "Evas.hh"
12
13#include "main.h"
14
15#define EXPEDITE_CXX_TEST_IMPL
16#include "widgets_file_icons_2_same_capi.h"
13 17
14/* standard var */ 18/* standard var */
15static int done = 0; 19static int done = 0;
@@ -28,6 +32,7 @@ static const char *icons[] = // XXX
28/* setup */ 32/* setup */
29static void _setup(void) 33static void _setup(void)
30{ 34{
35#if 0
31 int i; 36 int i;
32 evas::canvas canvas(::eo_ref(G_evas)); 37 evas::canvas canvas(::eo_ref(G_evas));
33 for (i = 0; i < NUM; i++) 38 for (i = 0; i < NUM; i++)
@@ -47,6 +52,7 @@ static void _setup(void)
47 evas_obj_visibility_set(EINA_TRUE)); 52 evas_obj_visibility_set(EINA_TRUE));
48 } 53 }
49 done = 0; 54 done = 0;
55#endif // XXX
50} 56}
51 57
52/* cleanup */ 58/* cleanup */
@@ -59,6 +65,7 @@ static void _cleanup(void)
59/* loop - do things */ 65/* loop - do things */
60static void _loop(double t, int f) 66static void _loop(double t, int f)
61{ 67{
68#if 0
62 int i; 69 int i;
63 Evas_Coord x, y, tw, th, cent; 70 Evas_Coord x, y, tw, th, cent;
64 x = 0; 71 x = 0;
@@ -77,6 +84,7 @@ static void _loop(double t, int f)
77 } 84 }
78 } 85 }
79 FPS_STD(NAME); 86 FPS_STD(NAME);
87#endif
80} 88}
81 89
82static void _key(char *key) 90static 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 07d3905..0ab25b6 100644
--- a/src/bin/cxx/widgets_file_icons_2_same_grouped.cc
+++ b/src/bin/cxx/widgets_file_icons_2_same_grouped.cc
@@ -21,7 +21,7 @@ static int done = 0;
21#define NUM 512 21#define NUM 512
22#define ICON_SIZE 64 22#define ICON_SIZE 64
23static efl::eina::list<evas::image> images; 23static efl::eina::list<evas::image> images;
24static Evas_Object *o_texts[NUM]; 24static efl::eina::list<evas::text> texts;
25 25
26static const char *icons[] = 26static const char *icons[] =
27{ 27{
@@ -31,6 +31,7 @@ static const char *icons[] =
31/* setup */ 31/* setup */
32static void _setup(void) 32static void _setup(void)
33{ 33{
34#if 0
34 int i; 35 int i;
35 evas::canvas canvas(::eo_ref(G_evas)); 36 evas::canvas canvas(::eo_ref(G_evas));
36 for (i = 0; i < NUM; i++) 37 for (i = 0; i < NUM; i++)
@@ -54,22 +55,26 @@ static void _setup(void)
54 eo_do(images[i], evas_obj_raise()); 55 eo_do(images[i], evas_obj_raise());
55 } 56 }
56 done = 0; 57 done = 0;
58#endif // XXX
57} 59}
58 60
59/* cleanup */ 61/* cleanup */
60static void _cleanup(void) 62static void _cleanup(void)
61{ 63{
64#if 0
62 int i; 65 int i;
63 for (i = 0; i < NUM; i++) 66 for (i = 0; i < NUM; i++)
64 { 67 {
65 eo_del(images[i]); 68 eo_del(images[i]);
66 eo_del(o_texts[i]); 69 eo_del(o_texts[i]);
67 } 70 }
71#endif // XXX
68} 72}
69 73
70/* loop - do things */ 74/* loop - do things */
71static void _loop(double t, int f) 75static void _loop(double t, int f)
72{ 76{
77#if 0
73 int i; 78 int i;
74 Evas_Coord x, y, tw, th, cent; 79 Evas_Coord x, y, tw, th, cent;
75 x = 0; 80 x = 0;
@@ -88,6 +93,7 @@ static void _loop(double t, int f)
88 } 93 }
89 } 94 }
90 FPS_STD(NAME); 95 FPS_STD(NAME);
96#endif
91} 97}
92 98
93/* 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 f41eaa5..8235c39 100644
--- a/src/bin/cxx/widgets_file_icons_3.cc
+++ b/src/bin/cxx/widgets_file_icons_3.cc
@@ -1,15 +1,19 @@
1#undef FNAME
2#undef NAME
3#undef ICON
4 1
5/* metadata */ 2#ifdef HAVE_CONFIG_H
6#define FNAME widgets_file_icons_3_start 3# include <config.h>
7#define NAME "Widgets File Icons 3" 4#endif
8#define ICON "widgets.png"
9 5
10#ifndef PROTO 6#include "Eo.h"
11# ifndef UI 7#include "Evas.h"
12# include "main.h" 8
9#include "Eo.hh"
10#include "Eina.hh"
11#include "Evas.hh"
12
13#include "main.h"
14
15#define EXPEDITE_CXX_TEST_IMPL
16#include "widgets_file_icons_3_capi.h"
13 17
14/* standard var */ 18/* standard var */
15static int done = 0; 19static int done = 0;
@@ -17,7 +21,7 @@ static int done = 0;
17#define NUM 512 21#define NUM 512
18#define ICON_SIZE 16 22#define ICON_SIZE 16
19static efl::eina::list<evas::image> images; 23static efl::eina::list<evas::image> images;
20static Evas_Object *o_texts[NUM]; 24static efl::eina::list<evas::text> texts;
21 25
22static const char *icons[] = 26static const char *icons[] =
23{ 27{
@@ -42,6 +46,7 @@ static const char *icons[] =
42/* setup */ 46/* setup */
43static void _setup(void) 47static void _setup(void)
44{ 48{
49#if 0
45 int i; 50 int i;
46 evas::canvas canvas(::eo_ref(G_evas)); 51 evas::canvas canvas(::eo_ref(G_evas));
47 for (i = 0; i < NUM; i++) 52 for (i = 0; i < NUM; i++)
@@ -61,18 +66,42 @@ static void _setup(void)
61 evas_obj_visibility_set(EINA_TRUE)); 66 evas_obj_visibility_set(EINA_TRUE));
62 } 67 }
63 done = 0; 68 done = 0;
69#endif
64} 70}
65 71
66/* cleanup */ 72/* cleanup */
67static void _cleanup(void) 73static void _cleanup(void)
68{ 74{
75 images.clear();
76 texts.clear();
77}
78
79/* loop - do things */
80static void _loop(double t, int f)
81{
82#if 0
69 int i; 83 int i;
84 Evas_Coord x, y, tw, th, cent;
85 x = 0;
86 y = 0 - f;
70 for (i = 0; i < NUM; i++) 87 for (i = 0; i < NUM; i++)
71 { 88 {
72 eo_del(images[i]); 89 eo_do(o_images[i], evas_obj_position_set(x + 8, y));
73 eo_del(o_texts[i]); 90 eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
91 cent = (ICON_SIZE + 16 - tw) / 2;
92 eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4));
93 x += ICON_SIZE + 16;
94 if (x > win_w)
95 {
96 x = 0;
97 y += ICON_SIZE + 16;
98 }
74 } 99 }
100 FPS_STD(NAME);
101#endif // XXX
75} 102}
103
104
76static void _key(char *key) 105static void _key(char *key)
77{ 106{
78 KEY_STD; 107 KEY_STD;
diff --git a/src/bin/cxx/widgets_file_icons_4.cc b/src/bin/cxx/widgets_file_icons_4.cc
index 71997f2..342cc6b 100644
--- a/src/bin/cxx/widgets_file_icons_4.cc
+++ b/src/bin/cxx/widgets_file_icons_4.cc
@@ -46,6 +46,7 @@ static const char *icons[] =
46/* setup */ 46/* setup */
47static void _setup(void) 47static void _setup(void)
48{ 48{
49#if 0
49 int i; 50 int i;
50 evas::canvas canvas(::eo_ref(G_evas)); 51 evas::canvas canvas(::eo_ref(G_evas));
51 for (i = 0; i < NUM; i++) 52 for (i = 0; i < NUM; i++)
@@ -65,6 +66,7 @@ static void _setup(void)
65 evas_obj_visibility_set(EINA_TRUE)); 66 evas_obj_visibility_set(EINA_TRUE));
66 } 67 }
67 done = 0; 68 done = 0;
69#endif
68} 70}
69 71
70/* cleanup */ 72/* cleanup */
@@ -77,6 +79,7 @@ static void _cleanup(void)
77/* loop - do things */ 79/* loop - do things */
78static void _loop(double t, int f) 80static void _loop(double t, int f)
79{ 81{
82#if 0
80 int i; 83 int i;
81 Evas_Coord x, y, tw, th, cent; 84 Evas_Coord x, y, tw, th, cent;
82 x = 0; 85 x = 0;
@@ -95,6 +98,7 @@ static void _loop(double t, int f)
95 } 98 }
96 } 99 }
97 FPS_STD(NAME); 100 FPS_STD(NAME);
101#endif
98} 102}
99 103
100static void _key(char *key) 104static void _key(char *key)
diff --git a/src/bin/cxx/widgets_file_icons_capi.h b/src/bin/cxx/widgets_file_icons_capi.h
index 56bb88c..0729002 100644
--- a/src/bin/cxx/widgets_file_icons_capi.h
+++ b/src/bin/cxx/widgets_file_icons_capi.h
@@ -8,7 +8,7 @@ extern "C" {
8#undef ICON 8#undef ICON
9 9
10/* metadata */ 10/* metadata */
11#define FNAME widgets_file_icons_start 11#define FNAME widgets_file_icons_cxx_start
12#define NAME "(C++) Widgets File Icons" 12#define NAME "(C++) Widgets File Icons"
13#define ICON "widgets.png" 13#define ICON "widgets.png"
14 14
diff --git a/src/bin/cxx/widgets_list_1.cc b/src/bin/cxx/widgets_list_1.cc
index 8087488..e4dc19f 100644
--- a/src/bin/cxx/widgets_list_1.cc
+++ b/src/bin/cxx/widgets_list_1.cc
@@ -13,8 +13,7 @@
13#include "main.h" 13#include "main.h"
14 14
15#define EXPEDITE_CXX_TEST_IMPL 15#define EXPEDITE_CXX_TEST_IMPL
16#include "cxx/widgets_list_1._capich" 16#include "widgets_list_1_capi.h"
17
18 17
19/* standard var */ 18/* standard var */
20static int done = 0; 19static int done = 0;
@@ -64,6 +63,7 @@ static const char *labels[] =
64/* setup */ 63/* setup */
65static void _setup(void) 64static void _setup(void)
66{ 65{
66#if 0
67 int i; 67 int i;
68 evas::canvas canvas(::eo_ref(G_evas)); 68 evas::canvas canvas(::eo_ref(G_evas));
69 for (i = 0; i < NUM; i++) 69 for (i = 0; i < NUM; i++)
@@ -84,6 +84,7 @@ static void _setup(void)
84 evas_obj_visibility_set(EINA_TRUE)); 84 evas_obj_visibility_set(EINA_TRUE));
85 } 85 }
86 done = 0; 86 done = 0;
87#endif // XXX
87} 88}
88 89
89/* cleanup */ 90/* cleanup */
@@ -96,6 +97,7 @@ static void _cleanup(void)
96/* loop - do things */ 97/* loop - do things */
97static void _loop(double t, int f) 98static void _loop(double t, int f)
98{ 99{
100#if 0
99 int i; 101 int i;
100 Evas_Coord x, y, tw, th, cent; 102 Evas_Coord x, y, tw, th, cent;
101 x = 0; 103 x = 0;
@@ -109,6 +111,7 @@ static void _loop(double t, int f)
109 y += ICON_SIZE; 111 y += ICON_SIZE;
110 } 112 }
111 FPS_STD(NAME); 113 FPS_STD(NAME);
114#endif // XXX
112} 115}
113 116
114static void _key(char *key) 117static 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 4681a24..924ca4f 100644
--- a/src/bin/cxx/widgets_list_1_grouped.cc
+++ b/src/bin/cxx/widgets_list_1_grouped.cc
@@ -1,15 +1,19 @@
1#undef FNAME
2#undef NAME
3#undef ICON
4 1
5/* metadata */ 2#ifdef HAVE_CONFIG_H
6#define FNAME widgets_list_1_grouped_start 3# include <config.h>
7#define NAME "Widgets List Grouped" 4#endif
8#define ICON "widgets.png"
9 5
10#ifndef PROTO 6#include "Eo.h"
11# ifndef UI 7#include "Evas.h"
12# include "main.h" 8
9#include "Eo.hh"
10#include "Eina.hh"
11#include "Evas.hh"
12
13#include "main.h"
14
15#define EXPEDITE_CXX_TEST_IMPL
16#include "widgets_list_1_grouped_capi.h"
13 17
14/* standard var */ 18/* standard var */
15static int done = 0; 19static int done = 0;
@@ -17,7 +21,7 @@ static int done = 0;
17#define NUM 512 21#define NUM 512
18#define ICON_SIZE 64 22#define ICON_SIZE 64
19static efl::eina::list<evas::image> images; 23static efl::eina::list<evas::image> images;
20static Evas_Object *o_texts[NUM]; 24static efl::eina::list<evas::text> texts;
21 25
22static const char *labels[] = 26static const char *labels[] =
23{ 27{
@@ -58,6 +62,7 @@ static const char *labels[] =
58/* setup */ 62/* setup */
59static void _setup(void) 63static void _setup(void)
60{ 64{
65#if 0
61 int i; 66 int i;
62 evas::canvas canvas(::eo_ref(G_evas)); 67 evas::canvas canvas(::eo_ref(G_evas));
63 for (i = 0; i < NUM; i++) 68 for (i = 0; i < NUM; i++)
@@ -86,13 +91,36 @@ static void _setup(void)
86 eo_do(o_texts[i], evas_obj_raise()); 91 eo_do(o_texts[i], evas_obj_raise());
87 } 92 }
88 done = 0; 93 done = 0;
94#endif // XXX
89} 95}
90 96
91/* cleanup */ 97/* cleanup */
92static void _cleanup(void) 98static void _cleanup(void)
93{ 99{
100 images.clear();
101 texts.clear();
102}
103
104/* loop - do things */
105static void _loop(double t, int f)
106{
107#if 0
94 int i; 108 int i;
109 Evas_Coord x, y, tw, th, cent;
110 x = 0;
111 y = 0 - f;
95 for (i = 0; i < NUM; i++) 112 for (i = 0; i < NUM; i++)
113 {
114 eo_do(o_images[i], evas_obj_position_set(x, y));
115 eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
116 cent = (ICON_SIZE - th) / 2;
117 eo_do(o_texts[i], evas_obj_position_set(x + 8, y + cent));
118 y += ICON_SIZE;
119 }
120 FPS_STD(NAME);
121#endif // XXX
122}
123
96static void _key(char *key) 124static void _key(char *key)
97{ 125{
98 KEY_STD; 126 KEY_STD;
diff --git a/src/bin/cxx/widgets_list_2.cc b/src/bin/cxx/widgets_list_2.cc
index 48bc2f8..c5c7b9c 100644
--- a/src/bin/cxx/widgets_list_2.cc
+++ b/src/bin/cxx/widgets_list_2.cc
@@ -63,6 +63,7 @@ static const char *labels[] = // XXX
63/* setup */ 63/* setup */
64static void _setup(void) 64static void _setup(void)
65{ 65{
66#if 0
66 int i; 67 int i;
67 evas::canvas canvas(::eo_ref(G_evas)); 68 evas::canvas canvas(::eo_ref(G_evas));
68 for (i = 0; i < NUM; i++) 69 for (i = 0; i < NUM; i++)
@@ -83,6 +84,7 @@ static void _setup(void)
83 evas_obj_visibility_set(EINA_TRUE)); 84 evas_obj_visibility_set(EINA_TRUE));
84 } 85 }
85 done = 0; 86 done = 0;
87#endif
86} 88}
87 89
88/* cleanup */ 90/* cleanup */
@@ -95,6 +97,7 @@ static void _cleanup(void)
95/* loop - do things */ 97/* loop - do things */
96static void _loop(double t, int f) 98static void _loop(double t, int f)
97{ 99{
100#if 0
98 int i; 101 int i;
99 Evas_Coord x, y, tw, th, cent; 102 Evas_Coord x, y, tw, th, cent;
100 x = 0; 103 x = 0;
@@ -108,6 +111,7 @@ static void _loop(double t, int f)
108 y += ICON_SIZE; 111 y += ICON_SIZE;
109 } 112 }
110 FPS_STD(NAME); 113 FPS_STD(NAME);
114#endif
111} 115}
112 116
113static void _key(char *key) 117static void _key(char *key)
diff --git a/src/bin/cxx/widgets_list_2_grouped.cc b/src/bin/cxx/widgets_list_2_grouped.cc
index 015850a..6521ce5 100644
--- a/src/bin/cxx/widgets_list_2_grouped.cc
+++ b/src/bin/cxx/widgets_list_2_grouped.cc
@@ -63,6 +63,7 @@ static const char *labels[] = // XXX
63/* setup */ 63/* setup */
64static void _setup(void) 64static void _setup(void)
65{ 65{
66#if 0
66 int i; 67 int i;
67 evas::canvas canvas(::eo_ref(G_evas)); 68 evas::canvas canvas(::eo_ref(G_evas));
68 for (i = 0; i < NUM; i++) 69 for (i = 0; i < NUM; i++)
@@ -91,6 +92,7 @@ static void _setup(void)
91 eo_do(o_texts[i], evas_obj_raise()); 92 eo_do(o_texts[i], evas_obj_raise());
92 } 93 }
93 done = 0; 94 done = 0;
95#endif // XXX
94} 96}
95 97
96/* cleanup */ 98/* cleanup */
@@ -103,6 +105,7 @@ static void _cleanup(void)
103/* loop - do things */ 105/* loop - do things */
104static void _loop(double t, int f) 106static void _loop(double t, int f)
105{ 107{
108#if 0
106 int i; 109 int i;
107 Evas_Coord x, y, tw, th, cent; 110 Evas_Coord x, y, tw, th, cent;
108 x = 0; 111 x = 0;
@@ -116,6 +119,7 @@ static void _loop(double t, int f)
116 y += ICON_SIZE; 119 y += ICON_SIZE;
117 } 120 }
118 FPS_STD(NAME); 121 FPS_STD(NAME);
122#endif // XXX
119} 123}
120 124
121static void _key(char *key) 125static void _key(char *key)
diff --git a/src/bin/cxx/widgets_list_3.cc b/src/bin/cxx/widgets_list_3.cc
index cb41048..fbf2170 100644
--- a/src/bin/cxx/widgets_list_3.cc
+++ b/src/bin/cxx/widgets_list_3.cc
@@ -1,4 +1,19 @@
1 1
2#ifdef HAVE_CONFIG_H
3# include <config.h>
4#endif
5
6#include "Eo.h"
7#include "Evas.h"
8
9#include "Eo.hh"
10#include "Eina.hh"
11#include "Evas.hh"
12
13#include "main.h"
14
15#define EXPEDITE_CXX_TEST_IMPL
16#include "widgets_list_3_capi.h"
2 17
3/* standard var */ 18/* standard var */
4static int done = 0; 19static int done = 0;
@@ -6,10 +21,10 @@ static int done = 0;
6#define NUM 512 21#define NUM 512
7#define ICON_SIZE 64 22#define ICON_SIZE 64
8static efl::eina::list<evas::image> images; 23static efl::eina::list<evas::image> images;
9static Evas_Object *o_icons[NUM]; 24static efl::eina::list<evas::image> icons;
10static Evas_Object *o_texts[NUM]; 25static efl::eina::list<evas::text> texts;
11 26
12static const char *icons[] = 27static const char *_icons[] =
13{ 28{
14 "bug.png", 29 "bug.png",
15 "bulb.png", 30 "bulb.png",
@@ -68,6 +83,7 @@ static const char *labels[] =
68/* setup */ 83/* setup */
69static void _setup(void) 84static void _setup(void)
70{ 85{
86#if 0
71 evas::canvas canvas(::eo_ref(G_evas)); 87 evas::canvas canvas(::eo_ref(G_evas));
72 for (int i = 0; i < NUM; i++) 88 for (int i = 0; i < NUM; i++)
73 { 89 {
@@ -83,7 +99,7 @@ static void _setup(void)
83 o_icons[i] = o; 99 o_icons[i] = o;
84 eo_do(o, evas_obj_image_filled_set(1), 100 eo_do(o, evas_obj_image_filled_set(1),
85 evas_obj_image_border_set(2, 2, 2, 2), 101 evas_obj_image_border_set(2, 2, 2, 2),
86 efl_file_set(build_path(icons[i % 13]), NULL), 102 efl_file_set(build_path(_icons[i % 13]), NULL),
87 evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8), 103 evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
88 evas_obj_visibility_set(EINA_TRUE)); 104 evas_obj_visibility_set(EINA_TRUE));
89 105
@@ -95,23 +111,21 @@ static void _setup(void)
95 evas_obj_visibility_set(EINA_TRUE)); 111 evas_obj_visibility_set(EINA_TRUE));
96 } 112 }
97 done = 0; 113 done = 0;
114#endif // XXX
98} 115}
99 116
100/* cleanup */ 117/* cleanup */
101static void _cleanup(void) 118static void _cleanup(void)
102{ 119{
103 int i; 120 images.clear();
104 for (i = 0; i < NUM; i++) 121 icons.clear();
105 { 122 texts.clear();
106 eo_del(o_images[i]);
107 eo_del(o_icons[i]);
108 eo_del(o_texts[i]);
109 }
110} 123}
111 124
112/* loop - do things */ 125/* loop - do things */
113static void _loop(double t, int f) 126static void _loop(double t, int f)
114{ 127{
128#if 0
115 int i; 129 int i;
116 Evas_Coord x, y, tw, th, cent; 130 Evas_Coord x, y, tw, th, cent;
117 x = 0; 131 x = 0;
@@ -126,6 +140,7 @@ static void _loop(double t, int f)
126 y += ICON_SIZE; 140 y += ICON_SIZE;
127 } 141 }
128 FPS_STD(NAME); 142 FPS_STD(NAME);
143#endif
129} 144}
130 145
131/* prepend special key handlers if interactive (before STD) */ 146/* prepend special key handlers if interactive (before STD) */
diff --git a/src/bin/cxx/widgets_list_3_grouped.cc b/src/bin/cxx/widgets_list_3_grouped.cc
index 9f7fd95..77fb475 100644
--- a/src/bin/cxx/widgets_list_3_grouped.cc
+++ b/src/bin/cxx/widgets_list_3_grouped.cc
@@ -25,7 +25,7 @@ static efl::eina::list<evas::image> images;
25static efl::eina::list<evas::image> icons; 25static efl::eina::list<evas::image> icons;
26static efl::eina::list<evas::text> texts; 26static efl::eina::list<evas::text> texts;
27 27
28static const char *icons[] = 28static const char *_icons[] =
29{ 29{
30 "bug.png", 30 "bug.png",
31 "bulb.png", 31 "bulb.png",
@@ -84,6 +84,7 @@ static const char *labels[] =
84/* setup */ 84/* setup */
85static void _setup(void) 85static void _setup(void)
86{ 86{
87#if 0
87 int i; 88 int i;
88 evas::canvas canvas(::eo_ref(G_evas)); 89 evas::canvas canvas(::eo_ref(G_evas));
89 for (i = 0; i < NUM; i++) 90 for (i = 0; i < NUM; i++)
@@ -97,10 +98,10 @@ static void _setup(void)
97 evas_obj_visibility_set(EINA_TRUE)); 98 evas_obj_visibility_set(EINA_TRUE));
98 99
99 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 100 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
100 o_icons[i] = o; 101 icons[i] = o;
101 eo_do(o, evas_obj_image_filled_set(1), 102 eo_do(o, evas_obj_image_filled_set(1),
102 evas_obj_image_border_set(2, 2, 2, 2), 103 evas_obj_image_border_set(2, 2, 2, 2),
103 efl_file_set(build_path(icons[i % 13]), NULL), 104 efl_file_set(build_path(_icons[i % 13]), NULL),
104 evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8), 105 evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
105 evas_obj_visibility_set(EINA_TRUE)); 106 evas_obj_visibility_set(EINA_TRUE));
106 107
@@ -117,18 +118,19 @@ static void _setup(void)
117 } 118 }
118 for (i = 0; i < NUM; i++) 119 for (i = 0; i < NUM; i++)
119 { 120 {
120 eo_do(o_icons[i], evas_obj_raise()); 121 eo_do(icons[i], evas_obj_raise());
121 } 122 }
122 for (i = 0; i < NUM; i++) 123 for (i = 0; i < NUM; i++)
123 { 124 {
124 if (i > 13) 125 if (i > 13)
125 eo_do(o_icons[i], evas_obj_stack_above(o_icons[i - 13])); 126 eo_do(icons[i], evas_obj_stack_above(icons[i - 13]));
126 } 127 }
127 for (i = 0; i < NUM; i++) 128 for (i = 0; i < NUM; i++)
128 { 129 {
129 eo_do(o_texts[i], evas_obj_raise()); 130 eo_do(o_texts[i], evas_obj_raise());
130 } 131 }
131 done = 0; 132 done = 0;
133#endif // XXX
132} 134}
133 135
134/* cleanup */ 136/* cleanup */
@@ -142,6 +144,7 @@ static void _cleanup(void)
142/* loop - do things */ 144/* loop - do things */
143static void _loop(double t, int f) 145static void _loop(double t, int f)
144{ 146{
147#if 0
145 int i; 148 int i;
146 Evas_Coord x, y, tw, th, cent; 149 Evas_Coord x, y, tw, th, cent;
147 x = 0; 150 x = 0;
@@ -149,13 +152,14 @@ static void _loop(double t, int f)
149 for (i = 0; i < NUM; i++) 152 for (i = 0; i < NUM; i++)
150 { 153 {
151 eo_do(o_images[i], evas_obj_position_set(x, y)); 154 eo_do(o_images[i], evas_obj_position_set(x, y));
152 eo_do(o_icons[i], evas_obj_position_set(x + 4, y + 4)); 155 eo_do(icons[i], evas_obj_position_set(x + 4, y + 4));
153 eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); 156 eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
154 cent = (ICON_SIZE - th) / 2; 157 cent = (ICON_SIZE - th) / 2;
155 eo_do(o_texts[i], evas_obj_position_set(x + 8 + ICON_SIZE + 8, y + cent)); 158 eo_do(o_texts[i], evas_obj_position_set(x + 8 + ICON_SIZE + 8, y + cent));
156 y += ICON_SIZE; 159 y += ICON_SIZE;
157 } 160 }
158 FPS_STD(NAME); 161 FPS_STD(NAME);
162#endif // XXX
159} 163}
160 164
161static void _key(char *key) 165static void _key(char *key)
diff --git a/src/bin/cxx/widgets_list_4.cc b/src/bin/cxx/widgets_list_4.cc
index 548202f..f9291ca 100644
--- a/src/bin/cxx/widgets_list_4.cc
+++ b/src/bin/cxx/widgets_list_4.cc
@@ -25,7 +25,7 @@ static efl::eina::list<evas::image> images;
25static efl::eina::list<evas::image> icons; 25static efl::eina::list<evas::image> icons;
26static efl::eina::list<evas::text> texts; 26static efl::eina::list<evas::text> texts;
27 27
28static const char *icons[] = // XXX 28static const char *_icons[] = // XXX
29{ 29{
30 "bug.png", 30 "bug.png",
31 "bulb.png", 31 "bulb.png",
@@ -84,6 +84,7 @@ static const char *labels[] =
84/* setup */ 84/* setup */
85static void _setup(void) 85static void _setup(void)
86{ 86{
87#if 0
87 int i; 88 int i;
88 evas::canvas canvas(::eo_ref(G_evas)); 89 evas::canvas canvas(::eo_ref(G_evas));
89 for (i = 0; i < NUM; i++) 90 for (i = 0; i < NUM; i++)
@@ -100,7 +101,7 @@ static void _setup(void)
100 o_icons[i] = o; 101 o_icons[i] = o;
101 eo_do(o, evas_obj_image_filled_set(1), 102 eo_do(o, evas_obj_image_filled_set(1),
102 evas_obj_image_border_set(2, 2, 2, 2), 103 evas_obj_image_border_set(2, 2, 2, 2),
103 efl_file_set(build_path(icons[i % 13]), NULL), 104 efl_file_set(build_path(_icons[i % 13]), NULL),
104 evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8), 105 evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
105 evas_obj_visibility_set(EINA_TRUE)); 106 evas_obj_visibility_set(EINA_TRUE));
106 107
@@ -112,6 +113,7 @@ static void _setup(void)
112 evas_obj_visibility_set(EINA_TRUE)); 113 evas_obj_visibility_set(EINA_TRUE));
113 } 114 }
114 done = 0; 115 done = 0;
116#endif // XXX
115} 117}
116 118
117/* cleanup */ 119/* cleanup */
@@ -122,6 +124,28 @@ static void _cleanup(void)
122 texts.clear(); 124 texts.clear();
123} 125}
124 126
127/* loop - do things */
128static void _loop(double t, int f)
129{
130#if 0
131 int i;
132 Evas_Coord x, y, tw, th, cent;
133 x = 0;
134 y = 0 - f;
135 for (i = 0; i < NUM; i++)
136 {
137 eo_do(o_images[i], evas_obj_position_set(x, y));
138 eo_do(o_icons[i], evas_obj_position_set(x + 4, y + 4));
139 eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
140 cent = (ICON_SIZE - th) / 2;
141 eo_do(o_texts[i], evas_obj_position_set(x + 8 + ICON_SIZE + 8, y + cent));
142 y += ICON_SIZE;
143 }
144 FPS_STD(NAME);
145#endif
146}
147
148
125static void _key(char *key) 149static void _key(char *key)
126{ 150{
127 KEY_STD; 151 KEY_STD;
diff --git a/src/bin/cxx/widgets_list_4_grouped.cc b/src/bin/cxx/widgets_list_4_grouped.cc
index d09b6a1..84b32f3 100644
--- a/src/bin/cxx/widgets_list_4_grouped.cc
+++ b/src/bin/cxx/widgets_list_4_grouped.cc
@@ -1,15 +1,19 @@
1#undef FNAME
2#undef NAME
3#undef ICON
4 1
5/* metadata */ 2#ifdef HAVE_CONFIG_H
6#define FNAME widgets_list_4_grouped_start 3# include <config.h>
7#define NAME "Widgets List 4 Grouped" 4#endif
8#define ICON "widgets.png"
9 5
10#ifndef PROTO 6#include "Eo.h"
11# ifndef UI 7#include "Evas.h"
12# include "main.h" 8
9#include "Eo.hh"
10#include "Eina.hh"
11#include "Evas.hh"
12
13#include "main.h"
14
15#define EXPEDITE_CXX_TEST_IMPL
16#include "widgets_list_4_grouped_capi.h"
13 17
14/* standard var */ 18/* standard var */
15static int done = 0; 19static int done = 0;
@@ -17,10 +21,10 @@ static int done = 0;
17#define NUM 512 21#define NUM 512
18#define ICON_SIZE 32 22#define ICON_SIZE 32
19static efl::eina::list<evas::image> images; 23static efl::eina::list<evas::image> images;
20static Evas_Object *o_icons[NUM]; 24static efl::eina::list<evas::image> icons;
21static Evas_Object *o_texts[NUM]; 25static efl::eina::list<evas::text> texts;
22 26
23static const char *icons[] = 27static const char *_icons[] =
24{ 28{
25 "bug.png", 29 "bug.png",
26 "bulb.png", 30 "bulb.png",
@@ -79,6 +83,7 @@ static const char *labels[] =
79/* setup */ 83/* setup */
80static void _setup(void) 84static void _setup(void)
81{ 85{
86#if 0
82 evas::canvas canvas(::eo_ref(G_evas)); 87 evas::canvas canvas(::eo_ref(G_evas));
83 for (int i = 0; i < NUM; i++) 88 for (int i = 0; i < NUM; i++)
84 { 89 {
@@ -94,7 +99,7 @@ static void _setup(void)
94 o_icons[i] = o; 99 o_icons[i] = o;
95 eo_do(o, evas_obj_image_filled_set(1), 100 eo_do(o, evas_obj_image_filled_set(1),
96 evas_obj_image_border_set(2, 2, 2, 2), 101 evas_obj_image_border_set(2, 2, 2, 2),
97 efl_file_set(build_path(icons[i % 13]), NULL), 102 efl_file_set(build_path(_icons[i % 13]), NULL),
98 evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8), 103 evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
99 evas_obj_visibility_set(EINA_TRUE)); 104 evas_obj_visibility_set(EINA_TRUE));
100 105
@@ -122,6 +127,7 @@ static void _setup(void)
122 eo_do(o_texts[i], evas_obj_raise()); 127 eo_do(o_texts[i], evas_obj_raise());
123 } 128 }
124 done = 0; 129 done = 0;
130#endif // XXX
125} 131}
126 132
127static void _cleanup() 133static void _cleanup()
@@ -132,6 +138,7 @@ static void _cleanup()
132/* loop - do things */ 138/* loop - do things */
133static void _loop(double t, int f) 139static void _loop(double t, int f)
134{ 140{
141#if 0
135 int i; 142 int i;
136 Evas_Coord x, y, tw, th, cent; 143 Evas_Coord x, y, tw, th, cent;
137 x = 0; 144 x = 0;
@@ -146,6 +153,7 @@ static void _loop(double t, int f)
146 y += ICON_SIZE; 153 y += ICON_SIZE;
147 } 154 }
148 FPS_STD(NAME); 155 FPS_STD(NAME);
156#endif
149} 157}
150 158
151static void _key(char *key) 159static void _key(char *key)