summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2015-04-09 13:31:59 +0200
committerCedric BAIL <cedric@osg.samsung.com>2015-04-09 13:31:59 +0200
commit9b7d97d5034de22cf8090f5f598eeceab5aa1165 (patch)
tree44af2389b79d7c3ec134ac7f8f059fcb1f154d60
parentaccb76125ff60037d215ed4d752426ce69dca553 (diff)
move to EFL 1.14 interfaces.devs/cedric/efl-1.14
-rw-r--r--src/bin/about.c6
-rw-r--r--src/bin/image_blend_border.c8
-rw-r--r--src/bin/image_blend_border_recolor.c10
-rw-r--r--src/bin/image_blend_fade_pow2_unscaled.c10
-rw-r--r--src/bin/image_blend_fade_unscaled.c10
-rw-r--r--src/bin/image_blend_many_smooth_same_scaled.c10
-rw-r--r--src/bin/image_blend_nearest_same_scaled.c8
-rw-r--r--src/bin/image_blend_nearest_scaled.c8
-rw-r--r--src/bin/image_blend_nearest_solid_same_scaled.c8
-rw-r--r--src/bin/image_blend_nearest_solid_scaled.c8
-rw-r--r--src/bin/image_blend_occlude1.c10
-rw-r--r--src/bin/image_blend_occlude1_few.c10
-rw-r--r--src/bin/image_blend_occlude1_many.c10
-rw-r--r--src/bin/image_blend_occlude1_very_many.c10
-rw-r--r--src/bin/image_blend_occlude2.c10
-rw-r--r--src/bin/image_blend_occlude2_few.c10
-rw-r--r--src/bin/image_blend_occlude2_many.c10
-rw-r--r--src/bin/image_blend_occlude2_very_many.c10
-rw-r--r--src/bin/image_blend_occlude3.c10
-rw-r--r--src/bin/image_blend_occlude3_few.c10
-rw-r--r--src/bin/image_blend_occlude3_many.c10
-rw-r--r--src/bin/image_blend_occlude3_very_many.c10
-rw-r--r--src/bin/image_blend_smooth_same_scaled.c8
-rw-r--r--src/bin/image_blend_smooth_scaled.c8
-rw-r--r--src/bin/image_blend_smooth_solid_same_scaled.c8
-rw-r--r--src/bin/image_blend_smooth_solid_scaled.c8
-rw-r--r--src/bin/image_blend_solid_border.c8
-rw-r--r--src/bin/image_blend_solid_fade_pow2_unscaled.c10
-rw-r--r--src/bin/image_blend_solid_fade_unscaled.c10
-rw-r--r--src/bin/image_blend_solid_middle_border.c8
-rw-r--r--src/bin/image_blend_solid_middle_unscaled.c8
-rw-r--r--src/bin/image_blend_solid_unscaled.c8
-rw-r--r--src/bin/image_blend_unscaled.c8
-rw-r--r--src/bin/image_crossfade.c14
-rw-r--r--src/bin/image_data_argb.c14
-rw-r--r--src/bin/image_data_argb_alpha.c14
-rw-r--r--src/bin/image_data_ycbcr601pl.c14
-rw-r--r--src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c8
-rw-r--r--src/bin/image_data_ycbcr601pl_map_solid_rotate.c8
-rw-r--r--src/bin/image_data_ycbcr601pl_wide_stride.c16
-rw-r--r--src/bin/image_map_3d_1.c14
-rw-r--r--src/bin/image_map_3d_2.c14
-rw-r--r--src/bin/image_map_3d_3.c10
-rw-r--r--src/bin/image_map_3d_4.c10
-rw-r--r--src/bin/image_map_3d_5.c14
-rw-r--r--src/bin/image_map_3d_6.c14
-rw-r--r--src/bin/image_map_3d_flow.c20
-rw-r--r--src/bin/image_map_color_alpha_nearest_rotate.c6
-rw-r--r--src/bin/image_map_color_alpha_nearest_solid_rotate.c6
-rw-r--r--src/bin/image_map_color_alpha_rotate.c6
-rw-r--r--src/bin/image_map_color_alpha_solid_rotate.c6
-rw-r--r--src/bin/image_map_color_nearest_rotate.c6
-rw-r--r--src/bin/image_map_color_nearest_solid_rotate.c6
-rw-r--r--src/bin/image_map_color_rotate.c6
-rw-r--r--src/bin/image_map_color_solid_rotate.c6
-rw-r--r--src/bin/image_map_nearest_rotate.c6
-rw-r--r--src/bin/image_map_nearest_solid_rotate.c6
-rw-r--r--src/bin/image_map_rotate.c6
-rw-r--r--src/bin/image_map_solid_rotate.c6
-rw-r--r--src/bin/image_mask.c16
-rw-r--r--src/bin/image_mask_10.c14
-rw-r--r--src/bin/image_mask_11.c16
-rw-r--r--src/bin/image_mask_12.c20
-rw-r--r--src/bin/image_mask_13.c20
-rw-r--r--src/bin/image_mask_2.c16
-rw-r--r--src/bin/image_mask_3.c16
-rw-r--r--src/bin/image_mask_4.c16
-rw-r--r--src/bin/image_mask_5.c16
-rw-r--r--src/bin/image_mask_6.c16
-rw-r--r--src/bin/image_mask_7.c22
-rw-r--r--src/bin/image_mask_8.c16
-rw-r--r--src/bin/image_mask_9.c16
-rw-r--r--src/bin/image_quality_scale.c12
-rw-r--r--src/bin/line_blend.c4
-rw-r--r--src/bin/poly_blend.c8
-rw-r--r--src/bin/proxy_image.c14
-rw-r--r--src/bin/proxy_image_offscreen.c14
-rw-r--r--src/bin/proxy_text_fixed.c16
-rw-r--r--src/bin/proxy_text_random.c24
-rw-r--r--src/bin/rect_blend.c8
-rw-r--r--src/bin/rect_blend_few.c8
-rw-r--r--src/bin/rect_blend_pow2.c8
-rw-r--r--src/bin/rect_blend_pow2_few.c8
-rw-r--r--src/bin/rect_solid.c8
-rw-r--r--src/bin/rect_solid_few.c8
-rw-r--r--src/bin/text_basic.c8
-rw-r--r--src/bin/text_change.c8
-rw-r--r--src/bin/text_styles.c8
-rw-r--r--src/bin/text_styles_different_strings.c8
-rw-r--r--src/bin/textblock_auto_align.c6
-rw-r--r--src/bin/textblock_basic.c6
-rw-r--r--src/bin/textblock_intl.c6
-rw-r--r--src/bin/textblock_text_append.c6
-rw-r--r--src/bin/ui.c148
-rw-r--r--src/bin/widgets_file_icons.c16
-rw-r--r--src/bin/widgets_file_icons_2.c16
-rw-r--r--src/bin/widgets_file_icons_2_grouped.c20
-rw-r--r--src/bin/widgets_file_icons_2_same.c16
-rw-r--r--src/bin/widgets_file_icons_2_same_grouped.c18
-rw-r--r--src/bin/widgets_file_icons_3.c16
-rw-r--r--src/bin/widgets_file_icons_4.c16
-rw-r--r--src/bin/widgets_list_1.c14
-rw-r--r--src/bin/widgets_list_1_grouped.c18
-rw-r--r--src/bin/widgets_list_2.c14
-rw-r--r--src/bin/widgets_list_2_grouped.c18
-rw-r--r--src/bin/widgets_list_3.c20
-rw-r--r--src/bin/widgets_list_3_grouped.c28
-rw-r--r--src/bin/widgets_list_4.c20
-rw-r--r--src/bin/widgets_list_4_grouped.c28
109 files changed, 698 insertions, 698 deletions
diff --git a/src/bin/about.c b/src/bin/about.c
index 10f6949..19eb272 100644
--- a/src/bin/about.c
+++ b/src/bin/about.c
@@ -9,9 +9,9 @@ _setup(void)
9 Evas_Textblock_Style *st; 9 Evas_Textblock_Style *st;
10 10
11 o = eo_add(EVAS_TEXTBLOCK_CLASS, evas); 11 o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
12 eo_do(o, evas_obj_position_set(10, 40), 12 eo_do(o, efl_gfx_position_set(10, 40),
13 evas_obj_size_set(win_w - 20, win_h - 50), 13 efl_gfx_size_set(win_w - 20, win_h - 50),
14 evas_obj_visibility_set(EINA_TRUE)); 14 efl_gfx_visible_set(EINA_TRUE));
15 st = evas_textblock_style_new(); 15 st = evas_textblock_style_new();
16 evas_textblock_style_set 16 evas_textblock_style_set
17 (st, 17 (st,
diff --git a/src/bin/image_blend_border.c b/src/bin/image_blend_border.c
index 4cc7de8..27534a1 100644
--- a/src/bin/image_blend_border.c
+++ b/src/bin/image_blend_border.c
@@ -28,7 +28,7 @@ static void _setup(void)
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("bar.png"), NULL), 29 efl_file_set(build_path("bar.png"), NULL),
30 evas_obj_image_border_set(6, 6, 6, 6), 30 evas_obj_image_border_set(6, 6, 6, 6),
31 evas_obj_visibility_set(EINA_TRUE)); 31 efl_gfx_visible_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
34} 34}
@@ -56,9 +56,9 @@ static void _loop(double t, int f)
56 y = (win_h / 2) - (h / 2); 56 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 eo_do(o_images[i], 58 eo_do(o_images[i],
59 evas_obj_position_set(x, y), 59 efl_gfx_position_set(x, y),
60 evas_obj_size_set(w, h), 60 efl_gfx_size_set(w, h),
61 evas_obj_image_fill_set(0, 0, w, h)); 61 efl_gfx_fill_set(0, 0, w, h));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/image_blend_border_recolor.c b/src/bin/image_blend_border_recolor.c
index f8a7863..54336cb 100644
--- a/src/bin/image_blend_border_recolor.c
+++ b/src/bin/image_blend_border_recolor.c
@@ -27,9 +27,9 @@ static void _setup(void)
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("pan.png"), NULL), 29 efl_file_set(build_path("pan.png"), NULL),
30 evas_obj_color_set(64, 64, 64, 255), 30 efl_gfx_color_set(64, 64, 64, 255),
31 evas_obj_image_border_set(3, 3, 3, 3), 31 evas_obj_image_border_set(3, 3, 3, 3),
32 evas_obj_visibility_set(EINA_TRUE)); 32 efl_gfx_visible_set(EINA_TRUE));
33 } 33 }
34 done = 0; 34 done = 0;
35} 35}
@@ -57,9 +57,9 @@ static void _loop(double t, int f)
57 y = (win_h / 2) - (h / 2); 57 y = (win_h / 2) - (h / 2);
58 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 58 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
59 eo_do(o_images[i], 59 eo_do(o_images[i],
60 evas_obj_position_set(x, y), 60 efl_gfx_position_set(x, y),
61 evas_obj_size_set(w, h), 61 efl_gfx_size_set(w, h),
62 evas_obj_image_fill_set(0, 0, w, h)); 62 efl_gfx_fill_set(0, 0, w, h));
63 } 63 }
64 FPS_STD(NAME); 64 FPS_STD(NAME);
65} 65}
diff --git a/src/bin/image_blend_fade_pow2_unscaled.c b/src/bin/image_blend_fade_pow2_unscaled.c
index ddfae29..2a5fe82 100644
--- a/src/bin/image_blend_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_fade_pow2_unscaled.c
@@ -29,13 +29,13 @@ static void _setup(void)
29 o_images[i] = o; 29 o_images[i] = o;
30 eo_do(o, 30 eo_do(o,
31 efl_file_set(build_path("logo.png"), NULL), 31 efl_file_set(build_path("logo.png"), NULL),
32 evas_obj_image_fill_set(0, 0, 120, 160), 32 efl_gfx_fill_set(0, 0, 120, 160),
33 evas_obj_size_set(120, 160)); 33 efl_gfx_size_set(120, 160));
34 a = 256 - (1 << ((rnd() % 8) + 1)); 34 a = 256 - (1 << ((rnd() % 8) + 1));
35 if (a < 128) a = 128; 35 if (a < 128) a = 128;
36 eo_do(o, 36 eo_do(o,
37 evas_obj_color_set(a, a, a, a), 37 efl_gfx_color_set(a, a, a, a),
38 evas_obj_visibility_set(EINA_TRUE)); 38 efl_gfx_visible_set(EINA_TRUE));
39 } 39 }
40 done = 0; 40 done = 0;
41} 41}
@@ -60,7 +60,7 @@ static void _loop(double t, int f)
60 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 60 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
61 y = (win_h / 2) - (h / 2); 61 y = (win_h / 2) - (h / 2);
62 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 62 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
63 eo_do(o_images[i], evas_obj_position_set(x, y)); 63 eo_do(o_images[i], efl_gfx_position_set(x, y));
64 } 64 }
65 FPS_STD(NAME); 65 FPS_STD(NAME);
66} 66}
diff --git a/src/bin/image_blend_fade_unscaled.c b/src/bin/image_blend_fade_unscaled.c
index a6a476a..a96cdb8 100644
--- a/src/bin/image_blend_fade_unscaled.c
+++ b/src/bin/image_blend_fade_unscaled.c
@@ -29,10 +29,10 @@ static void _setup(void)
29 a = rnd()&0xff; 29 a = rnd()&0xff;
30 eo_do(o, 30 eo_do(o,
31 efl_file_set(build_path("logo.png"), NULL), 31 efl_file_set(build_path("logo.png"), NULL),
32 evas_obj_image_fill_set(0, 0, 120, 160), 32 efl_gfx_fill_set(0, 0, 120, 160),
33 evas_obj_size_set(120, 160), 33 efl_gfx_size_set(120, 160),
34 evas_obj_color_set(a, a, a, a), 34 efl_gfx_color_set(a, a, a, a),
35 evas_obj_visibility_set(EINA_TRUE)); 35 efl_gfx_visible_set(EINA_TRUE));
36 } 36 }
37 done = 0; 37 done = 0;
38} 38}
@@ -57,7 +57,7 @@ static void _loop(double t, int f)
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 y = (win_h / 2) - (h / 2); 58 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 eo_do(o_images[i], evas_obj_position_set(x, y)); 60 eo_do(o_images[i], efl_gfx_position_set(x, y));
61 } 61 }
62 FPS_STD(NAME); 62 FPS_STD(NAME);
63} 63}
diff --git a/src/bin/image_blend_many_smooth_same_scaled.c b/src/bin/image_blend_many_smooth_same_scaled.c
index 571c388..3e1a6e4 100644
--- a/src/bin/image_blend_many_smooth_same_scaled.c
+++ b/src/bin/image_blend_many_smooth_same_scaled.c
@@ -33,9 +33,9 @@ static void _setup(void)
33 eo_do(o, 33 eo_do(o,
34 efl_file_set(build_path("logo.png"), NULL), 34 efl_file_set(build_path("logo.png"), NULL),
35 efl_image_smooth_scale_set(1), 35 efl_image_smooth_scale_set(1),
36 evas_obj_size_set(w, h), 36 efl_gfx_size_set(w, h),
37 evas_obj_image_fill_set(0, 0, w, h), 37 efl_gfx_fill_set(0, 0, w, h),
38 evas_obj_visibility_set(EINA_TRUE)); 38 efl_gfx_visible_set(EINA_TRUE));
39 } 39 }
40 done = 0; 40 done = 0;
41} 41}
@@ -54,12 +54,12 @@ static void _loop(double t, int f)
54 Evas_Coord x, y, w, h; 54 Evas_Coord x, y, w, h;
55 for (i = 0; i < MANYNUM; i++) 55 for (i = 0; i < MANYNUM; i++)
56 { 56 {
57 eo_do(o_images[i], evas_obj_size_get(&w, &h)); 57 eo_do(o_images[i], efl_gfx_size_get(&w, &h));
58 x = (win_w / 2) - (w / 2); 58 x = (win_w / 2) - (w / 2);
59 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 2); 59 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 2);
60 y = (win_h / 2) - (h / 2); 60 y = (win_h / 2) - (h / 2);
61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 2); 61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 2);
62 eo_do(o_images[i], evas_obj_position_set(x, y)); 62 eo_do(o_images[i], efl_gfx_position_set(x, y));
63 } 63 }
64 FPS_STD(NAME); 64 FPS_STD(NAME);
65} 65}
diff --git a/src/bin/image_blend_nearest_same_scaled.c b/src/bin/image_blend_nearest_same_scaled.c
index c70f20b..4db67f2 100644
--- a/src/bin/image_blend_nearest_same_scaled.c
+++ b/src/bin/image_blend_nearest_same_scaled.c
@@ -28,7 +28,7 @@ static void _setup(void)
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("logo.png"), NULL), 29 efl_file_set(build_path("logo.png"), NULL),
30 efl_image_smooth_scale_set(0), 30 efl_image_smooth_scale_set(0),
31 evas_obj_visibility_set(EINA_TRUE)); 31 efl_gfx_visible_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
34} 34}
@@ -56,9 +56,9 @@ static void _loop(double t, int f)
56 y = (win_h / 2) - (h / 2); 56 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 eo_do(o_images[i], 58 eo_do(o_images[i],
59 evas_obj_position_set(x, y), 59 efl_gfx_position_set(x, y),
60 evas_obj_size_set(w, h), 60 efl_gfx_size_set(w, h),
61 evas_obj_image_fill_set(0, 0, w, h)); 61 efl_gfx_fill_set(0, 0, w, h));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/image_blend_nearest_scaled.c b/src/bin/image_blend_nearest_scaled.c
index 95ce610..cf78b4a 100644
--- a/src/bin/image_blend_nearest_scaled.c
+++ b/src/bin/image_blend_nearest_scaled.c
@@ -28,7 +28,7 @@ static void _setup(void)
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("logo.png"), NULL), 29 efl_file_set(build_path("logo.png"), NULL),
30 efl_image_smooth_scale_set(0), 30 efl_image_smooth_scale_set(0),
31 evas_obj_visibility_set(EINA_TRUE)); 31 efl_gfx_visible_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
34} 34}
@@ -56,9 +56,9 @@ static void _loop(double t, int f)
56 y = (win_h / 2) - (h / 2); 56 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 eo_do(o_images[i], 58 eo_do(o_images[i],
59 evas_obj_position_set(x, y), 59 efl_gfx_position_set(x, y),
60 evas_obj_size_set(w, h), 60 efl_gfx_size_set(w, h),
61 evas_obj_image_fill_set(0, 0, w, h)); 61 efl_gfx_fill_set(0, 0, w, h));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/image_blend_nearest_solid_same_scaled.c b/src/bin/image_blend_nearest_solid_same_scaled.c
index b979feb..afbc2aa 100644
--- a/src/bin/image_blend_nearest_solid_same_scaled.c
+++ b/src/bin/image_blend_nearest_solid_same_scaled.c
@@ -28,7 +28,7 @@ static void _setup(void)
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("image.png"), NULL), 29 efl_file_set(build_path("image.png"), NULL),
30 efl_image_smooth_scale_set(0), 30 efl_image_smooth_scale_set(0),
31 evas_obj_visibility_set(EINA_TRUE)); 31 efl_gfx_visible_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
34} 34}
@@ -56,9 +56,9 @@ static void _loop(double t, int f)
56 y = (win_h / 2) - (h / 2); 56 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 eo_do(o_images[i], 58 eo_do(o_images[i],
59 evas_obj_position_set(x, y), 59 efl_gfx_position_set(x, y),
60 evas_obj_size_set(w, h), 60 efl_gfx_size_set(w, h),
61 evas_obj_image_fill_set(0, 0, w, h)); 61 efl_gfx_fill_set(0, 0, w, h));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/image_blend_nearest_solid_scaled.c b/src/bin/image_blend_nearest_solid_scaled.c
index 41c8f35..87912a2 100644
--- a/src/bin/image_blend_nearest_solid_scaled.c
+++ b/src/bin/image_blend_nearest_solid_scaled.c
@@ -28,7 +28,7 @@ static void _setup(void)
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("image.png"), NULL), 29 efl_file_set(build_path("image.png"), NULL),
30 efl_image_smooth_scale_set(0), 30 efl_image_smooth_scale_set(0),
31 evas_obj_visibility_set(EINA_TRUE)); 31 efl_gfx_visible_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
34} 34}
@@ -56,9 +56,9 @@ static void _loop(double t, int f)
56 y = (win_h / 2) - (h / 2); 56 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 eo_do(o_images[i], 58 eo_do(o_images[i],
59 evas_obj_position_set(x, y), 59 efl_gfx_position_set(x, y),
60 evas_obj_size_set(w, h), 60 efl_gfx_size_set(w, h),
61 evas_obj_image_fill_set(0, 0, w, h)); 61 efl_gfx_fill_set(0, 0, w, h));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/image_blend_occlude1.c b/src/bin/image_blend_occlude1.c
index 3510450..a1b4032 100644
--- a/src/bin/image_blend_occlude1.c
+++ b/src/bin/image_blend_occlude1.c
@@ -38,12 +38,12 @@ static void _setup(void)
38 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 38 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
39 eo_do(o, 39 eo_do(o,
40 efl_file_set(build_path("image.png"), NULL), 40 efl_file_set(build_path("image.png"), NULL),
41 evas_obj_position_set(x, y)); 41 efl_gfx_position_set(x, y));
42 } 42 }
43 eo_do(o, 43 eo_do(o,
44 evas_obj_image_fill_set(0, 0, 120, 160), 44 efl_gfx_fill_set(0, 0, 120, 160),
45 evas_obj_size_set(120, 160), 45 efl_gfx_size_set(120, 160),
46 evas_obj_visibility_set(EINA_TRUE)); 46 efl_gfx_visible_set(EINA_TRUE));
47 } 47 }
48 done = 0; 48 done = 0;
49} 49}
@@ -70,7 +70,7 @@ static void _loop(double t, int f)
70 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 70 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
71 y = (win_h / 2) - (h / 2); 71 y = (win_h / 2) - (h / 2);
72 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 72 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
73 eo_do(o_images[i], evas_obj_position_set(x, y)); 73 eo_do(o_images[i], efl_gfx_position_set(x, y));
74 } 74 }
75 } 75 }
76 FPS_STD(NAME); 76 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude1_few.c b/src/bin/image_blend_occlude1_few.c
index a454eff..97aad3b 100644
--- a/src/bin/image_blend_occlude1_few.c
+++ b/src/bin/image_blend_occlude1_few.c
@@ -41,12 +41,12 @@ static void _setup(void)
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 eo_do(o, 42 eo_do(o,
43 efl_file_set(PACKAGE_DATA_DIR"/data/image.png", NULL), 43 efl_file_set(PACKAGE_DATA_DIR"/data/image.png", NULL),
44 evas_obj_position_set(x, y)); 44 efl_gfx_position_set(x, y));
45 } 45 }
46 eo_do(o, 46 eo_do(o,
47 evas_obj_image_fill_set(0, 0, 120, 160), 47 efl_gfx_fill_set(0, 0, 120, 160),
48 evas_obj_size_set(120, 160), 48 efl_gfx_size_set(120, 160),
49 evas_obj_visibility_set(EINA_TRUE)); 49 efl_gfx_visible_set(EINA_TRUE));
50 } 50 }
51 done = 0; 51 done = 0;
52} 52}
@@ -73,7 +73,7 @@ static void _loop(double t, int f)
73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
74 y = (win_h / 2) - (h / 2); 74 y = (win_h / 2) - (h / 2);
75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
76 eo_do(o_images[i], evas_obj_position_set(x, y)); 76 eo_do(o_images[i], efl_gfx_position_set(x, y));
77 } 77 }
78 } 78 }
79 FPS_STD(NAME); 79 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude1_many.c b/src/bin/image_blend_occlude1_many.c
index 9beef4e..a876067 100644
--- a/src/bin/image_blend_occlude1_many.c
+++ b/src/bin/image_blend_occlude1_many.c
@@ -41,12 +41,12 @@ static void _setup(void)
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 eo_do(o, 42 eo_do(o,
43 efl_file_set(build_path("image.png"), NULL), 43 efl_file_set(build_path("image.png"), NULL),
44 evas_obj_position_set(x, y)); 44 efl_gfx_position_set(x, y));
45 } 45 }
46 eo_do(o, 46 eo_do(o,
47 evas_obj_image_fill_set(0, 0, 120, 160), 47 efl_gfx_fill_set(0, 0, 120, 160),
48 evas_obj_size_set(120, 160), 48 efl_gfx_size_set(120, 160),
49 evas_obj_visibility_set(EINA_TRUE)); 49 efl_gfx_visible_set(EINA_TRUE));
50 } 50 }
51 done = 0; 51 done = 0;
52} 52}
@@ -73,7 +73,7 @@ static void _loop(double t, int f)
73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
74 y = (win_h / 2) - (h / 2); 74 y = (win_h / 2) - (h / 2);
75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
76 eo_do(o_images[i], evas_obj_position_set(x, y)); 76 eo_do(o_images[i], efl_gfx_position_set(x, y));
77 } 77 }
78 } 78 }
79 FPS_STD(NAME); 79 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude1_very_many.c b/src/bin/image_blend_occlude1_very_many.c
index b918d54..3a97476 100644
--- a/src/bin/image_blend_occlude1_very_many.c
+++ b/src/bin/image_blend_occlude1_very_many.c
@@ -41,12 +41,12 @@ static void _setup(void)
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 eo_do(o, 42 eo_do(o,
43 efl_file_set(build_path("image.png"), NULL), 43 efl_file_set(build_path("image.png"), NULL),
44 evas_obj_position_set(x, y)); 44 efl_gfx_position_set(x, y));
45 } 45 }
46 eo_do(o, 46 eo_do(o,
47 evas_obj_image_fill_set(0, 0, 120, 160), 47 efl_gfx_fill_set(0, 0, 120, 160),
48 evas_obj_size_set(120, 160), 48 efl_gfx_size_set(120, 160),
49 evas_obj_visibility_set(EINA_TRUE)); 49 efl_gfx_visible_set(EINA_TRUE));
50 } 50 }
51 done = 0; 51 done = 0;
52} 52}
@@ -73,7 +73,7 @@ static void _loop(double t, int f)
73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
74 y = (win_h / 2) - (h / 2); 74 y = (win_h / 2) - (h / 2);
75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
76 eo_do(o_images[i], evas_obj_position_set(x, y)); 76 eo_do(o_images[i], efl_gfx_position_set(x, y));
77 } 77 }
78 } 78 }
79 FPS_STD(NAME); 79 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude2.c b/src/bin/image_blend_occlude2.c
index 5f0f425..70fc10e 100644
--- a/src/bin/image_blend_occlude2.c
+++ b/src/bin/image_blend_occlude2.c
@@ -38,12 +38,12 @@ static void _setup(void)
38 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 38 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
39 eo_do(o, 39 eo_do(o,
40 efl_file_set(build_path("image.png"), NULL), 40 efl_file_set(build_path("image.png"), NULL),
41 evas_obj_position_set(x, y)); 41 efl_gfx_position_set(x, y));
42 } 42 }
43 eo_do(o, 43 eo_do(o,
44 evas_obj_image_fill_set(0, 0, 120, 160), 44 efl_gfx_fill_set(0, 0, 120, 160),
45 evas_obj_size_set(120, 160), 45 efl_gfx_size_set(120, 160),
46 evas_obj_visibility_set(EINA_TRUE)); 46 efl_gfx_visible_set(EINA_TRUE));
47 } 47 }
48 done = 0; 48 done = 0;
49} 49}
@@ -70,7 +70,7 @@ static void _loop(double t, int f)
70 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 70 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
71 y = (win_h / 2) - (h / 2); 71 y = (win_h / 2) - (h / 2);
72 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 72 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
73 eo_do(o_images[i], evas_obj_position_set(x, y)); 73 eo_do(o_images[i], efl_gfx_position_set(x, y));
74 } 74 }
75 } 75 }
76 FPS_STD(NAME); 76 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude2_few.c b/src/bin/image_blend_occlude2_few.c
index 1699edd..1de6e1e 100644
--- a/src/bin/image_blend_occlude2_few.c
+++ b/src/bin/image_blend_occlude2_few.c
@@ -41,12 +41,12 @@ static void _setup(void)
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 eo_do(o, 42 eo_do(o,
43 efl_file_set(build_path("image.png"), NULL), 43 efl_file_set(build_path("image.png"), NULL),
44 evas_obj_position_set(x, y)); 44 efl_gfx_position_set(x, y));
45 } 45 }
46 eo_do(o, 46 eo_do(o,
47 evas_obj_image_fill_set(0, 0, 120, 160), 47 efl_gfx_fill_set(0, 0, 120, 160),
48 evas_obj_size_set(120, 160), 48 efl_gfx_size_set(120, 160),
49 evas_obj_visibility_set(EINA_TRUE)); 49 efl_gfx_visible_set(EINA_TRUE));
50 } 50 }
51 done = 0; 51 done = 0;
52} 52}
@@ -73,7 +73,7 @@ static void _loop(double t, int f)
73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
74 y = (win_h / 2) - (h / 2); 74 y = (win_h / 2) - (h / 2);
75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
76 eo_do(o_images[i], evas_obj_position_set(x, y)); 76 eo_do(o_images[i], efl_gfx_position_set(x, y));
77 } 77 }
78 } 78 }
79 FPS_STD(NAME); 79 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude2_many.c b/src/bin/image_blend_occlude2_many.c
index 264ebe7..cf9bea0 100644
--- a/src/bin/image_blend_occlude2_many.c
+++ b/src/bin/image_blend_occlude2_many.c
@@ -41,12 +41,12 @@ static void _setup(void)
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 eo_do(o, 42 eo_do(o,
43 efl_file_set(build_path("image.png"), NULL), 43 efl_file_set(build_path("image.png"), NULL),
44 evas_obj_position_set(x, y)); 44 efl_gfx_position_set(x, y));
45 } 45 }
46 eo_do(o, 46 eo_do(o,
47 evas_obj_image_fill_set(0, 0, 120, 160), 47 efl_gfx_fill_set(0, 0, 120, 160),
48 evas_obj_size_set(120, 160), 48 efl_gfx_size_set(120, 160),
49 evas_obj_visibility_set(EINA_TRUE)); 49 efl_gfx_visible_set(EINA_TRUE));
50 } 50 }
51 done = 0; 51 done = 0;
52} 52}
@@ -73,7 +73,7 @@ static void _loop(double t, int f)
73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
74 y = (win_h / 2) - (h / 2); 74 y = (win_h / 2) - (h / 2);
75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
76 eo_do(o_images[i], evas_obj_position_set(x, y)); 76 eo_do(o_images[i], efl_gfx_position_set(x, y));
77 } 77 }
78 } 78 }
79 FPS_STD(NAME); 79 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude2_very_many.c b/src/bin/image_blend_occlude2_very_many.c
index 7306698..e3ec9eb 100644
--- a/src/bin/image_blend_occlude2_very_many.c
+++ b/src/bin/image_blend_occlude2_very_many.c
@@ -41,12 +41,12 @@ static void _setup(void)
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 eo_do(o, 42 eo_do(o,
43 efl_file_set(build_path("image.png"), NULL), 43 efl_file_set(build_path("image.png"), NULL),
44 evas_obj_position_set(x, y)); 44 efl_gfx_position_set(x, y));
45 } 45 }
46 eo_do(o, 46 eo_do(o,
47 evas_obj_image_fill_set(0, 0, 120, 160), 47 efl_gfx_fill_set(0, 0, 120, 160),
48 evas_obj_size_set(120, 160), 48 efl_gfx_size_set(120, 160),
49 evas_obj_visibility_set(EINA_TRUE)); 49 efl_gfx_visible_set(EINA_TRUE));
50 } 50 }
51 done = 0; 51 done = 0;
52} 52}
@@ -73,7 +73,7 @@ static void _loop(double t, int f)
73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
74 y = (win_h / 2) - (h / 2); 74 y = (win_h / 2) - (h / 2);
75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
76 eo_do(o_images[i], evas_obj_position_set(x, y)); 76 eo_do(o_images[i], efl_gfx_position_set(x, y));
77 } 77 }
78 } 78 }
79 FPS_STD(NAME); 79 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude3.c b/src/bin/image_blend_occlude3.c
index f083a7b..0e80e66 100644
--- a/src/bin/image_blend_occlude3.c
+++ b/src/bin/image_blend_occlude3.c
@@ -38,12 +38,12 @@ static void _setup(void)
38 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 38 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
39 eo_do(o, 39 eo_do(o,
40 efl_file_set(build_path("image.png"), NULL), 40 efl_file_set(build_path("image.png"), NULL),
41 evas_obj_position_set(x, y)); 41 efl_gfx_position_set(x, y));
42 } 42 }
43 eo_do(o, 43 eo_do(o,
44 evas_obj_image_fill_set(0, 0, 120, 160), 44 efl_gfx_fill_set(0, 0, 120, 160),
45 evas_obj_size_set(120, 160), 45 efl_gfx_size_set(120, 160),
46 evas_obj_visibility_set(EINA_TRUE)); 46 efl_gfx_visible_set(EINA_TRUE));
47 } 47 }
48 done = 0; 48 done = 0;
49} 49}
@@ -70,7 +70,7 @@ static void _loop(double t, int f)
70 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 70 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
71 y = (win_h / 2) - (h / 2); 71 y = (win_h / 2) - (h / 2);
72 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 72 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
73 eo_do(o_images[i], evas_obj_position_set(x, y)); 73 eo_do(o_images[i], efl_gfx_position_set(x, y));
74 } 74 }
75 } 75 }
76 FPS_STD(NAME); 76 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude3_few.c b/src/bin/image_blend_occlude3_few.c
index 076fd0b..ff4aab0 100644
--- a/src/bin/image_blend_occlude3_few.c
+++ b/src/bin/image_blend_occlude3_few.c
@@ -41,12 +41,12 @@ static void _setup(void)
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 eo_do(o, 42 eo_do(o,
43 efl_file_set(build_path("image.png"), NULL), 43 efl_file_set(build_path("image.png"), NULL),
44 evas_obj_position_set(x, y)); 44 efl_gfx_position_set(x, y));
45 } 45 }
46 eo_do(o, 46 eo_do(o,
47 evas_obj_image_fill_set(0, 0, 120, 160), 47 efl_gfx_fill_set(0, 0, 120, 160),
48 evas_obj_size_set(120, 160), 48 efl_gfx_size_set(120, 160),
49 evas_obj_visibility_set(EINA_TRUE)); 49 efl_gfx_visible_set(EINA_TRUE));
50 } 50 }
51 done = 0; 51 done = 0;
52} 52}
@@ -73,7 +73,7 @@ static void _loop(double t, int f)
73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
74 y = (win_h / 2) - (h / 2); 74 y = (win_h / 2) - (h / 2);
75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
76 eo_do(o_images[i], evas_obj_position_set(x, y)); 76 eo_do(o_images[i], efl_gfx_position_set(x, y));
77 } 77 }
78 } 78 }
79 FPS_STD(NAME); 79 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude3_many.c b/src/bin/image_blend_occlude3_many.c
index 1e34dbc..a126ee7 100644
--- a/src/bin/image_blend_occlude3_many.c
+++ b/src/bin/image_blend_occlude3_many.c
@@ -41,12 +41,12 @@ static void _setup(void)
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 eo_do(o, 42 eo_do(o,
43 efl_file_set(build_path("image.png"), NULL), 43 efl_file_set(build_path("image.png"), NULL),
44 evas_obj_position_set(x, y)); 44 efl_gfx_position_set(x, y));
45 } 45 }
46 eo_do(o, 46 eo_do(o,
47 evas_obj_image_fill_set(0, 0, 120, 160), 47 efl_gfx_fill_set(0, 0, 120, 160),
48 evas_obj_size_set(120, 160), 48 efl_gfx_size_set(120, 160),
49 evas_obj_visibility_set(EINA_TRUE)); 49 efl_gfx_visible_set(EINA_TRUE));
50 } 50 }
51 done = 0; 51 done = 0;
52} 52}
@@ -73,7 +73,7 @@ static void _loop(double t, int f)
73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
74 y = (win_h / 2) - (h / 2); 74 y = (win_h / 2) - (h / 2);
75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
76 eo_do(o_images[i], evas_obj_position_set(x, y)); 76 eo_do(o_images[i], efl_gfx_position_set(x, y));
77 } 77 }
78 } 78 }
79 FPS_STD(NAME); 79 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude3_very_many.c b/src/bin/image_blend_occlude3_very_many.c
index 4cce7f8..de06622 100644
--- a/src/bin/image_blend_occlude3_very_many.c
+++ b/src/bin/image_blend_occlude3_very_many.c
@@ -41,12 +41,12 @@ static void _setup(void)
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 eo_do(o, 42 eo_do(o,
43 efl_file_set(build_path("image.png"), NULL), 43 efl_file_set(build_path("image.png"), NULL),
44 evas_obj_position_set(x, y)); 44 efl_gfx_position_set(x, y));
45 } 45 }
46 eo_do(o, 46 eo_do(o,
47 evas_obj_image_fill_set(0, 0, 120, 160), 47 efl_gfx_fill_set(0, 0, 120, 160),
48 evas_obj_size_set(120, 160), 48 efl_gfx_size_set(120, 160),
49 evas_obj_visibility_set(EINA_TRUE)); 49 efl_gfx_visible_set(EINA_TRUE));
50 } 50 }
51 done = 0; 51 done = 0;
52} 52}
@@ -73,7 +73,7 @@ static void _loop(double t, int f)
73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
74 y = (win_h / 2) - (h / 2); 74 y = (win_h / 2) - (h / 2);
75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
76 eo_do(o_images[i], evas_obj_position_set(x, y)); 76 eo_do(o_images[i], efl_gfx_position_set(x, y));
77 } 77 }
78 } 78 }
79 FPS_STD(NAME); 79 FPS_STD(NAME);
diff --git a/src/bin/image_blend_smooth_same_scaled.c b/src/bin/image_blend_smooth_same_scaled.c
index ac28e68..4f3090b 100644
--- a/src/bin/image_blend_smooth_same_scaled.c
+++ b/src/bin/image_blend_smooth_same_scaled.c
@@ -28,7 +28,7 @@ static void _setup(void)
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("logo.png"), NULL), 29 efl_file_set(build_path("logo.png"), NULL),
30 efl_image_smooth_scale_set(1), 30 efl_image_smooth_scale_set(1),
31 evas_obj_visibility_set(EINA_TRUE)); 31 efl_gfx_visible_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
34} 34}
@@ -56,9 +56,9 @@ static void _loop(double t, int f)
56 y = (win_h / 2) - (h / 2); 56 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 eo_do(o_images[i], 58 eo_do(o_images[i],
59 evas_obj_position_set(x, y), 59 efl_gfx_position_set(x, y),
60 evas_obj_size_set(w, h), 60 efl_gfx_size_set(w, h),
61 evas_obj_image_fill_set(0, 0, w, h)); 61 efl_gfx_fill_set(0, 0, w, h));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/image_blend_smooth_scaled.c b/src/bin/image_blend_smooth_scaled.c
index b96b911..b0fafef 100644
--- a/src/bin/image_blend_smooth_scaled.c
+++ b/src/bin/image_blend_smooth_scaled.c
@@ -28,7 +28,7 @@ static void _setup(void)
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("logo.png"), NULL), 29 efl_file_set(build_path("logo.png"), NULL),
30 efl_image_smooth_scale_set(1), 30 efl_image_smooth_scale_set(1),
31 evas_obj_visibility_set(EINA_TRUE)); 31 efl_gfx_visible_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
34} 34}
@@ -56,9 +56,9 @@ static void _loop(double t, int f)
56 y = (win_h / 2) - (h / 2); 56 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 eo_do(o_images[i], 58 eo_do(o_images[i],
59 evas_obj_position_set(x, y), 59 efl_gfx_position_set(x, y),
60 evas_obj_size_set(w, h), 60 efl_gfx_size_set(w, h),
61 evas_obj_image_fill_set(0, 0, w, h)); 61 efl_gfx_fill_set(0, 0, w, h));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/image_blend_smooth_solid_same_scaled.c b/src/bin/image_blend_smooth_solid_same_scaled.c
index 783a648..a62e6fd 100644
--- a/src/bin/image_blend_smooth_solid_same_scaled.c
+++ b/src/bin/image_blend_smooth_solid_same_scaled.c
@@ -28,7 +28,7 @@ static void _setup(void)
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("image.png"), NULL), 29 efl_file_set(build_path("image.png"), NULL),
30 efl_image_smooth_scale_set(1), 30 efl_image_smooth_scale_set(1),
31 evas_obj_visibility_set(EINA_TRUE)); 31 efl_gfx_visible_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
34} 34}
@@ -56,9 +56,9 @@ static void _loop(double t, int f)
56 y = (win_h / 2) - (h / 2); 56 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 eo_do(o_images[i], 58 eo_do(o_images[i],
59 evas_obj_position_set(x, y), 59 efl_gfx_position_set(x, y),
60 evas_obj_size_set(w, h), 60 efl_gfx_size_set(w, h),
61 evas_obj_image_fill_set(0, 0, w, h)); 61 efl_gfx_fill_set(0, 0, w, h));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/image_blend_smooth_solid_scaled.c b/src/bin/image_blend_smooth_solid_scaled.c
index 654995f..d9f9418 100644
--- a/src/bin/image_blend_smooth_solid_scaled.c
+++ b/src/bin/image_blend_smooth_solid_scaled.c
@@ -28,7 +28,7 @@ static void _setup(void)
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("image.png"), NULL), 29 efl_file_set(build_path("image.png"), NULL),
30 efl_image_smooth_scale_set(1), 30 efl_image_smooth_scale_set(1),
31 evas_obj_visibility_set(EINA_TRUE)); 31 efl_gfx_visible_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
34} 34}
@@ -56,9 +56,9 @@ static void _loop(double t, int f)
56 y = (win_h / 2) - (h / 2); 56 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 eo_do(o_images[i], 58 eo_do(o_images[i],
59 evas_obj_position_set(x, y), 59 efl_gfx_position_set(x, y),
60 evas_obj_size_set(w, h), 60 efl_gfx_size_set(w, h),
61 evas_obj_image_fill_set(0, 0, w, h)); 61 efl_gfx_fill_set(0, 0, w, h));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/image_blend_solid_border.c b/src/bin/image_blend_solid_border.c
index 69cf05c..eaec1c7 100644
--- a/src/bin/image_blend_solid_border.c
+++ b/src/bin/image_blend_solid_border.c
@@ -28,7 +28,7 @@ static void _setup(void)
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("frame.png"), NULL), 29 efl_file_set(build_path("frame.png"), NULL),
30 evas_obj_image_border_set(8, 8, 8, 8), 30 evas_obj_image_border_set(8, 8, 8, 8),
31 evas_obj_visibility_set(EINA_TRUE)); 31 efl_gfx_visible_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
34} 34}
@@ -56,9 +56,9 @@ static void _loop(double t, int f)
56 y = (win_h / 2) - (h / 2); 56 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
58 eo_do(o_images[i], 58 eo_do(o_images[i],
59 evas_obj_position_set(x, y), 59 efl_gfx_position_set(x, y),
60 evas_obj_size_set(w, h), 60 efl_gfx_size_set(w, h),
61 evas_obj_image_fill_set(0, 0, w, h)); 61 efl_gfx_fill_set(0, 0, w, h));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/image_blend_solid_fade_pow2_unscaled.c b/src/bin/image_blend_solid_fade_pow2_unscaled.c
index 8215814..20a39b9 100644
--- a/src/bin/image_blend_solid_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_solid_fade_pow2_unscaled.c
@@ -29,13 +29,13 @@ static void _setup(void)
29 o_images[i] = o; 29 o_images[i] = o;
30 eo_do(o, 30 eo_do(o,
31 efl_file_set(build_path("image.png"), NULL), 31 efl_file_set(build_path("image.png"), NULL),
32 evas_obj_image_fill_set(0, 0, 120, 160), 32 efl_gfx_fill_set(0, 0, 120, 160),
33 evas_obj_size_set(120, 160)); 33 efl_gfx_size_set(120, 160));
34 a = 256 - (1 << ((rnd() % 8) + 1)); 34 a = 256 - (1 << ((rnd() % 8) + 1));
35 if (a < 128) a = 128; 35 if (a < 128) a = 128;
36 eo_do(o, 36 eo_do(o,
37 evas_obj_color_set(a, a, a, a), 37 efl_gfx_color_set(a, a, a, a),
38 evas_obj_visibility_set(EINA_TRUE)); 38 efl_gfx_visible_set(EINA_TRUE));
39 } 39 }
40 done = 0; 40 done = 0;
41} 41}
@@ -60,7 +60,7 @@ static void _loop(double t, int f)
60 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 60 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
61 y = (win_h / 2) - (h / 2); 61 y = (win_h / 2) - (h / 2);
62 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 62 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
63 eo_do(o_images[i], evas_obj_position_set(x, y)); 63 eo_do(o_images[i], efl_gfx_position_set(x, y));
64 } 64 }
65 FPS_STD(NAME); 65 FPS_STD(NAME);
66} 66}
diff --git a/src/bin/image_blend_solid_fade_unscaled.c b/src/bin/image_blend_solid_fade_unscaled.c
index 1815177..eab9455 100644
--- a/src/bin/image_blend_solid_fade_unscaled.c
+++ b/src/bin/image_blend_solid_fade_unscaled.c
@@ -29,12 +29,12 @@ static void _setup(void)
29 o_images[i] = o; 29 o_images[i] = o;
30 eo_do(o, 30 eo_do(o,
31 efl_file_set(build_path("image.png"), NULL), 31 efl_file_set(build_path("image.png"), NULL),
32 evas_obj_image_fill_set(0, 0, 120, 160), 32 efl_gfx_fill_set(0, 0, 120, 160),
33 evas_obj_size_set(120, 160)); 33 efl_gfx_size_set(120, 160));
34 a = rnd()&0xff; 34 a = rnd()&0xff;
35 eo_do(o, 35 eo_do(o,
36 evas_obj_color_set(a, a, a, a), 36 efl_gfx_color_set(a, a, a, a),
37 evas_obj_visibility_set(EINA_TRUE)); 37 efl_gfx_visible_set(EINA_TRUE));
38 } 38 }
39 done = 0; 39 done = 0;
40} 40}
@@ -59,7 +59,7 @@ static void _loop(double t, int f)
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 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 eo_do(o_images[i], evas_obj_position_set(x, y)); 62 eo_do(o_images[i], efl_gfx_position_set(x, y));
63 } 63 }
64 FPS_STD(NAME); 64 FPS_STD(NAME);
65} 65}
diff --git a/src/bin/image_blend_solid_middle_border.c b/src/bin/image_blend_solid_middle_border.c
index c7fe4da..7c38815 100644
--- a/src/bin/image_blend_solid_middle_border.c
+++ b/src/bin/image_blend_solid_middle_border.c
@@ -29,7 +29,7 @@ static void _setup(void)
29 efl_file_set(build_path("bar.png"), NULL), 29 efl_file_set(build_path("bar.png"), NULL),
30 evas_obj_image_border_set(6, 6, 6, 6), 30 evas_obj_image_border_set(6, 6, 6, 6),
31 evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID), 31 evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID),
32 evas_obj_visibility_set(EINA_TRUE)); 32 efl_gfx_visible_set(EINA_TRUE));
33 } 33 }
34 done = 0; 34 done = 0;
35} 35}
@@ -57,9 +57,9 @@ static void _loop(double t, int f)
57 y = (win_h / 2) - (h / 2); 57 y = (win_h / 2) - (h / 2);
58 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 58 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
59 eo_do(o_images[i], 59 eo_do(o_images[i],
60 evas_obj_position_set(x, y), 60 efl_gfx_position_set(x, y),
61 evas_obj_size_set(w, h), 61 efl_gfx_size_set(w, h),
62 evas_obj_image_fill_set(0, 0, w, h)); 62 efl_gfx_fill_set(0, 0, w, h));
63 } 63 }
64 FPS_STD(NAME); 64 FPS_STD(NAME);
65} 65}
diff --git a/src/bin/image_blend_solid_middle_unscaled.c b/src/bin/image_blend_solid_middle_unscaled.c
index 2e5fa59..631f013 100644
--- a/src/bin/image_blend_solid_middle_unscaled.c
+++ b/src/bin/image_blend_solid_middle_unscaled.c
@@ -27,11 +27,11 @@ static void _setup(void)
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("logo.png"), NULL), 29 efl_file_set(build_path("logo.png"), NULL),
30 evas_obj_image_fill_set(0, 0, 120, 160), 30 efl_gfx_fill_set(0, 0, 120, 160),
31 evas_obj_size_set(120, 160), 31 efl_gfx_size_set(120, 160),
32 evas_obj_image_border_set(43, 48, 48, 83), 32 evas_obj_image_border_set(43, 48, 48, 83),
33 evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID), 33 evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID),
34 evas_obj_visibility_set(EINA_TRUE)); 34 efl_gfx_visible_set(EINA_TRUE));
35 } 35 }
36 done = 0; 36 done = 0;
37} 37}
@@ -56,7 +56,7 @@ static void _loop(double t, int f)
56 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 56 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
57 y = (win_h / 2) - (h / 2); 57 y = (win_h / 2) - (h / 2);
58 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 58 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
59 eo_do(o_images[i], evas_obj_position_set(x, y)); 59 eo_do(o_images[i], efl_gfx_position_set(x, y));
60 } 60 }
61 FPS_STD(NAME); 61 FPS_STD(NAME);
62} 62}
diff --git a/src/bin/image_blend_solid_unscaled.c b/src/bin/image_blend_solid_unscaled.c
index 73f3b00..0efbbb7 100644
--- a/src/bin/image_blend_solid_unscaled.c
+++ b/src/bin/image_blend_solid_unscaled.c
@@ -27,9 +27,9 @@ static void _setup(void)
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("image.png"), NULL), 29 efl_file_set(build_path("image.png"), NULL),
30 evas_obj_image_fill_set(0, 0, 120, 160), 30 efl_gfx_fill_set(0, 0, 120, 160),
31 evas_obj_size_set(120, 160), 31 efl_gfx_size_set(120, 160),
32 evas_obj_visibility_set(EINA_TRUE)); 32 efl_gfx_visible_set(EINA_TRUE));
33 } 33 }
34 done = 0; 34 done = 0;
35} 35}
@@ -54,7 +54,7 @@ static void _loop(double t, int f)
54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
55 y = (win_h / 2) - (h / 2); 55 y = (win_h / 2) - (h / 2);
56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
57 eo_do(o_images[i], evas_obj_position_set(x, y)); 57 eo_do(o_images[i], efl_gfx_position_set(x, y));
58 } 58 }
59 FPS_STD(NAME); 59 FPS_STD(NAME);
60} 60}
diff --git a/src/bin/image_blend_unscaled.c b/src/bin/image_blend_unscaled.c
index f12974e..27c82bd 100644
--- a/src/bin/image_blend_unscaled.c
+++ b/src/bin/image_blend_unscaled.c
@@ -27,9 +27,9 @@ static void _setup(void)
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("logo.png"), NULL), 29 efl_file_set(build_path("logo.png"), NULL),
30 evas_obj_image_fill_set(0, 0, 120, 160), 30 efl_gfx_fill_set(0, 0, 120, 160),
31 evas_obj_size_set(120, 160), 31 efl_gfx_size_set(120, 160),
32 evas_obj_visibility_set(EINA_TRUE)); 32 efl_gfx_visible_set(EINA_TRUE));
33 } 33 }
34 done = 0; 34 done = 0;
35} 35}
@@ -54,7 +54,7 @@ static void _loop(double t, int f)
54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
55 y = (win_h / 2) - (h / 2); 55 y = (win_h / 2) - (h / 2);
56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
57 eo_do(o_images[i], evas_obj_position_set(x, y)); 57 eo_do(o_images[i], efl_gfx_position_set(x, y));
58 } 58 }
59 FPS_STD(NAME); 59 FPS_STD(NAME);
60} 60}
diff --git a/src/bin/image_crossfade.c b/src/bin/image_crossfade.c
index 2159cb1..98a9da3 100644
--- a/src/bin/image_crossfade.c
+++ b/src/bin/image_crossfade.c
@@ -26,17 +26,17 @@ static void _setup(void)
26 o_images[0] = o; 26 o_images[0] = o;
27 eo_do(o, 27 eo_do(o,
28 efl_file_set(build_path("im1.png"), NULL), 28 efl_file_set(build_path("im1.png"), NULL),
29 evas_obj_image_fill_set(0, 0, 720, 420), 29 efl_gfx_fill_set(0, 0, 720, 420),
30 evas_obj_size_set(720, 420), 30 efl_gfx_size_set(720, 420),
31 evas_obj_visibility_set(EINA_TRUE)); 31 efl_gfx_visible_set(EINA_TRUE));
32 32
33 o = eo_add(EVAS_IMAGE_CLASS, evas); 33 o = eo_add(EVAS_IMAGE_CLASS, evas);
34 o_images[1] = o; 34 o_images[1] = o;
35 eo_do(o, 35 eo_do(o,
36 efl_file_set(build_path("im2.png"), NULL), 36 efl_file_set(build_path("im2.png"), NULL),
37 evas_obj_image_fill_set(0, 0, 720, 420), 37 efl_gfx_fill_set(0, 0, 720, 420),
38 evas_obj_size_set(720, 420), 38 efl_gfx_size_set(720, 420),
39 evas_obj_visibility_set(EINA_TRUE)); 39 efl_gfx_visible_set(EINA_TRUE));
40 40
41 done = 0; 41 done = 0;
42} 42}
@@ -55,7 +55,7 @@ static void _loop(double t, int f)
55 55
56 a = f & 0x1f; 56 a = f & 0x1f;
57 a = ((a << 3) | (a >> 2)) & 0xff; 57 a = ((a << 3) | (a >> 2)) & 0xff;
58 eo_do(o_images[1], evas_obj_color_set(a, a, a, a)); 58 eo_do(o_images[1], efl_gfx_color_set(a, a, a, a));
59 FPS_STD(NAME); 59 FPS_STD(NAME);
60} 60}
61 61
diff --git a/src/bin/image_data_argb.c b/src/bin/image_data_argb.c
index d868867..47d74a1 100644
--- a/src/bin/image_data_argb.c
+++ b/src/bin/image_data_argb.c
@@ -29,11 +29,11 @@ static void _setup(void)
29 eo_do(o, 29 eo_do(o,
30 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 30 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
31 evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888), 31 evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888),
32 evas_obj_image_size_set(640, 480), 32 efl_gfx_view_size_set(640, 480),
33 evas_obj_image_alpha_set(0), 33 evas_obj_image_alpha_set(0),
34 evas_obj_image_fill_set(0, 0, 640, 480), 34 efl_gfx_fill_set(0, 0, 640, 480),
35 evas_obj_size_set(640, 480), 35 efl_gfx_size_set(640, 480),
36 evas_obj_visibility_set(EINA_TRUE)); 36 efl_gfx_visible_set(EINA_TRUE));
37 } 37 }
38 done = 0; 38 done = 0;
39} 39}
@@ -59,9 +59,9 @@ static void _loop(double t, int f)
59 x = (win_w / 2) - (w / 2); 59 x = (win_w / 2) - (w / 2);
60 y = (win_h / 2) - (h / 2); 60 y = (win_h / 2) - (h / 2);
61 eo_do(o_images[i], 61 eo_do(o_images[i],
62 evas_obj_position_set(x, y), 62 efl_gfx_position_set(x, y),
63 evas_obj_size_set(w, h), 63 efl_gfx_size_set(w, h),
64 evas_obj_image_fill_set(0, 0, w, h), 64 efl_gfx_fill_set(0, 0, w, h),
65 data = evas_obj_image_data_get(1), 65 data = evas_obj_image_data_get(1),
66 st = evas_obj_image_stride_get()); 66 st = evas_obj_image_stride_get());
67 st = st >> 2; 67 st = st >> 2;
diff --git a/src/bin/image_data_argb_alpha.c b/src/bin/image_data_argb_alpha.c
index 541eb1b..d20e9f9 100644
--- a/src/bin/image_data_argb_alpha.c
+++ b/src/bin/image_data_argb_alpha.c
@@ -29,11 +29,11 @@ static void _setup(void)
29 eo_do(o, 29 eo_do(o,
30 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 30 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
31 evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888), 31 evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888),
32 evas_obj_image_size_set(640, 480), 32 efl_gfx_view_size_set(640, 480),
33 evas_obj_image_alpha_set(1), 33 evas_obj_image_alpha_set(1),
34 evas_obj_image_fill_set(0, 0, 640, 480), 34 efl_gfx_fill_set(0, 0, 640, 480),
35 evas_obj_size_set(640, 480), 35 efl_gfx_size_set(640, 480),
36 evas_obj_visibility_set(EINA_TRUE)); 36 efl_gfx_visible_set(EINA_TRUE));
37 } 37 }
38 done = 0; 38 done = 0;
39} 39}
@@ -59,9 +59,9 @@ static void _loop(double t, int f)
59 x = (win_w / 2) - (w / 2); 59 x = (win_w / 2) - (w / 2);
60 y = (win_h / 2) - (h / 2); 60 y = (win_h / 2) - (h / 2);
61 eo_do(o_images[i], 61 eo_do(o_images[i],
62 evas_obj_position_set(x, y), 62 efl_gfx_position_set(x, y),
63 evas_obj_size_set(w, h), 63 efl_gfx_size_set(w, h),
64 evas_obj_image_fill_set(0, 0, w, h), 64 efl_gfx_fill_set(0, 0, w, h),
65 data = evas_obj_image_data_get(1), 65 data = evas_obj_image_data_get(1),
66 st = evas_obj_image_stride_get()); 66 st = evas_obj_image_stride_get());
67 st = st >> 2; 67 st = st >> 2;
diff --git a/src/bin/image_data_ycbcr601pl.c b/src/bin/image_data_ycbcr601pl.c
index d06689a..4318162 100644
--- a/src/bin/image_data_ycbcr601pl.c
+++ b/src/bin/image_data_ycbcr601pl.c
@@ -32,11 +32,11 @@ static void _setup(void)
32 eo_do(o, 32 eo_do(o,
33 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 33 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
34 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), 34 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
35 evas_obj_image_size_set(640, 480), 35 efl_gfx_view_size_set(640, 480),
36 evas_obj_image_alpha_set(0), 36 evas_obj_image_alpha_set(0),
37 evas_obj_image_fill_set(0, 0, 640, 480), 37 efl_gfx_fill_set(0, 0, 640, 480),
38 evas_obj_size_set(640, 480), 38 efl_gfx_size_set(640, 480),
39 evas_obj_visibility_set(EINA_TRUE)); 39 efl_gfx_visible_set(EINA_TRUE));
40 yp = malloc(640 * 480); 40 yp = malloc(640 * 480);
41 up = malloc(320 * 240); 41 up = malloc(320 * 240);
42 vp = malloc(320 * 240); 42 vp = malloc(320 * 240);
@@ -92,9 +92,9 @@ static void _loop(double t, int f)
92 x = (win_w / 2) - (w / 2); 92 x = (win_w / 2) - (w / 2);
93 y = (win_h / 2) - (h / 2); 93 y = (win_h / 2) - (h / 2);
94 eo_do(o_images[i], 94 eo_do(o_images[i],
95 evas_obj_position_set(x, y), 95 efl_gfx_position_set(x, y),
96 evas_obj_size_set(w, h), 96 efl_gfx_size_set(w, h),
97 evas_obj_image_fill_set(0, 0, w, h), 97 efl_gfx_fill_set(0, 0, w, h),
98 evas_obj_image_data_update_add( 0, 0, 640, 480)); 98 evas_obj_image_data_update_add( 0, 0, 640, 480));
99 } 99 }
100 FPS_STD(NAME); 100 FPS_STD(NAME);
diff --git a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
index 2800955..14f4575 100644
--- a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
@@ -32,12 +32,12 @@ static void _setup(void)
32 eo_do(o, 32 eo_do(o,
33 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 33 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
34 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), 34 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
35 evas_obj_image_size_set(640, 480), 35 efl_gfx_view_size_set(640, 480),
36 evas_obj_image_alpha_set(0), 36 evas_obj_image_alpha_set(0),
37 evas_obj_image_fill_set(0, 0, 640, 480), 37 efl_gfx_fill_set(0, 0, 640, 480),
38 evas_obj_size_set(640, 480), 38 efl_gfx_size_set(640, 480),
39 efl_image_smooth_scale_set(0), 39 efl_image_smooth_scale_set(0),
40 evas_obj_visibility_set(EINA_TRUE)); 40 efl_gfx_visible_set(EINA_TRUE));
41 yp = malloc(640 * 480); 41 yp = malloc(640 * 480);
42 up = malloc(320 * 240); 42 up = malloc(320 * 240);
43 vp = malloc(320 * 240); 43 vp = malloc(320 * 240);
diff --git a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
index 26a00a1..536d65d 100644
--- a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
@@ -32,11 +32,11 @@ static void _setup(void)
32 eo_do(o, 32 eo_do(o,
33 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 33 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
34 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), 34 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
35 evas_obj_image_size_set(640, 480), 35 efl_gfx_view_size_set(640, 480),
36 evas_obj_image_alpha_set(0), 36 evas_obj_image_alpha_set(0),
37 evas_obj_image_fill_set(0, 0, 640, 480), 37 efl_gfx_fill_set(0, 0, 640, 480),
38 evas_obj_size_set(640, 480), 38 efl_gfx_size_set(640, 480),
39 evas_obj_visibility_set(EINA_TRUE)); 39 efl_gfx_visible_set(EINA_TRUE));
40 yp = malloc(640 * 480); 40 yp = malloc(640 * 480);
41 up = malloc(320 * 240); 41 up = malloc(320 * 240);
42 vp = malloc(320 * 240); 42 vp = malloc(320 * 240);
diff --git a/src/bin/image_data_ycbcr601pl_wide_stride.c b/src/bin/image_data_ycbcr601pl_wide_stride.c
index 1025622..65bf564 100644
--- a/src/bin/image_data_ycbcr601pl_wide_stride.c
+++ b/src/bin/image_data_ycbcr601pl_wide_stride.c
@@ -32,11 +32,11 @@ static void _setup(void)
32 eo_do(o, 32 eo_do(o,
33 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 33 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
34 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), 34 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
35 evas_obj_image_size_set(320, 480), 35 efl_gfx_view_size_set(320, 480),
36 evas_obj_image_alpha_set(0), 36 evas_obj_image_alpha_set(0),
37 evas_obj_image_fill_set(0, 0, 640, 480), 37 efl_gfx_fill_set(0, 0, 640, 480),
38 evas_obj_size_set(640, 480), 38 efl_gfx_size_set(640, 480),
39 evas_obj_visibility_set(EINA_TRUE)); 39 efl_gfx_visible_set(EINA_TRUE));
40 yp = malloc(640 * 480); 40 yp = malloc(640 * 480);
41 up = malloc(320 * 240); 41 up = malloc(320 * 240);
42 vp = malloc(320 * 240); 42 vp = malloc(320 * 240);
@@ -99,9 +99,9 @@ static void _loop(double t, int f)
99 x = (win_w / 2) - (w / 2); 99 x = (win_w / 2) - (w / 2);
100 y = (win_h / 2) - (h / 2); 100 y = (win_h / 2) - (h / 2);
101 eo_do(o_images[i], 101 eo_do(o_images[i],
102 evas_obj_position_set(x, y), 102 efl_gfx_position_set(x, y),
103 evas_obj_size_set(w, h), 103 efl_gfx_size_set(w, h),
104 evas_obj_image_fill_set(0, 0, w, h)); 104 efl_gfx_fill_set(0, 0, w, h));
105 105
106 w = 320 - 16 + f; 106 w = 320 - 16 + f;
107 if (w < 1) w = 1; 107 if (w < 1) w = 1;
@@ -109,7 +109,7 @@ static void _loop(double t, int f)
109 109
110 w &= ~0x1; 110 w &= ~0x1;
111 111
112 eo_do(o_images[i], evas_obj_image_size_set(w, 480)); 112 eo_do(o_images[i], efl_gfx_view_size_set(w, 480));
113 data = evas_object_image_data_get(o_images[i], 1); 113 data = evas_object_image_data_get(o_images[i], 1);
114 if (data) 114 if (data)
115 { 115 {
diff --git a/src/bin/image_map_3d_1.c b/src/bin/image_map_3d_1.c
index 803e4b1..569885e 100644
--- a/src/bin/image_map_3d_1.c
+++ b/src/bin/image_map_3d_1.c
@@ -59,10 +59,10 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
60 eo_do(o, 60 eo_do(o,
61 efl_file_set(build_path(buf), NULL), 61 efl_file_set(build_path(buf), NULL),
62 evas_obj_image_fill_set(0, 0, 256, 256), 62 efl_gfx_fill_set(0, 0, 256, 256),
63 evas_obj_size_set(256, 256), 63 efl_gfx_size_set(256, 256),
64 efl_image_smooth_scale_set(0), 64 efl_image_smooth_scale_set(0),
65 evas_obj_visibility_set(EINA_TRUE)); 65 efl_gfx_visible_set(EINA_TRUE));
66 } 66 }
67 POINT(0, 0, -w, -h, -d, 0, 0); 67 POINT(0, 0, -w, -h, -d, 0, 0);
68 POINT(0, 1, w, -h, -d, 256, 0); 68 POINT(0, 1, w, -h, -d, 256, 0);
@@ -134,11 +134,11 @@ _cube_pos(Cube *c,
134 eo_do(c->side[i].o, 134 eo_do(c->side[i].o,
135 evas_obj_map_enable_set(1), 135 evas_obj_map_enable_set(1),
136 evas_obj_map_set(m), 136 evas_obj_map_set(m),
137 evas_obj_visibility_set(EINA_TRUE)); 137 efl_gfx_visible_set(EINA_TRUE));
138 } 138 }
139 else 139 else
140 { 140 {
141 eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE)); 141 eo_do(c->side[i].o, efl_gfx_visible_set(EINA_FALSE));
142 } 142 }
143 143
144 order[i] = i; 144 order[i] = i;
@@ -163,9 +163,9 @@ _cube_pos(Cube *c,
163 } 163 }
164 while (!sorted); 164 while (!sorted);
165 165
166 eo_do(c->side[order[0]].o, evas_obj_raise()); 166 eo_do(c->side[order[0]].o, efl_gfx_stack_raise());
167 for (i = 1; i < 6; i++) 167 for (i = 1; i < 6; i++)
168 eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o)); 168 eo_do(c->side[order[i]].o, efl_gfx_stack_below(c->side[order[i - 1]].o));
169} 169}
170 170
171static void 171static void
diff --git a/src/bin/image_map_3d_2.c b/src/bin/image_map_3d_2.c
index 29e2229..4a1a80c 100644
--- a/src/bin/image_map_3d_2.c
+++ b/src/bin/image_map_3d_2.c
@@ -59,9 +59,9 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
60 eo_do(o, 60 eo_do(o,
61 efl_file_set(build_path(buf), NULL), 61 efl_file_set(build_path(buf), NULL),
62 evas_obj_image_fill_set(0, 0, 256, 256), 62 efl_gfx_fill_set(0, 0, 256, 256),
63 evas_obj_size_set(256, 256), 63 efl_gfx_size_set(256, 256),
64 evas_obj_visibility_set(EINA_TRUE)); 64 efl_gfx_visible_set(EINA_TRUE));
65 } 65 }
66 POINT(0, 0, -w, -h, -d, 0, 0); 66 POINT(0, 0, -w, -h, -d, 0, 0);
67 POINT(0, 1, w, -h, -d, 256, 0); 67 POINT(0, 1, w, -h, -d, 256, 0);
@@ -132,11 +132,11 @@ _cube_pos(Cube *c,
132 eo_do(c->side[i].o, 132 eo_do(c->side[i].o,
133 evas_obj_map_enable_set(1), 133 evas_obj_map_enable_set(1),
134 evas_obj_map_set(m), 134 evas_obj_map_set(m),
135 evas_obj_visibility_set(EINA_TRUE)); 135 efl_gfx_visible_set(EINA_TRUE));
136 } 136 }
137 else 137 else
138 { 138 {
139 eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE)); 139 eo_do(c->side[i].o, efl_gfx_visible_set(EINA_FALSE));
140 } 140 }
141 141
142 order[i] = i; 142 order[i] = i;
@@ -161,9 +161,9 @@ _cube_pos(Cube *c,
161 } 161 }
162 while (!sorted); 162 while (!sorted);
163 163
164 eo_do(c->side[order[0]].o, evas_obj_raise()); 164 eo_do(c->side[order[0]].o, efl_gfx_stack_raise());
165 for (i = 1; i < 6; i++) 165 for (i = 1; i < 6; i++)
166 eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o)); 166 eo_do(c->side[order[i]].o, efl_gfx_stack_below(c->side[order[i - 1]].o));
167} 167}
168 168
169static void 169static void
diff --git a/src/bin/image_map_3d_3.c b/src/bin/image_map_3d_3.c
index 4b2d471..f0d7d77 100644
--- a/src/bin/image_map_3d_3.c
+++ b/src/bin/image_map_3d_3.c
@@ -59,10 +59,10 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
60 eo_do(o, 60 eo_do(o,
61 efl_file_set(build_path(buf), NULL), 61 efl_file_set(build_path(buf), NULL),
62 evas_obj_image_fill_set(0, 0, 256, 256), 62 efl_gfx_fill_set(0, 0, 256, 256),
63 evas_obj_size_set(256, 256), 63 efl_gfx_size_set(256, 256),
64 efl_image_smooth_scale_set(0), 64 efl_image_smooth_scale_set(0),
65 evas_obj_visibility_set(EINA_TRUE)); 65 efl_gfx_visible_set(EINA_TRUE));
66 } 66 }
67 POINT(0, 0, -w, -h, -d, 0, 0); 67 POINT(0, 0, -w, -h, -d, 0, 0);
68 POINT(0, 1, w, -h, -d, 256, 0); 68 POINT(0, 1, w, -h, -d, 256, 0);
@@ -155,9 +155,9 @@ _cube_pos(Cube *c,
155 } 155 }
156 while (!sorted); 156 while (!sorted);
157 157
158 eo_do(c->side[order[0]].o, evas_obj_raise()); 158 eo_do(c->side[order[0]].o, efl_gfx_stack_raise());
159 for (i = 1; i < 6; i++) 159 for (i = 1; i < 6; i++)
160 eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o)); 160 eo_do(c->side[order[i]].o, efl_gfx_stack_below(c->side[order[i - 1]].o));
161} 161}
162 162
163static void 163static void
diff --git a/src/bin/image_map_3d_4.c b/src/bin/image_map_3d_4.c
index 323d35f..7d2cd0c 100644
--- a/src/bin/image_map_3d_4.c
+++ b/src/bin/image_map_3d_4.c
@@ -59,9 +59,9 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
60 eo_do(o, 60 eo_do(o,
61 efl_file_set(build_path(buf), NULL), 61 efl_file_set(build_path(buf), NULL),
62 evas_obj_image_fill_set(0, 0, 256, 256), 62 efl_gfx_fill_set(0, 0, 256, 256),
63 evas_obj_size_set(256, 256), 63 efl_gfx_size_set(256, 256),
64 evas_obj_visibility_set(EINA_TRUE)); 64 efl_gfx_visible_set(EINA_TRUE));
65 } 65 }
66 POINT(0, 0, -w, -h, -d, 0, 0); 66 POINT(0, 0, -w, -h, -d, 0, 0);
67 POINT(0, 1, w, -h, -d, 256, 0); 67 POINT(0, 1, w, -h, -d, 256, 0);
@@ -153,9 +153,9 @@ _cube_pos(Cube *c,
153 } 153 }
154 while (!sorted); 154 while (!sorted);
155 155
156 eo_do(c->side[order[0]].o, evas_obj_raise()); 156 eo_do(c->side[order[0]].o, efl_gfx_stack_raise());
157 for (i = 1; i < 6; i++) 157 for (i = 1; i < 6; i++)
158 eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o)); 158 eo_do(c->side[order[i]].o, efl_gfx_stack_below(c->side[order[i - 1]].o));
159} 159}
160 160
161static void 161static void
diff --git a/src/bin/image_map_3d_5.c b/src/bin/image_map_3d_5.c
index cb1f5f6..5090a83 100644
--- a/src/bin/image_map_3d_5.c
+++ b/src/bin/image_map_3d_5.c
@@ -59,10 +59,10 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
59 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1); 59 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
60 eo_do(o, 60 eo_do(o,
61 efl_file_set(build_path(buf), NULL), 61 efl_file_set(build_path(buf), NULL),
62 evas_obj_image_fill_set(0, 0, 720, 420), 62 efl_gfx_fill_set(0, 0, 720, 420),
63 evas_obj_size_set(720, 420), 63 efl_gfx_size_set(720, 420),
64 efl_image_smooth_scale_set(0), 64 efl_image_smooth_scale_set(0),
65 evas_obj_visibility_set(EINA_TRUE)); 65 efl_gfx_visible_set(EINA_TRUE));
66 } 66 }
67 POINT(0, 0, -w, -h, -d, 0, 0); 67 POINT(0, 0, -w, -h, -d, 0, 0);
68 POINT(0, 1, w, -h, -d, 720, 0); 68 POINT(0, 1, w, -h, -d, 720, 0);
@@ -134,11 +134,11 @@ _cube_pos(Cube *c,
134 eo_do(c->side[i].o, 134 eo_do(c->side[i].o,
135 evas_obj_map_enable_set(1), 135 evas_obj_map_enable_set(1),
136 evas_obj_map_set(m), 136 evas_obj_map_set(m),
137 evas_obj_visibility_set(EINA_TRUE)); 137 efl_gfx_visible_set(EINA_TRUE));
138 } 138 }
139 else 139 else
140 { 140 {
141 eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE)); 141 eo_do(c->side[i].o, efl_gfx_visible_set(EINA_FALSE));
142 } 142 }
143 143
144 order[i] = i; 144 order[i] = i;
@@ -163,9 +163,9 @@ _cube_pos(Cube *c,
163 } 163 }
164 while (!sorted); 164 while (!sorted);
165 165
166 eo_do(c->side[order[0]].o, evas_obj_raise()); 166 eo_do(c->side[order[0]].o, efl_gfx_stack_raise());
167 for (i = 1; i < 6; i++) 167 for (i = 1; i < 6; i++)
168 eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o)); 168 eo_do(c->side[order[i]].o, efl_gfx_stack_below(c->side[order[i - 1]].o));
169} 169}
170 170
171static void 171static void
diff --git a/src/bin/image_map_3d_6.c b/src/bin/image_map_3d_6.c
index 8954c02..e38b157 100644
--- a/src/bin/image_map_3d_6.c
+++ b/src/bin/image_map_3d_6.c
@@ -59,10 +59,10 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
59 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1); 59 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
60 eo_do(o, 60 eo_do(o,
61 efl_file_set(build_path(buf), NULL), 61 efl_file_set(build_path(buf), NULL),
62 evas_obj_image_fill_set(0, 0, 720, 420), 62 efl_gfx_fill_set(0, 0, 720, 420),
63 evas_obj_size_set(720, 420), 63 efl_gfx_size_set(720, 420),
64 efl_image_smooth_scale_set(0), 64 efl_image_smooth_scale_set(0),
65 evas_obj_visibility_set(EINA_TRUE)); 65 efl_gfx_visible_set(EINA_TRUE));
66 } 66 }
67 POINT(0, 0, -w, -h, -d, 0, 0); 67 POINT(0, 0, -w, -h, -d, 0, 0);
68 POINT(0, 1, w, -h, -d, 720, 0); 68 POINT(0, 1, w, -h, -d, 720, 0);
@@ -131,11 +131,11 @@ _cube_pos(Cube *c,
131 eo_do(c->side[i].o, 131 eo_do(c->side[i].o,
132 evas_obj_map_enable_set(1), 132 evas_obj_map_enable_set(1),
133 evas_obj_map_set(m), 133 evas_obj_map_set(m),
134 evas_obj_visibility_set(EINA_TRUE)); 134 efl_gfx_visible_set(EINA_TRUE));
135 } 135 }
136 else 136 else
137 { 137 {
138 eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE)); 138 eo_do(c->side[i].o, efl_gfx_visible_set(EINA_FALSE));
139 } 139 }
140 140
141 order[i] = i; 141 order[i] = i;
@@ -160,9 +160,9 @@ _cube_pos(Cube *c,
160 } 160 }
161 while (!sorted); 161 while (!sorted);
162 162
163 eo_do(c->side[order[0]].o, evas_obj_raise()); 163 eo_do(c->side[order[0]].o, efl_gfx_stack_raise());
164 for (i = 1; i < 6; i++) 164 for (i = 1; i < 6; i++)
165 eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o)); 165 eo_do(c->side[order[i]].o, efl_gfx_stack_below(c->side[order[i - 1]].o));
166} 166}
167 167
168static void 168static void
diff --git a/src/bin/image_map_3d_flow.c b/src/bin/image_map_3d_flow.c
index f2cdf7a..f380e7f 100644
--- a/src/bin/image_map_3d_flow.c
+++ b/src/bin/image_map_3d_flow.c
@@ -34,20 +34,20 @@ static void _setup(void)
34 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); 34 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
35 eo_do(o, 35 eo_do(o,
36 efl_file_set(build_path(buf), NULL), 36 efl_file_set(build_path(buf), NULL),
37 evas_obj_image_fill_set(0, 0, 256, 256), 37 efl_gfx_fill_set(0, 0, 256, 256),
38 evas_obj_size_set(256, 256), 38 efl_gfx_size_set(256, 256),
39 efl_image_smooth_scale_set(0), 39 efl_image_smooth_scale_set(0),
40 evas_obj_visibility_set(EINA_TRUE)); 40 efl_gfx_visible_set(EINA_TRUE));
41 41
42 o = eo_add(EVAS_IMAGE_CLASS, evas); 42 o = eo_add(EVAS_IMAGE_CLASS, evas);
43 o_reflec[i] = o; 43 o_reflec[i] = o;
44 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); 44 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
45 eo_do(o, 45 eo_do(o,
46 efl_file_set(build_path(buf), NULL), 46 efl_file_set(build_path(buf), NULL),
47 evas_obj_image_fill_set(0, 0, 256, 256), 47 efl_gfx_fill_set(0, 0, 256, 256),
48 evas_obj_size_set(256, 256), 48 efl_gfx_size_set(256, 256),
49 efl_image_smooth_scale_set(0), 49 efl_image_smooth_scale_set(0),
50 evas_obj_visibility_set(EINA_TRUE)); 50 efl_gfx_visible_set(EINA_TRUE));
51 } 51 }
52 done = 0; 52 done = 0;
53} 53}
@@ -130,13 +130,13 @@ static void _loop(double t, int f)
130 130
131 if (c <= 0) 131 if (c <= 0)
132 { 132 {
133 eo_do(o_images[i], evas_obj_raise()); 133 eo_do(o_images[i], efl_gfx_stack_raise());
134 eo_do(o_reflec[i], evas_obj_raise()); 134 eo_do(o_reflec[i], efl_gfx_stack_raise());
135 } 135 }
136 else 136 else
137 { 137 {
138 eo_do(o_images[i], evas_obj_lower()); 138 eo_do(o_images[i], efl_gfx_stack_lower());
139 eo_do(o_reflec[i], evas_obj_lower()); 139 eo_do(o_reflec[i], efl_gfx_stack_lower());
140 } 140 }
141 141
142 evas_map_point_coord_set (m, 0, x, y, -z); 142 evas_map_point_coord_set (m, 0, x, y, -z);
diff --git a/src/bin/image_map_color_alpha_nearest_rotate.c b/src/bin/image_map_color_alpha_nearest_rotate.c
index a27addd..55601b3 100644
--- a/src/bin/image_map_color_alpha_nearest_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_rotate.c
@@ -28,10 +28,10 @@ static void _setup(void)
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 efl_file_set(build_path("logo.png"), NULL), 30 efl_file_set(build_path("logo.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 efl_gfx_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 efl_gfx_size_set(120, 160),
33 efl_image_smooth_scale_set(0), 33 efl_image_smooth_scale_set(0),
34 evas_obj_visibility_set(EINA_TRUE)); 34 efl_gfx_visible_set(EINA_TRUE));
35 } 35 }
36 done = 0; 36 done = 0;
37} 37}
diff --git a/src/bin/image_map_color_alpha_nearest_solid_rotate.c b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
index 1f8f27b..289c027 100644
--- a/src/bin/image_map_color_alpha_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
@@ -28,10 +28,10 @@ static void _setup(void)
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 efl_file_set(build_path("image.png"), NULL), 30 efl_file_set(build_path("image.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 efl_gfx_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 efl_gfx_size_set(120, 160),
33 efl_image_smooth_scale_set(0), 33 efl_image_smooth_scale_set(0),
34 evas_obj_visibility_set(EINA_TRUE)); 34 efl_gfx_visible_set(EINA_TRUE));
35 } 35 }
36 done = 0; 36 done = 0;
37} 37}
diff --git a/src/bin/image_map_color_alpha_rotate.c b/src/bin/image_map_color_alpha_rotate.c
index 40d1f49..bec6b37 100644
--- a/src/bin/image_map_color_alpha_rotate.c
+++ b/src/bin/image_map_color_alpha_rotate.c
@@ -28,9 +28,9 @@ static void _setup(void)
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 efl_file_set(build_path("logo.png"), NULL), 30 efl_file_set(build_path("logo.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 efl_gfx_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 efl_gfx_size_set(120, 160),
33 evas_obj_visibility_set(EINA_TRUE)); 33 efl_gfx_visible_set(EINA_TRUE));
34 } 34 }
35 done = 0; 35 done = 0;
36} 36}
diff --git a/src/bin/image_map_color_alpha_solid_rotate.c b/src/bin/image_map_color_alpha_solid_rotate.c
index 7552048..6decf13 100644
--- a/src/bin/image_map_color_alpha_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_solid_rotate.c
@@ -28,9 +28,9 @@ static void _setup(void)
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 efl_file_set(build_path("image.png"), NULL), 30 efl_file_set(build_path("image.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 efl_gfx_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 efl_gfx_size_set(120, 160),
33 evas_obj_visibility_set(EINA_TRUE)); 33 efl_gfx_visible_set(EINA_TRUE));
34 } 34 }
35 done = 0; 35 done = 0;
36} 36}
diff --git a/src/bin/image_map_color_nearest_rotate.c b/src/bin/image_map_color_nearest_rotate.c
index c09ae09..0c6297c 100644
--- a/src/bin/image_map_color_nearest_rotate.c
+++ b/src/bin/image_map_color_nearest_rotate.c
@@ -28,10 +28,10 @@ static void _setup(void)
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 efl_file_set(build_path("logo.png"), NULL), 30 efl_file_set(build_path("logo.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 efl_gfx_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 efl_gfx_size_set(120, 160),
33 efl_image_smooth_scale_set(0), 33 efl_image_smooth_scale_set(0),
34 evas_obj_visibility_set(EINA_TRUE)); 34 efl_gfx_visible_set(EINA_TRUE));
35 } 35 }
36 done = 0; 36 done = 0;
37} 37}
diff --git a/src/bin/image_map_color_nearest_solid_rotate.c b/src/bin/image_map_color_nearest_solid_rotate.c
index e7fcf7c..a412ac9 100644
--- a/src/bin/image_map_color_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_nearest_solid_rotate.c
@@ -28,10 +28,10 @@ static void _setup(void)
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 efl_file_set(build_path("image.png"), NULL), 30 efl_file_set(build_path("image.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 efl_gfx_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 efl_gfx_size_set(120, 160),
33 efl_image_smooth_scale_set(0), 33 efl_image_smooth_scale_set(0),
34 evas_obj_visibility_set(EINA_TRUE)); 34 efl_gfx_visible_set(EINA_TRUE));
35 } 35 }
36 done = 0; 36 done = 0;
37} 37}
diff --git a/src/bin/image_map_color_rotate.c b/src/bin/image_map_color_rotate.c
index 7f4969a..3d33ef9 100644
--- a/src/bin/image_map_color_rotate.c
+++ b/src/bin/image_map_color_rotate.c
@@ -28,9 +28,9 @@ static void _setup(void)
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 efl_file_set(build_path("logo.png"), NULL), 30 efl_file_set(build_path("logo.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 efl_gfx_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 efl_gfx_size_set(120, 160),
33 evas_obj_visibility_set(EINA_TRUE)); 33 efl_gfx_visible_set(EINA_TRUE));
34 } 34 }
35 done = 0; 35 done = 0;
36} 36}
diff --git a/src/bin/image_map_color_solid_rotate.c b/src/bin/image_map_color_solid_rotate.c
index 8040da3..02f93b3 100644
--- a/src/bin/image_map_color_solid_rotate.c
+++ b/src/bin/image_map_color_solid_rotate.c
@@ -28,9 +28,9 @@ static void _setup(void)
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 efl_file_set(build_path("image.png"), NULL), 30 efl_file_set(build_path("image.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 efl_gfx_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 efl_gfx_size_set(120, 160),
33 evas_obj_visibility_set(EINA_TRUE)); 33 efl_gfx_visible_set(EINA_TRUE));
34 } 34 }
35 done = 0; 35 done = 0;
36} 36}
diff --git a/src/bin/image_map_nearest_rotate.c b/src/bin/image_map_nearest_rotate.c
index 7c98d1f..e412145 100644
--- a/src/bin/image_map_nearest_rotate.c
+++ b/src/bin/image_map_nearest_rotate.c
@@ -28,10 +28,10 @@ static void _setup(void)
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 efl_file_set(build_path("logo.png"), NULL), 30 efl_file_set(build_path("logo.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 efl_gfx_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 efl_gfx_size_set(120, 160),
33 efl_image_smooth_scale_set(0), 33 efl_image_smooth_scale_set(0),
34 evas_obj_visibility_set(EINA_TRUE)); 34 efl_gfx_visible_set(EINA_TRUE));
35 } 35 }
36 done = 0; 36 done = 0;
37} 37}
diff --git a/src/bin/image_map_nearest_solid_rotate.c b/src/bin/image_map_nearest_solid_rotate.c
index 0a37dd4..3a1c62a 100644
--- a/src/bin/image_map_nearest_solid_rotate.c
+++ b/src/bin/image_map_nearest_solid_rotate.c
@@ -28,10 +28,10 @@ static void _setup(void)
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 efl_file_set(build_path("image.png"), NULL), 30 efl_file_set(build_path("image.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 efl_gfx_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 efl_gfx_size_set(120, 160),
33 efl_image_smooth_scale_set(0), 33 efl_image_smooth_scale_set(0),
34 evas_obj_visibility_set(EINA_TRUE)); 34 efl_gfx_visible_set(EINA_TRUE));
35 } 35 }
36 done = 0; 36 done = 0;
37} 37}
diff --git a/src/bin/image_map_rotate.c b/src/bin/image_map_rotate.c
index 58cad97..28bcb0b 100644
--- a/src/bin/image_map_rotate.c
+++ b/src/bin/image_map_rotate.c
@@ -27,9 +27,9 @@ static void _setup(void)
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, efl_file_set(build_path("logo.png"), NULL), 29 eo_do(o, efl_file_set(build_path("logo.png"), NULL),
30 evas_obj_image_fill_set(0, 0, 120, 160), 30 efl_gfx_fill_set(0, 0, 120, 160),
31 evas_obj_size_set(120, 160), 31 efl_gfx_size_set(120, 160),
32 evas_obj_visibility_set(EINA_TRUE)); 32 efl_gfx_visible_set(EINA_TRUE));
33 } 33 }
34 done = 0; 34 done = 0;
35} 35}
diff --git a/src/bin/image_map_solid_rotate.c b/src/bin/image_map_solid_rotate.c
index 104dd4d..cd8f372 100644
--- a/src/bin/image_map_solid_rotate.c
+++ b/src/bin/image_map_solid_rotate.c
@@ -28,9 +28,9 @@ static void _setup(void)
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 efl_file_set(build_path("image.png"), NULL), 30 efl_file_set(build_path("image.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 efl_gfx_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 efl_gfx_size_set(120, 160),
33 evas_obj_visibility_set(EINA_TRUE)); 33 efl_gfx_visible_set(EINA_TRUE));
34 } 34 }
35 done = 0; 35 done = 0;
36} 36}
diff --git a/src/bin/image_mask.c b/src/bin/image_mask.c
index e3ccd38..94caae4 100644
--- a/src/bin/image_mask.c
+++ b/src/bin/image_mask.c
@@ -27,17 +27,17 @@ static void _setup(void)
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("image.png"), NULL), 29 efl_file_set(build_path("image.png"), NULL),
30 evas_obj_image_fill_set(0, 0, 120, 160), 30 efl_gfx_fill_set(0, 0, 120, 160),
31 evas_obj_size_set(120, 160), 31 efl_gfx_size_set(120, 160),
32 evas_obj_visibility_set(EINA_TRUE)); 32 efl_gfx_visible_set(EINA_TRUE));
33 33
34 o = eo_add(EVAS_IMAGE_CLASS,evas); 34 o = eo_add(EVAS_IMAGE_CLASS,evas);
35 o_images[i + 1] = o; 35 o_images[i + 1] = o;
36 eo_do(o, 36 eo_do(o,
37 efl_file_set(build_path("e-logo.png"), NULL), 37 efl_file_set(build_path("e-logo.png"), NULL),
38 evas_obj_image_fill_set(0, 0, 120, 160), 38 efl_gfx_fill_set(0, 0, 120, 160),
39 evas_obj_size_set(120, 160), 39 efl_gfx_size_set(120, 160),
40 evas_obj_visibility_set(EINA_TRUE)); 40 efl_gfx_visible_set(EINA_TRUE));
41 41
42 eo_do(o_images[i], evas_obj_clip_set(o)); 42 eo_do(o_images[i], evas_obj_clip_set(o));
43 } 43 }
@@ -64,8 +64,8 @@ static void _loop(double t, int f)
64 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 64 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
65 y = (win_h / 2) - (h / 2); 65 y = (win_h / 2) - (h / 2);
66 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 66 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
67 eo_do(o_images[i], evas_obj_position_set(x, y)); 67 eo_do(o_images[i], efl_gfx_position_set(x, y));
68 eo_do(o_images[i + 1], evas_obj_position_set(x, y)); 68 eo_do(o_images[i + 1], efl_gfx_position_set(x, y));
69 } 69 }
70 FPS_STD(NAME); 70 FPS_STD(NAME);
71} 71}
diff --git a/src/bin/image_mask_10.c b/src/bin/image_mask_10.c
index d759d45..793bea2 100644
--- a/src/bin/image_mask_10.c
+++ b/src/bin/image_mask_10.c
@@ -27,10 +27,10 @@ static void _setup(void)
27 o_mask = o; 27 o_mask = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("e-logo-mask.png"), NULL), 29 efl_file_set(build_path("e-logo-mask.png"), NULL),
30 evas_obj_image_fill_set(0, 0, 720, 420), 30 efl_gfx_fill_set(0, 0, 720, 420),
31 evas_obj_size_set(720, 420), 31 efl_gfx_size_set(720, 420),
32 evas_obj_position_set((win_w - 720) / 2, (win_h - 420) / 2), 32 efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2),
33 evas_obj_visibility_set(EINA_TRUE)); 33 efl_gfx_visible_set(EINA_TRUE));
34 34
35 for (i = 0; i < 1; i++) 35 for (i = 0; i < 1; i++)
36 { 36 {
@@ -38,10 +38,10 @@ static void _setup(void)
38 o_images[i] = o; 38 o_images[i] = o;
39 eo_do(o, 39 eo_do(o,
40 efl_file_set(build_path("texture.png"), NULL), 40 efl_file_set(build_path("texture.png"), NULL),
41 evas_obj_image_fill_set(0, 0, win_w * 4, win_h * 4), 41 efl_gfx_fill_set(0, 0, win_w * 4, win_h * 4),
42 evas_obj_size_set(win_w * 4, win_h * 4), 42 efl_gfx_size_set(win_w * 4, win_h * 4),
43 evas_obj_clip_set(o_mask), 43 evas_obj_clip_set(o_mask),
44 evas_obj_visibility_set(EINA_TRUE)); 44 efl_gfx_visible_set(EINA_TRUE));
45 } 45 }
46 done = 0; 46 done = 0;
47} 47}
diff --git a/src/bin/image_mask_11.c b/src/bin/image_mask_11.c
index df34620..d7e52ea 100644
--- a/src/bin/image_mask_11.c
+++ b/src/bin/image_mask_11.c
@@ -27,10 +27,10 @@ static void _setup(void)
27 o_mask = o; 27 o_mask = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("e-logo-mask.png"), NULL), 29 efl_file_set(build_path("e-logo-mask.png"), NULL),
30 evas_obj_image_fill_set(0, 0, 720, 420), 30 efl_gfx_fill_set(0, 0, 720, 420),
31 evas_obj_size_set(720, 420), 31 efl_gfx_size_set(720, 420),
32 evas_obj_position_set((win_w - 720) / 2, (win_h - 420) / 2), 32 efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2),
33 evas_obj_visibility_set(EINA_TRUE)); 33 efl_gfx_visible_set(EINA_TRUE));
34 34
35 for (i = 0; i < OBNUM; i++) 35 for (i = 0; i < OBNUM; i++)
36 { 36 {
@@ -38,10 +38,10 @@ static void _setup(void)
38 o_images[i] = o; 38 o_images[i] = o;
39 eo_do(o, 39 eo_do(o,
40 efl_file_set(build_path("logo.png"), NULL), 40 efl_file_set(build_path("logo.png"), NULL),
41 evas_obj_image_fill_set(0, 0, 120, 160), 41 efl_gfx_fill_set(0, 0, 120, 160),
42 evas_obj_size_set(120, 160), 42 efl_gfx_size_set(120, 160),
43 evas_obj_clip_set(o_mask), 43 evas_obj_clip_set(o_mask),
44 evas_obj_visibility_set(EINA_TRUE)); 44 efl_gfx_visible_set(EINA_TRUE));
45 } 45 }
46 done = 0; 46 done = 0;
47} 47}
@@ -68,7 +68,7 @@ static void _loop(double t, int f)
68 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 68 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
69 y = (win_h / 2) - (h / 2); 69 y = (win_h / 2) - (h / 2);
70 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 70 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
71 eo_do(o_images[i], evas_obj_position_set(x, y)); 71 eo_do(o_images[i], efl_gfx_position_set(x, y));
72 } 72 }
73 if (!m) m = evas_map_new(4); 73 if (!m) m = evas_map_new(4);
74 evas_map_util_points_populate_from_geometry(m, 74 evas_map_util_points_populate_from_geometry(m,
diff --git a/src/bin/image_mask_12.c b/src/bin/image_mask_12.c
index b19b404..32a0e1a 100644
--- a/src/bin/image_mask_12.c
+++ b/src/bin/image_mask_12.c
@@ -27,10 +27,10 @@ static void _setup(void)
27 o_mask = o; 27 o_mask = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("e-logo-mask.png"), NULL), 29 efl_file_set(build_path("e-logo-mask.png"), NULL),
30 evas_obj_image_fill_set(0, 0, 720, 420), 30 efl_gfx_fill_set(0, 0, 720, 420),
31 evas_obj_size_set(720, 420), 31 efl_gfx_size_set(720, 420),
32 evas_obj_position_set((win_w - 720) / 2, (win_h - 420) / 2), 32 efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2),
33 evas_obj_visibility_set(EINA_TRUE)); 33 efl_gfx_visible_set(EINA_TRUE));
34 34
35 for (i = 0; i < OBNUM; i++) 35 for (i = 0; i < OBNUM; i++)
36 { 36 {
@@ -38,11 +38,11 @@ static void _setup(void)
38 o_images[i] = o; 38 o_images[i] = o;
39 eo_do(o, 39 eo_do(o,
40 efl_file_set(build_path("logo.png"), NULL), 40 efl_file_set(build_path("logo.png"), NULL),
41 evas_obj_image_fill_set(0, 0, 120, 160), 41 efl_gfx_fill_set(0, 0, 120, 160),
42 evas_obj_size_set(120, 160), 42 efl_gfx_size_set(120, 160),
43 efl_image_smooth_scale_set(1), 43 efl_image_smooth_scale_set(1),
44 evas_obj_clip_set(o_mask), 44 evas_obj_clip_set(o_mask),
45 evas_obj_visibility_set(EINA_TRUE)); 45 efl_gfx_visible_set(EINA_TRUE));
46 } 46 }
47 done = 0; 47 done = 0;
48} 48}
@@ -72,9 +72,9 @@ static void _loop(double t, int f)
72 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 72 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
73 73
74 eo_do(o_images[i], 74 eo_do(o_images[i],
75 evas_obj_position_set(x, y), 75 efl_gfx_position_set(x, y),
76 evas_obj_size_set(w, h), 76 efl_gfx_size_set(w, h),
77 evas_obj_image_fill_set(0, 0, w, h)); 77 efl_gfx_fill_set(0, 0, w, h));
78 } 78 }
79 FPS_STD(NAME); 79 FPS_STD(NAME);
80} 80}
diff --git a/src/bin/image_mask_13.c b/src/bin/image_mask_13.c
index 88240bb..d7ec341 100644
--- a/src/bin/image_mask_13.c
+++ b/src/bin/image_mask_13.c
@@ -27,10 +27,10 @@ static void _setup(void)
27 o_mask = o; 27 o_mask = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("e-logo-mask.png"), NULL), 29 efl_file_set(build_path("e-logo-mask.png"), NULL),
30 evas_obj_image_fill_set(0, 0, 720, 420), 30 efl_gfx_fill_set(0, 0, 720, 420),
31 evas_obj_size_set(720, 420), 31 efl_gfx_size_set(720, 420),
32 evas_obj_position_set((win_w - 720) / 2, (win_h - 420) / 2), 32 efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2),
33 evas_obj_visibility_set(EINA_TRUE)); 33 efl_gfx_visible_set(EINA_TRUE));
34 34
35 for (i = 0; i < OBNUM; i++) 35 for (i = 0; i < OBNUM; i++)
36 { 36 {
@@ -38,11 +38,11 @@ static void _setup(void)
38 o_images[i] = o; 38 o_images[i] = o;
39 eo_do(o, 39 eo_do(o,
40 efl_file_set(build_path("logo.png"), NULL), 40 efl_file_set(build_path("logo.png"), NULL),
41 evas_obj_image_fill_set(0, 0, 120, 160), 41 efl_gfx_fill_set(0, 0, 120, 160),
42 evas_obj_size_set(120, 160), 42 efl_gfx_size_set(120, 160),
43 efl_image_smooth_scale_set(0), 43 efl_image_smooth_scale_set(0),
44 evas_obj_clip_set(o_mask), 44 evas_obj_clip_set(o_mask),
45 evas_obj_visibility_set(EINA_TRUE)); 45 efl_gfx_visible_set(EINA_TRUE));
46 } 46 }
47 done = 0; 47 done = 0;
48} 48}
@@ -72,9 +72,9 @@ static void _loop(double t, int f)
72 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 72 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
73 73
74 eo_do(o_images[i], 74 eo_do(o_images[i],
75 evas_obj_position_set(x, y), 75 efl_gfx_position_set(x, y),
76 evas_obj_size_set(w, h), 76 efl_gfx_size_set(w, h),
77 evas_obj_image_fill_set(0, 0, w, h)); 77 efl_gfx_fill_set(0, 0, w, h));
78 } 78 }
79 FPS_STD(NAME); 79 FPS_STD(NAME);
80} 80}
diff --git a/src/bin/image_mask_2.c b/src/bin/image_mask_2.c
index 7c4b34f..b3ef3a5 100644
--- a/src/bin/image_mask_2.c
+++ b/src/bin/image_mask_2.c
@@ -27,17 +27,17 @@ static void _setup(void)
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("image.png"), NULL), 29 efl_file_set(build_path("image.png"), NULL),
30 evas_obj_image_fill_set(0, 0, 120, 160), 30 efl_gfx_fill_set(0, 0, 120, 160),
31 evas_obj_size_set(120, 160), 31 efl_gfx_size_set(120, 160),
32 evas_obj_visibility_set(EINA_TRUE)); 32 efl_gfx_visible_set(EINA_TRUE));
33 33
34 o = eo_add(EVAS_IMAGE_CLASS,evas); 34 o = eo_add(EVAS_IMAGE_CLASS,evas);
35 o_images[i + 1] = o; 35 o_images[i + 1] = o;
36 eo_do(o, 36 eo_do(o,
37 efl_file_set(build_path("e-logo-2.png"), NULL), 37 efl_file_set(build_path("e-logo-2.png"), NULL),
38 evas_obj_image_fill_set(0, 0, 120, 160), 38 efl_gfx_fill_set(0, 0, 120, 160),
39 evas_obj_size_set(120, 160), 39 efl_gfx_size_set(120, 160),
40 evas_obj_visibility_set(EINA_TRUE)); 40 efl_gfx_visible_set(EINA_TRUE));
41 41
42 eo_do(o_images[i], evas_obj_clip_set(o)); 42 eo_do(o_images[i], evas_obj_clip_set(o));
43 } 43 }
@@ -64,8 +64,8 @@ static void _loop(double t, int f)
64 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 64 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
65 y = (win_h / 2) - (h / 2); 65 y = (win_h / 2) - (h / 2);
66 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 66 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
67 eo_do(o_images[i], evas_obj_position_set(x, y)); 67 eo_do(o_images[i], efl_gfx_position_set(x, y));
68 eo_do(o_images[i + 1], evas_obj_position_set(x, y)); 68 eo_do(o_images[i + 1], efl_gfx_position_set(x, y));
69 } 69 }
70 FPS_STD(NAME); 70 FPS_STD(NAME);
71} 71}
diff --git a/src/bin/image_mask_3.c b/src/bin/image_mask_3.c
index 7d3e72d..6274a18 100644
--- a/src/bin/image_mask_3.c
+++ b/src/bin/image_mask_3.c
@@ -27,17 +27,17 @@ static void _setup(void)
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("e-logo-2.png"), NULL), 29 efl_file_set(build_path("e-logo-2.png"), NULL),
30 evas_obj_image_fill_set(0, 0, 120, 160), 30 efl_gfx_fill_set(0, 0, 120, 160),
31 evas_obj_size_set(120, 160), 31 efl_gfx_size_set(120, 160),
32 evas_obj_visibility_set(EINA_TRUE)); 32 efl_gfx_visible_set(EINA_TRUE));
33 33
34 o = eo_add(EVAS_IMAGE_CLASS,evas); 34 o = eo_add(EVAS_IMAGE_CLASS,evas);
35 o_images[i + 1] = o; 35 o_images[i + 1] = o;
36 eo_do(o, 36 eo_do(o,
37 efl_file_set(build_path("logo.png"), NULL), 37 efl_file_set(build_path("logo.png"), NULL),
38 evas_obj_image_fill_set(0, 0, 120, 160), 38 efl_gfx_fill_set(0, 0, 120, 160),
39 evas_obj_size_set(120, 160), 39 efl_gfx_size_set(120, 160),
40 evas_obj_visibility_set(EINA_TRUE)); 40 efl_gfx_visible_set(EINA_TRUE));
41 41
42 eo_do(o_images[i], evas_obj_clip_set(o)); 42 eo_do(o_images[i], evas_obj_clip_set(o));
43 } 43 }
@@ -64,8 +64,8 @@ static void _loop(double t, int f)
64 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 64 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
65 y = (win_h / 2) - (h / 2); 65 y = (win_h / 2) - (h / 2);
66 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 66 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
67 eo_do(o_images[i], evas_obj_position_set(x, y)); 67 eo_do(o_images[i], efl_gfx_position_set(x, y));
68 eo_do(o_images[i + 1], evas_obj_position_set(x, y)); 68 eo_do(o_images[i + 1], efl_gfx_position_set(x, y));
69 } 69 }
70 FPS_STD(NAME); 70 FPS_STD(NAME);
71} 71}
diff --git a/src/bin/image_mask_4.c b/src/bin/image_mask_4.c
index e342170..e8fc66b 100644
--- a/src/bin/image_mask_4.c
+++ b/src/bin/image_mask_4.c
@@ -27,10 +27,10 @@ static void _setup(void)
27 o_mask = o; 27 o_mask = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("e-logo-mask.png"), NULL), 29 efl_file_set(build_path("e-logo-mask.png"), NULL),
30 evas_obj_image_fill_set(0, 0, 720, 420), 30 efl_gfx_fill_set(0, 0, 720, 420),
31 evas_obj_size_set(720, 420), 31 efl_gfx_size_set(720, 420),
32 evas_obj_position_set((win_w - 720) / 2, (win_h - 420) / 2), 32 efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2),
33 evas_obj_visibility_set(EINA_TRUE)); 33 efl_gfx_visible_set(EINA_TRUE));
34 34
35 for (i = 0; i < OBNUM; i++) 35 for (i = 0; i < OBNUM; i++)
36 { 36 {
@@ -38,10 +38,10 @@ static void _setup(void)
38 o_images[i] = o; 38 o_images[i] = o;
39 eo_do(o, 39 eo_do(o,
40 efl_file_set(build_path("logo.png"), NULL), 40 efl_file_set(build_path("logo.png"), NULL),
41 evas_obj_image_fill_set(0, 0, 120, 160), 41 efl_gfx_fill_set(0, 0, 120, 160),
42 evas_obj_size_set(120, 160), 42 efl_gfx_size_set(120, 160),
43 evas_obj_clip_set(o_mask), 43 evas_obj_clip_set(o_mask),
44 evas_obj_visibility_set(EINA_TRUE)); 44 efl_gfx_visible_set(EINA_TRUE));
45 } 45 }
46 done = 0; 46 done = 0;
47} 47}
@@ -67,7 +67,7 @@ static void _loop(double t, int f)
67 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 67 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
68 y = (win_h / 2) - (h / 2); 68 y = (win_h / 2) - (h / 2);
69 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 69 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
70 eo_do(o_images[i], evas_obj_position_set(x, y)); 70 eo_do(o_images[i], efl_gfx_position_set(x, y));
71 } 71 }
72 FPS_STD(NAME); 72 FPS_STD(NAME);
73} 73}
diff --git a/src/bin/image_mask_5.c b/src/bin/image_mask_5.c
index 4499252..2ca680e 100644
--- a/src/bin/image_mask_5.c
+++ b/src/bin/image_mask_5.c
@@ -27,10 +27,10 @@ static void _setup(void)
27 o_mask = o; 27 o_mask = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("e-logo-2.png"), NULL), 29 efl_file_set(build_path("e-logo-2.png"), NULL),
30 evas_obj_image_fill_set(0, 0, 120, 160), 30 efl_gfx_fill_set(0, 0, 120, 160),
31 evas_obj_size_set(120, 160), 31 efl_gfx_size_set(120, 160),
32 evas_obj_position_set((win_w - 120) / 2, (win_h - 160) / 2), 32 efl_gfx_position_set((win_w - 120) / 2, (win_h - 160) / 2),
33 evas_obj_visibility_set(EINA_TRUE)); 33 efl_gfx_visible_set(EINA_TRUE));
34 34
35 for (i = 0; i < OBNUM; i++) 35 for (i = 0; i < OBNUM; i++)
36 { 36 {
@@ -38,10 +38,10 @@ static void _setup(void)
38 o_images[i] = o; 38 o_images[i] = o;
39 eo_do(o, 39 eo_do(o,
40 efl_file_set(build_path("logo.png"), NULL), 40 efl_file_set(build_path("logo.png"), NULL),
41 evas_obj_image_fill_set(0, 0, 120, 160), 41 efl_gfx_fill_set(0, 0, 120, 160),
42 evas_obj_size_set(120, 160), 42 efl_gfx_size_set(120, 160),
43 evas_obj_clip_set(o_mask), 43 evas_obj_clip_set(o_mask),
44 evas_obj_visibility_set(EINA_TRUE)); 44 efl_gfx_visible_set(EINA_TRUE));
45 } 45 }
46 done = 0; 46 done = 0;
47} 47}
@@ -67,7 +67,7 @@ static void _loop(double t, int f)
67 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 67 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
68 y = (win_h / 2) - (h / 2); 68 y = (win_h / 2) - (h / 2);
69 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 69 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
70 eo_do(o_images[i], evas_obj_position_set(x, y)); 70 eo_do(o_images[i], efl_gfx_position_set(x, y));
71 } 71 }
72 FPS_STD(NAME); 72 FPS_STD(NAME);
73} 73}
diff --git a/src/bin/image_mask_6.c b/src/bin/image_mask_6.c
index e2cf72f..4db7699 100644
--- a/src/bin/image_mask_6.c
+++ b/src/bin/image_mask_6.c
@@ -27,10 +27,10 @@ static void _setup(void)
27 o_mask = o; 27 o_mask = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("e-logo-mask.png"), NULL), 29 efl_file_set(build_path("e-logo-mask.png"), NULL),
30 evas_obj_image_fill_set(0, 0, 720, 420), 30 efl_gfx_fill_set(0, 0, 720, 420),
31 evas_obj_size_set(720, 420), 31 efl_gfx_size_set(720, 420),
32 evas_obj_position_set((win_w - 720) / 2, (win_h - 420) / 2), 32 efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2),
33 evas_obj_visibility_set(EINA_TRUE)); 33 efl_gfx_visible_set(EINA_TRUE));
34 34
35 for (i = 0; i < OBNUM; i++) 35 for (i = 0; i < OBNUM; i++)
36 { 36 {
@@ -38,10 +38,10 @@ static void _setup(void)
38 o_images[i] = o; 38 o_images[i] = o;
39 eo_do(o, 39 eo_do(o,
40 efl_file_set(build_path("logo.png"), NULL), 40 efl_file_set(build_path("logo.png"), NULL),
41 evas_obj_image_fill_set(0, 0, 120 / 2, 160 / 2), 41 efl_gfx_fill_set(0, 0, 120 / 2, 160 / 2),
42 evas_obj_size_set(120 / 2, 160 / 2), 42 efl_gfx_size_set(120 / 2, 160 / 2),
43 evas_obj_clip_set(o_mask), 43 evas_obj_clip_set(o_mask),
44 evas_obj_visibility_set(EINA_TRUE)); 44 efl_gfx_visible_set(EINA_TRUE));
45 } 45 }
46 done = 0; 46 done = 0;
47} 47}
@@ -67,7 +67,7 @@ static void _loop(double t, int f)
67 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 67 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
68 y = (win_h / 2) - (h / 2); 68 y = (win_h / 2) - (h / 2);
69 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 69 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
70 eo_do(o_images[i], evas_obj_position_set(x, y)); 70 eo_do(o_images[i], efl_gfx_position_set(x, y));
71 } 71 }
72 FPS_STD(NAME); 72 FPS_STD(NAME);
73} 73}
diff --git a/src/bin/image_mask_7.c b/src/bin/image_mask_7.c
index e75eeaa..58ee03b 100644
--- a/src/bin/image_mask_7.c
+++ b/src/bin/image_mask_7.c
@@ -27,10 +27,10 @@ static void _setup(void)
27 o_mask = o; 27 o_mask = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("e-logo-2.png"), NULL), 29 efl_file_set(build_path("e-logo-2.png"), NULL),
30 evas_obj_image_fill_set(0, 0, 120, 160), 30 efl_gfx_fill_set(0, 0, 120, 160),
31 evas_obj_size_set(120, 160), 31 efl_gfx_size_set(120, 160),
32 evas_obj_position_set((win_w - 120) / 2, (win_h - 160) / 2), 32 efl_gfx_position_set((win_w - 120) / 2, (win_h - 160) / 2),
33 evas_obj_visibility_set(EINA_TRUE)); 33 efl_gfx_visible_set(EINA_TRUE));
34 34
35 for (i = 0; i < OBNUM; i++) 35 for (i = 0; i < OBNUM; i++)
36 { 36 {
@@ -38,10 +38,10 @@ static void _setup(void)
38 o_images[i] = o; 38 o_images[i] = o;
39 eo_do(o, 39 eo_do(o,
40 efl_file_set(build_path("logo.png"), NULL), 40 efl_file_set(build_path("logo.png"), NULL),
41 evas_obj_image_fill_set(0, 0, 120, 160), 41 efl_gfx_fill_set(0, 0, 120, 160),
42 evas_obj_size_set(120, 160), 42 efl_gfx_size_set(120, 160),
43 evas_obj_clip_set(o_mask), 43 evas_obj_clip_set(o_mask),
44 evas_obj_visibility_set(EINA_TRUE)); 44 efl_gfx_visible_set(EINA_TRUE));
45 } 45 }
46 done = 0; 46 done = 0;
47} 47}
@@ -67,14 +67,14 @@ static void _loop(double t, int f)
67 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 67 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
68 y = (win_h / 2) - (h / 2); 68 y = (win_h / 2) - (h / 2);
69 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 69 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
70 eo_do(o_images[i], evas_obj_position_set(x, y)); 70 eo_do(o_images[i], efl_gfx_position_set(x, y));
71 } 71 }
72 w = 10 + (110 + (110 * sin((double)(f) / (14.3 * SLOW)))); 72 w = 10 + (110 + (110 * sin((double)(f) / (14.3 * SLOW))));
73 h = 10 + (150 + (150 * sin((double)(f) / (21.7 * SLOW)))); 73 h = 10 + (150 + (150 * sin((double)(f) / (21.7 * SLOW))));
74 eo_do(o_mask, 74 eo_do(o_mask,
75 evas_obj_image_fill_set(0, 0, w, h), 75 efl_gfx_fill_set(0, 0, w, h),
76 evas_obj_size_set(w, h), 76 efl_gfx_size_set(w, h),
77 evas_obj_position_set((win_w - w) / 2, (win_h - h) / 2)); 77 efl_gfx_position_set((win_w - w) / 2, (win_h - h) / 2));
78 FPS_STD(NAME); 78 FPS_STD(NAME);
79} 79}
80 80
diff --git a/src/bin/image_mask_8.c b/src/bin/image_mask_8.c
index d616496..a9adc86 100644
--- a/src/bin/image_mask_8.c
+++ b/src/bin/image_mask_8.c
@@ -27,10 +27,10 @@ static void _setup(void)
27 o_mask = o; 27 o_mask = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("e-logo-mask.png"), NULL), 29 efl_file_set(build_path("e-logo-mask.png"), NULL),
30 evas_obj_image_fill_set(0, 0, 720, 420), 30 efl_gfx_fill_set(0, 0, 720, 420),
31 evas_obj_size_set(720, 420), 31 efl_gfx_size_set(720, 420),
32 evas_obj_position_set((win_w - 720) / 2, (win_h - 420) / 2), 32 efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2),
33 evas_obj_visibility_set(EINA_TRUE)); 33 efl_gfx_visible_set(EINA_TRUE));
34 34
35 for (i = 0; i < 1; i++) 35 for (i = 0; i < 1; i++)
36 { 36 {
@@ -38,10 +38,10 @@ static void _setup(void)
38 o_images[i] = o; 38 o_images[i] = o;
39 eo_do(o, 39 eo_do(o,
40 efl_file_set(build_path("texture.png"), NULL), 40 efl_file_set(build_path("texture.png"), NULL),
41 evas_obj_image_fill_set(0, 0, 500, 444), 41 efl_gfx_fill_set(0, 0, 500, 444),
42 evas_obj_size_set(win_w * 4, win_h * 4), 42 efl_gfx_size_set(win_w * 4, win_h * 4),
43 evas_obj_clip_set(o_mask), 43 evas_obj_clip_set(o_mask),
44 evas_obj_visibility_set(EINA_TRUE)); 44 efl_gfx_visible_set(EINA_TRUE));
45 } 45 }
46 done = 0; 46 done = 0;
47} 47}
@@ -67,7 +67,7 @@ static void _loop(double t, int f)
67 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (500 / 2); 67 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (500 / 2);
68 y = (win_h / 2) - (h / 2); 68 y = (win_h / 2) - (h / 2);
69 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (444 / 2); 69 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (444 / 2);
70 eo_do(o_images[i], evas_obj_position_set(x, y)); 70 eo_do(o_images[i], efl_gfx_position_set(x, y));
71 } 71 }
72 FPS_STD(NAME); 72 FPS_STD(NAME);
73} 73}
diff --git a/src/bin/image_mask_9.c b/src/bin/image_mask_9.c
index e50be76..8bc63e1 100644
--- a/src/bin/image_mask_9.c
+++ b/src/bin/image_mask_9.c
@@ -27,10 +27,10 @@ static void _setup(void)
27 o_mask = o; 27 o_mask = o;
28 eo_do(o, 28 eo_do(o,
29 efl_file_set(build_path("e-logo-mask.png"), NULL), 29 efl_file_set(build_path("e-logo-mask.png"), NULL),
30 evas_obj_image_fill_set(0, 0, 720, 420), 30 efl_gfx_fill_set(0, 0, 720, 420),
31 evas_obj_size_set(720, 420), 31 efl_gfx_size_set(720, 420),
32 evas_obj_position_set((win_w - 720) / 2, (win_h - 420) / 2), 32 efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2),
33 evas_obj_visibility_set(EINA_TRUE)); 33 efl_gfx_visible_set(EINA_TRUE));
34 34
35 for (i = 0; i < 1; i++) 35 for (i = 0; i < 1; i++)
36 { 36 {
@@ -38,10 +38,10 @@ static void _setup(void)
38 o_images[i] = o; 38 o_images[i] = o;
39 eo_do(o, 39 eo_do(o,
40 efl_file_set(build_path("texture.png"), NULL), 40 efl_file_set(build_path("texture.png"), NULL),
41 evas_obj_image_fill_set(0, 0, 500, 444), 41 efl_gfx_fill_set(0, 0, 500, 444),
42 evas_obj_size_set(win_w * 4, win_h * 4), 42 efl_gfx_size_set(win_w * 4, win_h * 4),
43 evas_obj_clip_set(o_mask), 43 evas_obj_clip_set(o_mask),
44 evas_obj_visibility_set(EINA_TRUE)); 44 efl_gfx_visible_set(EINA_TRUE));
45 } 45 }
46 done = 0; 46 done = 0;
47} 47}
@@ -68,7 +68,7 @@ static void _loop(double t, int f)
68 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (500 / 2); 68 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (500 / 2);
69 y = (win_h / 2) - (h / 2); 69 y = (win_h / 2) - (h / 2);
70 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (444 / 2); 70 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (444 / 2);
71 eo_do(o_images[i], evas_obj_position_set(x, y)); 71 eo_do(o_images[i], efl_gfx_position_set(x, y));
72 } 72 }
73 if (!m) m = evas_map_new(4); 73 if (!m) m = evas_map_new(4);
74 74
diff --git a/src/bin/image_quality_scale.c b/src/bin/image_quality_scale.c
index 9f9b775..039bb20 100644
--- a/src/bin/image_quality_scale.c
+++ b/src/bin/image_quality_scale.c
@@ -27,9 +27,9 @@ static void _setup(void)
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, efl_file_set(build_path("tp.png"), NULL), 29 eo_do(o, efl_file_set(build_path("tp.png"), NULL),
30 evas_obj_image_fill_set(0, 0, 640, 480), 30 efl_gfx_fill_set(0, 0, 640, 480),
31 evas_obj_size_set(640, 480), 31 efl_gfx_size_set(640, 480),
32 evas_obj_visibility_set(EINA_TRUE)); 32 efl_gfx_visible_set(EINA_TRUE));
33 } 33 }
34 done = 0; 34 done = 0;
35} 35}
@@ -54,9 +54,9 @@ static void _loop(double t, int f)
54 h *= (f / 100.0) * 4.0; 54 h *= (f / 100.0) * 4.0;
55 x = (win_w / 2) - (w / 2); 55 x = (win_w / 2) - (w / 2);
56 y = (win_h / 2) - (h / 2); 56 y = (win_h / 2) - (h / 2);
57 eo_do(o_images[i], evas_obj_position_set(x, y), 57 eo_do(o_images[i], efl_gfx_position_set(x, y),
58 evas_obj_size_set(w, h), 58 efl_gfx_size_set(w, h),
59 evas_obj_image_fill_set(0, 0, w, h)); 59 efl_gfx_fill_set(0, 0, w, h));
60 } 60 }
61 FPS_STD(NAME); 61 FPS_STD(NAME);
62} 62}
diff --git a/src/bin/line_blend.c b/src/bin/line_blend.c
index 9ee5e18..5ccc566 100644
--- a/src/bin/line_blend.c
+++ b/src/bin/line_blend.c
@@ -33,12 +33,12 @@ static void _setup(void)
33 g = ((rnd()&0xff) * a) / 255; 33 g = ((rnd()&0xff) * a) / 255;
34 b = ((rnd()&0xff) * a) / 255; 34 b = ((rnd()&0xff) * a) / 255;
35 eo_do(o, 35 eo_do(o,
36 evas_obj_color_set(r, g, b, a), 36 efl_gfx_color_set(r, g, b, a),
37 evas_obj_line_xy_set(((win_w / 2) * (rnd()&0xff)) / 255, 37 evas_obj_line_xy_set(((win_w / 2) * (rnd()&0xff)) / 255,
38 ((win_h / 2) * (rnd()&0xff)) / 255, 38 ((win_h / 2) * (rnd()&0xff)) / 255,
39 ((win_w / 2) * (rnd()&0xff)) / 255 + (win_w / 2), 39 ((win_w / 2) * (rnd()&0xff)) / 255 + (win_w / 2),
40 ((win_h / 2) * (rnd()&0xff)) / 255 + (win_h / 2)), 40 ((win_h / 2) * (rnd()&0xff)) / 255 + (win_h / 2)),
41 evas_obj_visibility_set(EINA_TRUE)); 41 efl_gfx_visible_set(EINA_TRUE));
42 42
43 43
44 } 44 }
diff --git a/src/bin/poly_blend.c b/src/bin/poly_blend.c
index 5aa8340..1ea46c2 100644
--- a/src/bin/poly_blend.c
+++ b/src/bin/poly_blend.c
@@ -80,8 +80,8 @@ static void _setup(void)
80 g = ((rnd()&0xff) * a) / 255; 80 g = ((rnd()&0xff) * a) / 255;
81 b = ((rnd()&0xff) * a) / 255; 81 b = ((rnd()&0xff) * a) / 255;
82 if (o) 82 if (o)
83 eo_do(o, evas_obj_color_set(r, g, b, a), 83 eo_do(o, efl_gfx_color_set(r, g, b, a),
84 evas_obj_visibility_set(EINA_TRUE)); 84 efl_gfx_visible_set(EINA_TRUE));
85 poly(o, i, 0, 0); 85 poly(o, i, 0, 0);
86 } 86 }
87 done = 0; 87 done = 0;
@@ -105,13 +105,13 @@ static void _loop(double t, int f)
105 { 105 {
106 o = o_images[i]; 106 o = o_images[i];
107 if (o) 107 if (o)
108 eo_do(o, evas_obj_size_get(&w, &h)); 108 eo_do(o, efl_gfx_size_get(&w, &h));
109 x = (win_w / 2) - (w / 2); 109 x = (win_w / 2) - (w / 2);
110 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 4); 110 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 4);
111 y = (win_h / 2) - (h / 2); 111 y = (win_h / 2) - (h / 2);
112 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 4); 112 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 4);
113 if (o) 113 if (o)
114 eo_do(o, evas_obj_position_set(x, y)); 114 eo_do(o, efl_gfx_position_set(x, y));
115 } 115 }
116 FPS_STD(NAME); 116 FPS_STD(NAME);
117} 117}
diff --git a/src/bin/proxy_image.c b/src/bin/proxy_image.c
index a768c50..b520a11 100644
--- a/src/bin/proxy_image.c
+++ b/src/bin/proxy_image.c
@@ -25,9 +25,9 @@ static void _setup(void)
25 o = eo_add(EVAS_IMAGE_CLASS, evas); 25 o = eo_add(EVAS_IMAGE_CLASS, evas);
26 eo_do(o, 26 eo_do(o,
27 efl_file_set(build_path("logo.png"), NULL), 27 efl_file_set(build_path("logo.png"), NULL),
28 evas_obj_image_fill_set(0, 0, 120, 160), 28 efl_gfx_fill_set(0, 0, 120, 160),
29 evas_obj_size_set(120, 160), 29 efl_gfx_size_set(120, 160),
30 evas_obj_visibility_set(EINA_TRUE)); 30 efl_gfx_visible_set(EINA_TRUE));
31 src = o; 31 src = o;
32 o_images[0] = src; 32 o_images[0] = src;
33 33
@@ -37,9 +37,9 @@ static void _setup(void)
37 o_images[i] = o; 37 o_images[i] = o;
38 eo_do(o, 38 eo_do(o,
39 evas_obj_image_source_set(src), 39 evas_obj_image_source_set(src),
40 evas_obj_size_set(120, 160), 40 efl_gfx_size_set(120, 160),
41 evas_obj_image_fill_set(0,0,120,160), 41 efl_gfx_fill_set(0,0,120,160),
42 evas_obj_visibility_set(EINA_TRUE)); 42 efl_gfx_visible_set(EINA_TRUE));
43 } 43 }
44 done = 0; 44 done = 0;
45} 45}
@@ -64,7 +64,7 @@ static void _loop(double t, int f)
64 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 64 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
65 y = (win_h / 2) - (h / 2); 65 y = (win_h / 2) - (h / 2);
66 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 66 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
67 eo_do(o_images[i], evas_obj_position_set(x, y)); 67 eo_do(o_images[i], efl_gfx_position_set(x, y));
68 } 68 }
69 FPS_STD(NAME); 69 FPS_STD(NAME);
70} 70}
diff --git a/src/bin/proxy_image_offscreen.c b/src/bin/proxy_image_offscreen.c
index 45b4f2c..8cfe51c 100644
--- a/src/bin/proxy_image_offscreen.c
+++ b/src/bin/proxy_image_offscreen.c
@@ -28,9 +28,9 @@ static void _setup(void)
28 28
29 o = eo_add(EVAS_IMAGE_CLASS, evas); 29 o = eo_add(EVAS_IMAGE_CLASS, evas);
30 eo_do(o, efl_file_set(build_path("logo.png"), NULL), 30 eo_do(o, efl_file_set(build_path("logo.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 efl_gfx_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 efl_gfx_size_set(120, 160),
33 evas_obj_position_set(-400, -300)); 33 efl_gfx_position_set(-400, -300));
34 src = o; 34 src = o;
35 35
36 for (i = 0; i < OBNUM / 2; i++) 36 for (i = 0; i < OBNUM / 2; i++)
@@ -38,9 +38,9 @@ static void _setup(void)
38 o = eo_add(EVAS_IMAGE_CLASS, evas); 38 o = eo_add(EVAS_IMAGE_CLASS, evas);
39 o_images[i] = o; 39 o_images[i] = o;
40 eo_do(o, evas_obj_image_source_set(src, NULL), 40 eo_do(o, evas_obj_image_source_set(src, NULL),
41 evas_obj_size_set(120, 160), 41 efl_gfx_size_set(120, 160),
42 evas_obj_image_fill_set(0,0,120,160), 42 efl_gfx_fill_set(0,0,120,160),
43 evas_obj_visibility_set(EINA_TRUE)); 43 efl_gfx_visible_set(EINA_TRUE));
44 } 44 }
45 done = 0; 45 done = 0;
46} 46}
@@ -65,7 +65,7 @@ static void _loop(double t, int f)
65 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 65 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
66 y = (win_h / 2) - (h / 2); 66 y = (win_h / 2) - (h / 2);
67 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 67 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
68 eo_do(o_images[i], evas_obj_position_set(x, y)); 68 eo_do(o_images[i], efl_gfx_position_set(x, y));
69 } 69 }
70 FPS_STD(NAME); 70 FPS_STD(NAME);
71} 71}
diff --git a/src/bin/proxy_text_fixed.c b/src/bin/proxy_text_fixed.c
index 8443e4b..b391a0a 100644
--- a/src/bin/proxy_text_fixed.c
+++ b/src/bin/proxy_text_fixed.c
@@ -33,12 +33,12 @@ static void _setup(void)
33 efl_text_properties_font_set("Vera-Bold", 20), 33 efl_text_properties_font_set("Vera-Bold", 20),
34 efl_text_set("This is a test string"), 34 efl_text_set("This is a test string"),
35 evas_obj_text_style_set(st), 35 evas_obj_text_style_set(st),
36 evas_obj_color_set(255, 255, 255, 255), 36 efl_gfx_color_set(255, 255, 255, 255),
37 evas_obj_text_shadow_color_set(0, 0, 0, 24), 37 evas_obj_text_shadow_color_set(0, 0, 0, 24),
38 evas_obj_text_glow_color_set(100, 80, 40, 100), 38 evas_obj_text_glow_color_set(100, 80, 40, 100),
39 evas_obj_text_glow2_color_set(50, 10, 5, 50), 39 evas_obj_text_glow2_color_set(50, 10, 5, 50),
40 evas_obj_text_outline_color_set(0, 0, 0, 255), 40 evas_obj_text_outline_color_set(0, 0, 0, 255),
41 evas_obj_visibility_set(EINA_TRUE)); 41 efl_gfx_visible_set(EINA_TRUE));
42 st++; 42 st++;
43 } 43 }
44 st = i; 44 st = i;
@@ -50,11 +50,11 @@ static void _setup(void)
50 o_texts[i] = o; 50 o_texts[i] = o;
51 eo_do(o, evas_obj_image_source_set(s)); 51 eo_do(o, evas_obj_image_source_set(s));
52 /* FIXME s == NULL*/ 52 /* FIXME s == NULL*/
53 eo_do(s, evas_obj_size_get(&w, &h)); 53 eo_do(s, efl_gfx_size_get(&w, &h));
54 eo_do(o, 54 eo_do(o,
55 evas_obj_size_set(w, h), 55 efl_gfx_size_set(w, h),
56 evas_obj_image_fill_set(0, 0, w, h), 56 efl_gfx_fill_set(0, 0, w, h),
57 evas_obj_visibility_set(EINA_TRUE)); 57 efl_gfx_visible_set(EINA_TRUE));
58 } 58 }
59 59
60 done = 0; 60 done = 0;
@@ -74,12 +74,12 @@ static void _loop(double t, int f)
74 Evas_Coord x, y, w, h; 74 Evas_Coord x, y, w, h;
75 for (i = 0; i < OBNUM; i++) 75 for (i = 0; i < OBNUM; i++)
76 { 76 {
77 eo_do(o_texts[i], evas_obj_size_get(&w, &h)); 77 eo_do(o_texts[i], efl_gfx_size_get(&w, &h));
78 x = (win_w / 2) - (w / 2); 78 x = (win_w / 2) - (w / 2);
79 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 79 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
80 y = (win_h / 2) - (h / 2); 80 y = (win_h / 2) - (h / 2);
81 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2); 81 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
82 eo_do(o_texts[i], evas_obj_position_set(x, y)); 82 eo_do(o_texts[i], efl_gfx_position_set(x, y));
83 } 83 }
84 FPS_STD(NAME); 84 FPS_STD(NAME);
85} 85}
diff --git a/src/bin/proxy_text_random.c b/src/bin/proxy_text_random.c
index 81105f5..f2f2670 100644
--- a/src/bin/proxy_text_random.c
+++ b/src/bin/proxy_text_random.c
@@ -41,30 +41,30 @@ static void _setup(void)
41 eo_do(o, 41 eo_do(o,
42 efl_text_properties_font_set("Vera-Bold", 20), 42 efl_text_properties_font_set("Vera-Bold", 20),
43 efl_text_set(buf), 43 efl_text_set(buf),
44 evas_obj_color_set(0, 0, 0, 255), 44 efl_gfx_color_set(0, 0, 0, 255),
45 evas_obj_size_get(&w, &h)); 45 efl_gfx_size_get(&w, &h));
46 x = (win_w / 2) - (w / 2); 46 x = (win_w / 2) - (w / 2);
47 x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2); 47 x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2);
48 y = (win_h / 2) - (h / 2); 48 y = (win_h / 2) - (h / 2);
49 y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2); 49 y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2);
50 eo_do(o, 50 eo_do(o,
51 evas_obj_position_set(x, y), 51 efl_gfx_position_set(x, y),
52 evas_obj_visibility_set(EINA_TRUE)); 52 efl_gfx_visible_set(EINA_TRUE));
53 for (i = 1 ; i < OBNUM ; i ++) 53 for (i = 1 ; i < OBNUM ; i ++)
54 { 54 {
55 o = eo_add(EVAS_IMAGE_CLASS, evas); 55 o = eo_add(EVAS_IMAGE_CLASS, evas);
56 o_texts[i] = o; 56 o_texts[i] = o;
57 eo_do(o, 57 eo_do(o,
58 evas_obj_image_source_set(o_texts[0])); 58 evas_obj_image_source_set(o_texts[0]));
59 eo_do(o_texts[0], evas_obj_size_get(&w, &h)); 59 eo_do(o_texts[0], efl_gfx_size_get(&w, &h));
60 eo_do(o, evas_obj_size_set(w, h), 60 eo_do(o, efl_gfx_size_set(w, h),
61 evas_obj_image_fill_set(0, 0, w, h)); 61 efl_gfx_fill_set(0, 0, w, h));
62 x = (win_w / 2) - (w / 2); 62 x = (win_w / 2) - (w / 2);
63 x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2); 63 x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2);
64 y = (win_h / 2) - (h / 2); 64 y = (win_h / 2) - (h / 2);
65 y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2); 65 y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2);
66 eo_do(o, evas_obj_position_set(x, y), 66 eo_do(o, efl_gfx_position_set(x, y),
67 evas_obj_visibility_set(EINA_TRUE)); 67 efl_gfx_visible_set(EINA_TRUE));
68 } 68 }
69 69
70 done = 0; 70 done = 0;
@@ -94,12 +94,12 @@ static void _loop(double t, int f)
94 strs[rnd() % (sizeof(strs) / sizeof(char *))]); 94 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
95 eo_do(o_texts[0], 95 eo_do(o_texts[0],
96 efl_text_set(buf), 96 efl_text_set(buf),
97 evas_obj_size_get(&w, &h)); 97 efl_gfx_size_get(&w, &h));
98 for (i = 1; i < OBNUM; i++) 98 for (i = 1; i < OBNUM; i++)
99 { 99 {
100 eo_do(o_texts[i], 100 eo_do(o_texts[i],
101 evas_obj_size_set(w,h), 101 efl_gfx_size_set(w,h),
102 evas_obj_image_fill_set(0,0,w,h)); 102 efl_gfx_fill_set(0,0,w,h));
103 } 103 }
104 FPS_STD(NAME); 104 FPS_STD(NAME);
105} 105}
diff --git a/src/bin/rect_blend.c b/src/bin/rect_blend.c
index 2a24694..40a1538 100644
--- a/src/bin/rect_blend.c
+++ b/src/bin/rect_blend.c
@@ -33,8 +33,8 @@ static void _setup(void)
33 g = ((rnd()&0xff) * a) / 255; 33 g = ((rnd()&0xff) * a) / 255;
34 b = ((rnd()&0xff) * a) / 255; 34 b = ((rnd()&0xff) * a) / 255;
35 eo_do(o, 35 eo_do(o,
36 evas_obj_color_set(r, g, b, a), 36 efl_gfx_color_set(r, g, b, a),
37 evas_obj_visibility_set(EINA_TRUE)); 37 efl_gfx_visible_set(EINA_TRUE));
38 } 38 }
39 done = 0; 39 done = 0;
40} 40}
@@ -62,8 +62,8 @@ static void _loop(double t, int f)
62 y = (win_h / 2) - (h / 2); 62 y = (win_h / 2) - (h / 2);
63 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 63 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
64 eo_do(o_images[i], 64 eo_do(o_images[i],
65 evas_obj_position_set(x, y), 65 efl_gfx_position_set(x, y),
66 evas_obj_size_set(w, h)); 66 efl_gfx_size_set(w, h));
67 } 67 }
68 FPS_STD(NAME); 68 FPS_STD(NAME);
69} 69}
diff --git a/src/bin/rect_blend_few.c b/src/bin/rect_blend_few.c
index 15985b4..63e7adb 100644
--- a/src/bin/rect_blend_few.c
+++ b/src/bin/rect_blend_few.c
@@ -35,8 +35,8 @@ static void _setup(void)
35 r = ((rnd()&0xff) * a) / 255; 35 r = ((rnd()&0xff) * a) / 255;
36 g = ((rnd()&0xff) * a) / 255; 36 g = ((rnd()&0xff) * a) / 255;
37 b = ((rnd()&0xff) * a) / 255; 37 b = ((rnd()&0xff) * a) / 255;
38 eo_do(o, evas_obj_color_set(r, g, b, a), 38 eo_do(o, efl_gfx_color_set(r, g, b, a),
39 evas_obj_visibility_set(EINA_TRUE)); 39 efl_gfx_visible_set(EINA_TRUE));
40 } 40 }
41 done = 0; 41 done = 0;
42} 42}
@@ -63,8 +63,8 @@ static void _loop(double t, int f)
63 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2); 63 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
64 y = (win_h / 2) - (h / 2); 64 y = (win_h / 2) - (h / 2);
65 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2); 65 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
66 eo_do(o_images[i], evas_obj_position_set(x, y), 66 eo_do(o_images[i], efl_gfx_position_set(x, y),
67 evas_obj_size_set(w, h)); 67 efl_gfx_size_set(w, h));
68 } 68 }
69 FPS_STD(NAME); 69 FPS_STD(NAME);
70} 70}
diff --git a/src/bin/rect_blend_pow2.c b/src/bin/rect_blend_pow2.c
index f4df639..c1d0c6e 100644
--- a/src/bin/rect_blend_pow2.c
+++ b/src/bin/rect_blend_pow2.c
@@ -34,8 +34,8 @@ static void _setup(void)
34 g = ((rnd()&0xff) * a) / 255; 34 g = ((rnd()&0xff) * a) / 255;
35 b = ((rnd()&0xff) * a) / 255; 35 b = ((rnd()&0xff) * a) / 255;
36 eo_do(o, 36 eo_do(o,
37 evas_obj_color_set(r, g, b, a), 37 efl_gfx_color_set(r, g, b, a),
38 evas_obj_visibility_set(EINA_TRUE)); 38 efl_gfx_visible_set(EINA_TRUE));
39 } 39 }
40 done = 0; 40 done = 0;
41} 41}
@@ -63,8 +63,8 @@ static void _loop(double t, int f)
63 y = (win_h / 2) - (h / 2); 63 y = (win_h / 2) - (h / 2);
64 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 64 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
65 eo_do(o_images[i], 65 eo_do(o_images[i],
66 evas_obj_position_set(x, y), 66 efl_gfx_position_set(x, y),
67 evas_obj_size_set(w, h)); 67 efl_gfx_size_set(w, h));
68 } 68 }
69 FPS_STD(NAME); 69 FPS_STD(NAME);
70} 70}
diff --git a/src/bin/rect_blend_pow2_few.c b/src/bin/rect_blend_pow2_few.c
index 465bd82..7c33a67 100644
--- a/src/bin/rect_blend_pow2_few.c
+++ b/src/bin/rect_blend_pow2_few.c
@@ -36,8 +36,8 @@ static void _setup(void)
36 r = ((rnd()&0xff) * a) / 255; 36 r = ((rnd()&0xff) * a) / 255;
37 g = ((rnd()&0xff) * a) / 255; 37 g = ((rnd()&0xff) * a) / 255;
38 b = ((rnd()&0xff) * a) / 255; 38 b = ((rnd()&0xff) * a) / 255;
39 eo_do(o, evas_obj_color_set(r, g, b, a), 39 eo_do(o, efl_gfx_color_set(r, g, b, a),
40 evas_obj_visibility_set(EINA_TRUE)); 40 efl_gfx_visible_set(EINA_TRUE));
41 } 41 }
42 done = 0; 42 done = 0;
43} 43}
@@ -64,8 +64,8 @@ static void _loop(double t, int f)
64 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2); 64 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
65 y = (win_h / 2) - (h / 2); 65 y = (win_h / 2) - (h / 2);
66 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2); 66 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
67 eo_do(o_images[i], evas_obj_position_set(x, y), 67 eo_do(o_images[i], efl_gfx_position_set(x, y),
68 evas_obj_size_set(w, h)); 68 efl_gfx_size_set(w, h));
69 } 69 }
70 FPS_STD(NAME); 70 FPS_STD(NAME);
71} 71}
diff --git a/src/bin/rect_solid.c b/src/bin/rect_solid.c
index 071bdf4..d2d282f 100644
--- a/src/bin/rect_solid.c
+++ b/src/bin/rect_solid.c
@@ -33,8 +33,8 @@ static void _setup(void)
33 g = ((rnd()&0xff) * a) / 255; 33 g = ((rnd()&0xff) * a) / 255;
34 b = ((rnd()&0xff) * a) / 255; 34 b = ((rnd()&0xff) * a) / 255;
35 eo_do(o, 35 eo_do(o,
36 evas_obj_color_set(r, g, b, a), 36 efl_gfx_color_set(r, g, b, a),
37 evas_obj_visibility_set(EINA_TRUE)); 37 efl_gfx_visible_set(EINA_TRUE));
38 } 38 }
39 done = 0; 39 done = 0;
40} 40}
@@ -62,8 +62,8 @@ static void _loop(double t, int f)
62 y = (win_h / 2) - (h / 2); 62 y = (win_h / 2) - (h / 2);
63 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 63 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
64 eo_do(o_images[i], 64 eo_do(o_images[i],
65 evas_obj_position_set(x, y), 65 efl_gfx_position_set(x, y),
66 evas_obj_size_set(w, h)); 66 efl_gfx_size_set(w, h));
67 } 67 }
68 FPS_STD(NAME); 68 FPS_STD(NAME);
69} 69}
diff --git a/src/bin/rect_solid_few.c b/src/bin/rect_solid_few.c
index 917a96c..81aef86 100644
--- a/src/bin/rect_solid_few.c
+++ b/src/bin/rect_solid_few.c
@@ -35,8 +35,8 @@ static void _setup(void)
35 r = ((rnd()&0xff) * a) / 255; 35 r = ((rnd()&0xff) * a) / 255;
36 g = ((rnd()&0xff) * a) / 255; 36 g = ((rnd()&0xff) * a) / 255;
37 b = ((rnd()&0xff) * a) / 255; 37 b = ((rnd()&0xff) * a) / 255;
38 eo_do(o, evas_obj_color_set(r, g, b, a), 38 eo_do(o, efl_gfx_color_set(r, g, b, a),
39 evas_obj_visibility_set(EINA_TRUE)); 39 efl_gfx_visible_set(EINA_TRUE));
40 } 40 }
41 done = 0; 41 done = 0;
42} 42}
@@ -63,8 +63,8 @@ static void _loop(double t, int f)
63 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2); 63 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
64 y = (win_h / 2) - (h / 2); 64 y = (win_h / 2) - (h / 2);
65 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2); 65 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
66 eo_do(o_images[i], evas_obj_position_set(x, y), 66 eo_do(o_images[i], efl_gfx_position_set(x, y),
67 evas_obj_size_set(w, h)); 67 efl_gfx_size_set(w, h));
68 } 68 }
69 FPS_STD(NAME); 69 FPS_STD(NAME);
70} 70}
diff --git a/src/bin/text_basic.c b/src/bin/text_basic.c
index be51708..76f2ef4 100644
--- a/src/bin/text_basic.c
+++ b/src/bin/text_basic.c
@@ -29,8 +29,8 @@ static void _setup(void)
29 o_texts[i] = o; 29 o_texts[i] = o;
30 eo_do(o, efl_text_properties_font_set("Vera-Bold", 20), 30 eo_do(o, efl_text_properties_font_set("Vera-Bold", 20),
31 efl_text_set("This is a test string"), 31 efl_text_set("This is a test string"),
32 evas_obj_color_set(0, 0, 0, 255), 32 efl_gfx_color_set(0, 0, 0, 255),
33 evas_obj_visibility_set(EINA_TRUE)); 33 efl_gfx_visible_set(EINA_TRUE));
34 } 34 }
35 done = 0; 35 done = 0;
36} 36}
@@ -49,12 +49,12 @@ static void _loop(double t, int f)
49 Evas_Coord x, y, w, h; 49 Evas_Coord x, y, w, h;
50 for (i = 0; i < OBNUM; i++) 50 for (i = 0; i < OBNUM; i++)
51 { 51 {
52 eo_do(o_texts[i], evas_obj_size_get(&w, &h)); 52 eo_do(o_texts[i], efl_gfx_size_get(&w, &h));
53 x = (win_w / 2) - (w / 2); 53 x = (win_w / 2) - (w / 2);
54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
55 y = (win_h / 2) - (h / 2); 55 y = (win_h / 2) - (h / 2);
56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
57 eo_do(o_texts[i], evas_obj_position_set(x, y)); 57 eo_do(o_texts[i], efl_gfx_position_set(x, y));
58 } 58 }
59 FPS_STD(NAME); 59 FPS_STD(NAME);
60} 60}
diff --git a/src/bin/text_change.c b/src/bin/text_change.c
index 25db3cf..efe893b 100644
--- a/src/bin/text_change.c
+++ b/src/bin/text_change.c
@@ -41,14 +41,14 @@ static void _setup(void)
41 strs[rnd() % (sizeof(strs) / sizeof(char *))], 41 strs[rnd() % (sizeof(strs) / sizeof(char *))],
42 strs[rnd() % (sizeof(strs) / sizeof(char *))]); 42 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
43 eo_do(o, efl_text_set(buf), 43 eo_do(o, efl_text_set(buf),
44 evas_obj_color_set(0, 0, 0, 255), 44 efl_gfx_color_set(0, 0, 0, 255),
45 evas_obj_size_get(&w, &h)); 45 efl_gfx_size_get(&w, &h));
46 x = (win_w / 2) - (w / 2); 46 x = (win_w / 2) - (w / 2);
47 x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2); 47 x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2);
48 y = (win_h / 2) - (h / 2); 48 y = (win_h / 2) - (h / 2);
49 y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2); 49 y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2);
50 eo_do(o, evas_obj_position_set(x, y), 50 eo_do(o, efl_gfx_position_set(x, y),
51 evas_obj_visibility_set(EINA_TRUE)); 51 efl_gfx_visible_set(EINA_TRUE));
52 } 52 }
53 done = 0; 53 done = 0;
54} 54}
diff --git a/src/bin/text_styles.c b/src/bin/text_styles.c
index 5d5fc25..50d9f7f 100644
--- a/src/bin/text_styles.c
+++ b/src/bin/text_styles.c
@@ -33,12 +33,12 @@ static void _setup(void)
33 efl_text_properties_font_set("Vera-Bold", 20), 33 efl_text_properties_font_set("Vera-Bold", 20),
34 efl_text_set("This is a test string"), 34 efl_text_set("This is a test string"),
35 evas_obj_text_style_set(st), 35 evas_obj_text_style_set(st),
36 evas_obj_color_set(255, 255, 255, 255), 36 efl_gfx_color_set(255, 255, 255, 255),
37 evas_obj_text_shadow_color_set(0, 0, 0, 24), 37 evas_obj_text_shadow_color_set(0, 0, 0, 24),
38 evas_obj_text_glow_color_set(100, 80, 40, 100), 38 evas_obj_text_glow_color_set(100, 80, 40, 100),
39 evas_obj_text_glow2_color_set(50, 10, 5, 50), 39 evas_obj_text_glow2_color_set(50, 10, 5, 50),
40 evas_obj_text_outline_color_set(0, 0, 0, 255), 40 evas_obj_text_outline_color_set(0, 0, 0, 255),
41 evas_obj_visibility_set(EINA_TRUE)); 41 efl_gfx_visible_set(EINA_TRUE));
42 st++; 42 st++;
43 if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW; 43 if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW;
44 } 44 }
@@ -59,12 +59,12 @@ static void _loop(double t, int f)
59 Evas_Coord x, y, w, h; 59 Evas_Coord x, y, w, h;
60 for (i = 0; i < OBNUM; i++) 60 for (i = 0; i < OBNUM; i++)
61 { 61 {
62 eo_do(o_texts[i], evas_obj_size_get(&w, &h)); 62 eo_do(o_texts[i], efl_gfx_size_get(&w, &h));
63 x = (win_w / 2) - (w / 2); 63 x = (win_w / 2) - (w / 2);
64 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 64 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
65 y = (win_h / 2) - (h / 2); 65 y = (win_h / 2) - (h / 2);
66 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2); 66 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
67 eo_do(o_texts[i], evas_obj_position_set(x, y)); 67 eo_do(o_texts[i], efl_gfx_position_set(x, y));
68 } 68 }
69 FPS_STD(NAME); 69 FPS_STD(NAME);
70} 70}
diff --git a/src/bin/text_styles_different_strings.c b/src/bin/text_styles_different_strings.c
index 187c0f5..f785fbf 100644
--- a/src/bin/text_styles_different_strings.c
+++ b/src/bin/text_styles_different_strings.c
@@ -44,12 +44,12 @@ static void _setup(void)
44 strs[rnd() % (sizeof(strs) / sizeof(char *))]); 44 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
45 eo_do(o, efl_text_set(buf), 45 eo_do(o, efl_text_set(buf),
46 evas_obj_text_style_set(st), 46 evas_obj_text_style_set(st),
47 evas_obj_color_set(255, 255, 255, 255), 47 efl_gfx_color_set(255, 255, 255, 255),
48 evas_obj_text_shadow_color_set(0, 0, 0, 24), 48 evas_obj_text_shadow_color_set(0, 0, 0, 24),
49 evas_obj_text_glow_color_set(100, 80, 40, 100), 49 evas_obj_text_glow_color_set(100, 80, 40, 100),
50 evas_obj_text_glow2_color_set(50, 10, 5, 50), 50 evas_obj_text_glow2_color_set(50, 10, 5, 50),
51 evas_obj_text_outline_color_set(0, 0, 0, 255), 51 evas_obj_text_outline_color_set(0, 0, 0, 255),
52 evas_obj_visibility_set(EINA_TRUE)); 52 efl_gfx_visible_set(EINA_TRUE));
53 st++; 53 st++;
54 if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW; 54 if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW;
55 } 55 }
@@ -70,12 +70,12 @@ static void _loop(double t, int f)
70 Evas_Coord x, y, w, h; 70 Evas_Coord x, y, w, h;
71 for (i = 0; i < OBNUM; i++) 71 for (i = 0; i < OBNUM; i++)
72 { 72 {
73 eo_do(o_texts[i], evas_obj_size_get(&w, &h)); 73 eo_do(o_texts[i], efl_gfx_size_get(&w, &h));
74 x = (win_w / 2) - (w / 2); 74 x = (win_w / 2) - (w / 2);
75 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 75 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
76 y = (win_h / 2) - (h / 2); 76 y = (win_h / 2) - (h / 2);
77 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2); 77 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
78 eo_do(o_texts[i], evas_obj_position_set(x, y)); 78 eo_do(o_texts[i], efl_gfx_position_set(x, y));
79 } 79 }
80 FPS_STD(NAME); 80 FPS_STD(NAME);
81} 81}
diff --git a/src/bin/textblock_auto_align.c b/src/bin/textblock_auto_align.c
index c0ec4ce..ecb0895 100644
--- a/src/bin/textblock_auto_align.c
+++ b/src/bin/textblock_auto_align.c
@@ -52,7 +52,7 @@ static void _setup(void)
52 "‎'טקסט' third, 'english' fourth and 'in' fifth, counting from right to left<ps/>" 52 "‎'טקסט' third, 'english' fourth and 'in' fifth, counting from right to left<ps/>"
53 "דוגמה of טקסט in english." 53 "דוגמה of טקסט in english."
54 ), 54 ),
55 evas_obj_visibility_set(EINA_TRUE)); 55 efl_gfx_visible_set(EINA_TRUE));
56 evas_textblock_style_free(st); 56 evas_textblock_style_free(st);
57 57
58 done = 0; 58 done = 0;
@@ -77,8 +77,8 @@ static void _loop(double t, int f)
77 x = (win_w / 2) - (w / 2); 77 x = (win_w / 2) - (w / 2);
78 y = (win_h / 2) - (h0 / 2); 78 y = (win_h / 2) - (h0 / 2);
79 eo_do(o_text, 79 eo_do(o_text,
80 evas_obj_position_set(x, y), 80 efl_gfx_position_set(x, y),
81 evas_obj_size_set(w, h)); 81 efl_gfx_size_set(w, h));
82 82
83 FPS_STD(NAME); 83 FPS_STD(NAME);
84} 84}
diff --git a/src/bin/textblock_basic.c b/src/bin/textblock_basic.c
index c3841c8..bde7c34 100644
--- a/src/bin/textblock_basic.c
+++ b/src/bin/textblock_basic.c
@@ -112,7 +112,7 @@ static void _setup(void)
112 "plutôt naïve Louÿs rêva crapaüter Íosa Úrmhac Óighe pór Éava Ádhaim" 112 "plutôt naïve Louÿs rêva crapaüter Íosa Úrmhac Óighe pór Éava Ádhaim"
113 "</blockquote>" 113 "</blockquote>"
114 ), 114 ),
115 evas_obj_visibility_set(EINA_TRUE)); 115 efl_gfx_visible_set(EINA_TRUE));
116 116
117 evas_textblock_style_free(st); 117 evas_textblock_style_free(st);
118 118
@@ -140,8 +140,8 @@ static void _loop(double t, int f)
140 y = (win_h / 2) - (h / 2); 140 y = (win_h / 2) - (h / 2);
141 y += cos((double)(f + (i * 28)) / (93.8 * SLOW)) * (h0 / 2); 141 y += cos((double)(f + (i * 28)) / (93.8 * SLOW)) * (h0 / 2);
142 eo_do(o_text, 142 eo_do(o_text,
143 evas_obj_position_set(x, y), 143 efl_gfx_position_set(x, y),
144 evas_obj_size_set(w, 5000)); 144 efl_gfx_size_set(w, 5000));
145 145
146 FPS_STD(NAME); 146 FPS_STD(NAME);
147} 147}
diff --git a/src/bin/textblock_intl.c b/src/bin/textblock_intl.c
index 7559599..edb658e 100644
--- a/src/bin/textblock_intl.c
+++ b/src/bin/textblock_intl.c
@@ -83,7 +83,7 @@ static void _setup(void)
83 "Tibetan: 'ཨུ་ནི་ཀོཌྲ།'<br/>" 83 "Tibetan: 'ཨུ་ནི་ཀོཌྲ།'<br/>"
84 "Yiddish: 'יוניקאָד'<br/>" 84 "Yiddish: 'יוניקאָד'<br/>"
85 ), 85 ),
86 evas_obj_visibility_set(EINA_TRUE)); 86 efl_gfx_visible_set(EINA_TRUE));
87 87
88 evas_textblock_style_free(st); 88 evas_textblock_style_free(st);
89 89
@@ -110,8 +110,8 @@ static void _loop(double t, int f)
110 y = (win_h / 2) - (h / 2); 110 y = (win_h / 2) - (h / 2);
111 y += cos((double)(f + (i * 28)) / (19.6 * SLOW)) * (h0 / (2 * 2)); 111 y += cos((double)(f + (i * 28)) / (19.6 * SLOW)) * (h0 / (2 * 2));
112 eo_do(o_text, 112 eo_do(o_text,
113 evas_obj_position_set(x, y), 113 efl_gfx_position_set(x, y),
114 evas_obj_size_set(w, h)); 114 efl_gfx_size_set(w, h));
115 115
116 FPS_STD(NAME); 116 FPS_STD(NAME);
117} 117}
diff --git a/src/bin/textblock_text_append.c b/src/bin/textblock_text_append.c
index 2b34482..93a35aa 100644
--- a/src/bin/textblock_text_append.c
+++ b/src/bin/textblock_text_append.c
@@ -93,9 +93,9 @@ static void _setup(void)
93"<ps/>" 93"<ps/>"
94"Enlightenment is built by designers and programmers who want others to be able to do more with less. Some of Enlightenment's libraries do not do anything with graphics at all, but it is the ones that do that are the shining stars of the Enlightenment world.<ps/>Evas is the canvas layer. It is not a drawing library. It is not like OpenGL, Cairo, XRender, GDI, DirectFB etc. It is a scene graph library that retains state of all objects in it. They are created then manipulated until they are no longer needed, at which point they are deleted. This allows the programmer to work in terms that a designer thinks of. It is direct mapping, as opposed to having to convert the concepts into drawing commands in the right order, calculate minimum drawing calls needed to get the job done etc.<ps/>Evas also handles abstracting the rendering mechanism. With zero changes the same application can move from software to OpenGL rendering, as they all use an abstracted scene graph to describe the world (canvas) to Evas. Evas supports multiple targets, but the most useful are the high-speed software rendering engines and OpenGL (as well as OpenGL-ES 2.0).<ps/>Evas not only does quality rendering and compositing, but also can scale, rotate and fully 3D transform objects, allowing for sought-after 3D effects in your interfaces. It supplies these abilities in both software and OpenGL rendering, so you are never caught with unexpected loss of features. The software rendering is even fast enough to provide the 3D without any acceleration on devices for simple uses.<ps/>Edje is a meta-object design library that is somewhere between Flash, PSD, SVG and HTML+CSS. It separates design out from code and into a dynamically loaded data file. This file is compressed and loaded very quickly, along with being cached and shared betweeen instances.<ps/>This allows design to be provided at runtime by different design (EDJ) files, leaving the programmer to worry about overall application implementation and coarse grained UI as opposed to needing to worry about all the little details that the artists may vary even until the day before shipping the product.<br/>" 94"Enlightenment is built by designers and programmers who want others to be able to do more with less. Some of Enlightenment's libraries do not do anything with graphics at all, but it is the ones that do that are the shining stars of the Enlightenment world.<ps/>Evas is the canvas layer. It is not a drawing library. It is not like OpenGL, Cairo, XRender, GDI, DirectFB etc. It is a scene graph library that retains state of all objects in it. They are created then manipulated until they are no longer needed, at which point they are deleted. This allows the programmer to work in terms that a designer thinks of. It is direct mapping, as opposed to having to convert the concepts into drawing commands in the right order, calculate minimum drawing calls needed to get the job done etc.<ps/>Evas also handles abstracting the rendering mechanism. With zero changes the same application can move from software to OpenGL rendering, as they all use an abstracted scene graph to describe the world (canvas) to Evas. Evas supports multiple targets, but the most useful are the high-speed software rendering engines and OpenGL (as well as OpenGL-ES 2.0).<ps/>Evas not only does quality rendering and compositing, but also can scale, rotate and fully 3D transform objects, allowing for sought-after 3D effects in your interfaces. It supplies these abilities in both software and OpenGL rendering, so you are never caught with unexpected loss of features. The software rendering is even fast enough to provide the 3D without any acceleration on devices for simple uses.<ps/>Edje is a meta-object design library that is somewhere between Flash, PSD, SVG and HTML+CSS. It separates design out from code and into a dynamically loaded data file. This file is compressed and loaded very quickly, along with being cached and shared betweeen instances.<ps/>This allows design to be provided at runtime by different design (EDJ) files, leaving the programmer to worry about overall application implementation and coarse grained UI as opposed to needing to worry about all the little details that the artists may vary even until the day before shipping the product.<br/>"
95 ), 95 ),
96 evas_obj_position_set(0, 0), 96 efl_gfx_position_set(0, 0),
97 evas_obj_size_set(win_w, win_h), 97 efl_gfx_size_set(win_w, win_h),
98 evas_obj_visibility_set(EINA_TRUE)); 98 efl_gfx_visible_set(EINA_TRUE));
99 99
100 evas_textblock_style_free(st); 100 evas_textblock_style_free(st);
101 101
diff --git a/src/bin/ui.c b/src/bin/ui.c
index 147075d..be5185f 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -220,15 +220,15 @@ static int test_item = -1;
220static void 220static void
221_ui_menu_show(Eina_Bool visibility) 221_ui_menu_show(Eina_Bool visibility)
222{ 222{
223 eo_do(o_menu_logo, evas_obj_visibility_set(visibility)); 223 eo_do(o_menu_logo, efl_gfx_visible_set(visibility));
224 eo_do(o_menu_title, evas_obj_visibility_set(visibility)); 224 eo_do(o_menu_title, efl_gfx_visible_set(visibility));
225 eo_do(o_menu_icon, evas_obj_visibility_set(visibility)); 225 eo_do(o_menu_icon, efl_gfx_visible_set(visibility));
226 eo_do(o_menu_icon_sel, evas_obj_visibility_set(visibility)); 226 eo_do(o_menu_icon_sel, efl_gfx_visible_set(visibility));
227 /* FIXME: ask if it's ok o_menu_icon_sel2 == NULL */ 227 /* FIXME: ask if it's ok o_menu_icon_sel2 == NULL */
228 eo_do(o_menu_icon_sel2, evas_obj_visibility_set(visibility)); 228 eo_do(o_menu_icon_sel2, efl_gfx_visible_set(visibility));
229 eo_do(o_menu_text_sel, evas_obj_visibility_set(visibility)); 229 eo_do(o_menu_text_sel, efl_gfx_visible_set(visibility));
230 eo_do(o_title, evas_obj_visibility_set(visibility)); 230 eo_do(o_title, efl_gfx_visible_set(visibility));
231 eo_do(o_byline, evas_obj_visibility_set(visibility)); 231 eo_do(o_byline, efl_gfx_visible_set(visibility));
232} 232}
233 233
234static void 234static void
@@ -244,12 +244,12 @@ _ui_select(void)
244 Menu_Item *mi; 244 Menu_Item *mi;
245 245
246 mi = l->data; 246 mi = l->data;
247 eo_do(mi->o_icon, evas_obj_visibility_set(EINA_FALSE)); 247 eo_do(mi->o_icon, efl_gfx_visible_set(EINA_FALSE));
248 if (i == menu_sel) 248 if (i == menu_sel)
249 func = mi->func; 249 func = mi->func;
250 } 250 }
251 eo_do(o_title, evas_obj_visibility_set(EINA_FALSE)); 251 eo_do(o_title, efl_gfx_visible_set(EINA_FALSE));
252 eo_do(o_byline, evas_obj_visibility_set(EINA_FALSE)); 252 eo_do(o_byline, efl_gfx_visible_set(EINA_FALSE));
253 253
254 menu_active = 0; 254 menu_active = 0;
255 if (func) func(); 255 if (func) func();
@@ -362,14 +362,14 @@ _ui_menu_item_full_add(Eina_Bool test,
362 mi = malloc(sizeof(Menu_Item)); 362 mi = malloc(sizeof(Menu_Item));
363 mi->o_icon = eo_add(EVAS_IMAGE_CLASS, evas); 363 mi->o_icon = eo_add(EVAS_IMAGE_CLASS, evas);
364 eo_do(mi->o_icon, efl_file_set(build_path(icon), NULL), 364 eo_do(mi->o_icon, efl_file_set(build_path(icon), NULL),
365 evas_obj_size_set(32, 32), 365 efl_gfx_size_set(32, 32),
366 evas_obj_image_fill_set(0, 0, 32, 32)); 366 efl_gfx_fill_set(0, 0, 32, 32));
367 mi->test = test; 367 mi->test = test;
368 mi->icon = strdup(icon); 368 mi->icon = strdup(icon);
369 mi->text = strdup(text); 369 mi->text = strdup(text);
370 mi->func = func; 370 mi->func = func;
371 menu = eina_list_append(menu, mi); 371 menu = eina_list_append(menu, mi);
372 eo_do(o_menu_icon_sel2, evas_obj_raise()); 372 eo_do(o_menu_icon_sel2, efl_gfx_stack_raise());
373} 373}
374 374
375#define _ui_menu_item_add(Icon, Text, Func) _ui_menu_item_full_add(EINA_TRUE, Icon, Text, Func) 375#define _ui_menu_item_add(Icon, Text, Func) _ui_menu_item_full_add(EINA_TRUE, Icon, Text, Func)
@@ -390,90 +390,90 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
390 win_h = ui_h; 390 win_h = ui_h;
391 391
392 o = eo_add(EVAS_RECTANGLE_CLASS, evas); 392 o = eo_add(EVAS_RECTANGLE_CLASS, evas);
393 eo_do(o, evas_obj_position_set(0, 0), 393 eo_do(o, efl_gfx_position_set(0, 0),
394 evas_obj_size_set(win_w, win_h), 394 efl_gfx_size_set(win_w, win_h),
395 evas_obj_color_set(0, 0, 0, 0), 395 efl_gfx_color_set(0, 0, 0, 0),
396 evas_obj_layer_set(1000), 396 efl_gfx_stack_layer_set(1000),
397 evas_obj_focus_set(1), 397 evas_obj_focus_set(1),
398 evas_obj_visibility_set(EINA_TRUE), 398 efl_gfx_visible_set(EINA_TRUE),
399 eo_event_callback_array_add(ui_callbacks(), NULL)); 399 eo_event_callback_array_add(ui_callbacks(), NULL));
400 o_bg = o; 400 o_bg = o;
401 401
402 o = eo_add(EVAS_RECTANGLE_CLASS, evas); 402 o = eo_add(EVAS_RECTANGLE_CLASS, evas);
403 eo_do(o, evas_obj_position_set(0, 0), 403 eo_do(o, efl_gfx_position_set(0, 0),
404 evas_obj_size_set(win_w, win_h), 404 efl_gfx_size_set(win_w, win_h),
405 evas_obj_color_set(255, 255, 255, 255), 405 efl_gfx_color_set(255, 255, 255, 255),
406 evas_obj_layer_set(-99), 406 efl_gfx_stack_layer_set(-99),
407 evas_obj_visibility_set(EINA_TRUE)); 407 efl_gfx_visible_set(EINA_TRUE));
408 o_wallpaper = o; 408 o_wallpaper = o;
409 409
410 o = eo_add(EVAS_TEXT_CLASS, evas); 410 o = eo_add(EVAS_TEXT_CLASS, evas);
411 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), 411 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
412 efl_text_set("EXPEDITE"), 412 efl_text_set("EXPEDITE"),
413 evas_obj_layer_set(100), 413 efl_gfx_stack_layer_set(100),
414 evas_obj_color_set(0, 0, 0, 100), 414 efl_gfx_color_set(0, 0, 0, 100),
415 evas_obj_pass_events_set(1), 415 evas_obj_pass_events_set(1),
416 evas_obj_size_get(&w, &h)); 416 efl_gfx_size_get(&w, &h));
417 x = (win_w - w) / 2; 417 x = (win_w - w) / 2;
418 y = 0; 418 y = 0;
419 eo_do(o, evas_obj_position_set(x, y), 419 eo_do(o, efl_gfx_position_set(x, y),
420 evas_obj_visibility_set(EINA_TRUE)); 420 efl_gfx_visible_set(EINA_TRUE));
421 o_title = o; 421 o_title = o;
422 422
423 o = eo_add(EVAS_TEXT_CLASS, evas); 423 o = eo_add(EVAS_TEXT_CLASS, evas);
424 eo_do(o, efl_text_properties_font_set("Vera", 9), 424 eo_do(o, efl_text_properties_font_set("Vera", 9),
425 efl_text_set("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."), 425 efl_text_set("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."),
426 evas_obj_layer_set(100), 426 efl_gfx_stack_layer_set(100),
427 evas_obj_color_set(0, 0, 0, 60), 427 efl_gfx_color_set(0, 0, 0, 60),
428 evas_obj_pass_events_set(1), 428 evas_obj_pass_events_set(1),
429 evas_obj_size_get(&w, NULL)); 429 efl_gfx_size_get(&w, NULL));
430 x = (win_w - w) / 2; 430 x = (win_w - w) / 2;
431 y = h + 2; 431 y = h + 2;
432 eo_do(o, evas_obj_position_set(x, y), 432 eo_do(o, efl_gfx_position_set(x, y),
433 evas_obj_visibility_set(EINA_TRUE)); 433 efl_gfx_visible_set(EINA_TRUE));
434 o_byline = o; 434 o_byline = o;
435 435
436 o = eo_add(EVAS_IMAGE_CLASS, evas); 436 o = eo_add(EVAS_IMAGE_CLASS, evas);
437 eo_do(o, evas_obj_position_set((win_w - 120) / 2, ((win_h - 160) / 2)), 437 eo_do(o, efl_gfx_position_set((win_w - 120) / 2, ((win_h - 160) / 2)),
438 efl_file_set(build_path("e-logo.png"), NULL), 438 efl_file_set(build_path("e-logo.png"), NULL),
439 evas_obj_image_fill_set(0, 0, 120, 160), 439 efl_gfx_fill_set(0, 0, 120, 160),
440 evas_obj_size_set(120, 160), 440 efl_gfx_size_set(120, 160),
441 evas_obj_layer_set(-98), 441 efl_gfx_stack_layer_set(-98),
442 evas_obj_color_set(255, 255, 255, 255), 442 efl_gfx_color_set(255, 255, 255, 255),
443 evas_obj_visibility_set(EINA_TRUE)); 443 efl_gfx_visible_set(EINA_TRUE));
444 o_menu_logo = o; 444 o_menu_logo = o;
445 445
446 o = eo_add(EVAS_IMAGE_CLASS, evas); 446 o = eo_add(EVAS_IMAGE_CLASS, evas);
447 eo_do(o, evas_obj_position_set(win_w - 128, - 128), 447 eo_do(o, efl_gfx_position_set(win_w - 128, - 128),
448 evas_obj_image_fill_set(0, 0, 256, 256), 448 efl_gfx_fill_set(0, 0, 256, 256),
449 evas_obj_size_set(256, 256), 449 efl_gfx_size_set(256, 256),
450 evas_obj_visibility_set(EINA_TRUE)); 450 efl_gfx_visible_set(EINA_TRUE));
451 o_menu_icon = o; 451 o_menu_icon = o;
452 452
453 o = eo_add(EVAS_IMAGE_CLASS, evas); 453 o = eo_add(EVAS_IMAGE_CLASS, evas);
454 eo_do(o, evas_obj_position_set(0, 0), 454 eo_do(o, efl_gfx_position_set(0, 0),
455 efl_file_set(build_path("icon_sel.png"), NULL), 455 efl_file_set(build_path("icon_sel.png"), NULL),
456 evas_obj_size_set(48, 48), 456 efl_gfx_size_set(48, 48),
457 evas_obj_image_fill_set(0, 0, 48, 48)); 457 efl_gfx_fill_set(0, 0, 48, 48));
458 o_menu_icon_sel = o; 458 o_menu_icon_sel = o;
459 459
460 o = eo_add(EVAS_IMAGE_CLASS, evas); 460 o = eo_add(EVAS_IMAGE_CLASS, evas);
461 eo_do(o, evas_obj_position_set(0, 0), 461 eo_do(o, efl_gfx_position_set(0, 0),
462 efl_file_set(build_path("text_sel.png"), NULL), 462 efl_file_set(build_path("text_sel.png"), NULL),
463 evas_obj_size_set(96, 32), 463 efl_gfx_size_set(96, 32),
464 evas_obj_image_fill_set(0, 0, 96, 32), 464 efl_gfx_fill_set(0, 0, 96, 32),
465 evas_obj_image_border_set(7, 7, 7, 7)); 465 evas_obj_image_border_set(7, 7, 7, 7));
466 o_menu_text_sel = o; 466 o_menu_text_sel = o;
467 467
468 o = eo_add(EVAS_TEXT_CLASS, evas); 468 o = eo_add(EVAS_TEXT_CLASS, evas);
469 eo_do(o, efl_text_properties_font_set("Vera", 10), 469 eo_do(o, efl_text_properties_font_set("Vera", 10),
470 efl_text_set(""), 470 efl_text_set(""),
471 evas_obj_color_set(0, 0, 0, 100), 471 efl_gfx_color_set(0, 0, 0, 100),
472 evas_obj_pass_events_set(1), 472 evas_obj_pass_events_set(1),
473 evas_obj_size_get(&w, &h)); 473 efl_gfx_size_get(&w, &h));
474 x = (win_w - w) / 2; 474 x = (win_w - w) / 2;
475 y = (win_h - h) / 2; 475 y = (win_h - h) / 2;
476 eo_do(o, evas_obj_position_set(x, y)); 476 eo_do(o, efl_gfx_position_set(x, y));
477 o_menu_title = o; 477 o_menu_title = o;
478 478
479 _ui_menu_item_full_add(EINA_FALSE, "e.png", "About", about_start); 479 _ui_menu_item_full_add(EINA_FALSE, "e.png", "About", about_start);
@@ -516,8 +516,8 @@ ui_loop(void *data EINA_UNUSED)
516 static double pt = 0.0; 516 static double pt = 0.0;
517 double t, t2; 517 double t, t2;
518 518
519 eo_do(o_bg, evas_obj_size_set(win_w, win_h)); 519 eo_do(o_bg, efl_gfx_size_set(win_w, win_h));
520 eo_do(o_wallpaper, evas_obj_size_set(win_w, win_h)); 520 eo_do(o_wallpaper, efl_gfx_size_set(win_w, win_h));
521 521
522 if (loop_func) 522 if (loop_func)
523 { 523 {
@@ -573,21 +573,21 @@ ui_loop(void *data EINA_UNUSED)
573 Evas_Object *o; 573 Evas_Object *o;
574 574
575 o = mi->o_icon; 575 o = mi->o_icon;
576 eo_do(o_menu_logo, evas_obj_size_get(&w, &h)); 576 eo_do(o_menu_logo, efl_gfx_size_get(&w, &h));
577 len = ((w * 3) + 10) / 4; 577 len = ((w * 3) + 10) / 4;
578 eo_do(o, evas_obj_size_get(&w, &h)); 578 eo_do(o, efl_gfx_size_get(&w, &h));
579 x = (win_w / 2) 579 x = (win_w / 2)
580 + (sin((menu_anim - (double)i) * 0.33) * len) 580 + (sin((menu_anim - (double)i) * 0.33) * len)
581 - (w / 2); 581 - (w / 2);
582 y = (win_h / 2) 582 y = (win_h / 2)
583 + (cos((menu_anim - (double)i) * 0.33) * len) 583 + (cos((menu_anim - (double)i) * 0.33) * len)
584 - (h / 2); 584 - (h / 2);
585 eo_do(o, evas_obj_position_set(x, y)); 585 eo_do(o, efl_gfx_position_set(x, y));
586 a = menu_anim - (double)i; 586 a = menu_anim - (double)i;
587 if (a < 0) a = -a; 587 if (a < 0) a = -a;
588 a = 255 - (30 * a); 588 a = 255 - (30 * a);
589 eo_do(o, evas_obj_color_set(a, a, a, a), 589 eo_do(o, efl_gfx_color_set(a, a, a, a),
590 evas_obj_visibility_set(EINA_TRUE)); 590 efl_gfx_visible_set(EINA_TRUE));
591 591
592 if (i == menu_sel) 592 if (i == menu_sel)
593 { 593 {
@@ -596,36 +596,36 @@ ui_loop(void *data EINA_UNUSED)
596 a = 255 - (255 * a); 596 a = 255 - (255 * a);
597 597
598 o = o_menu_icon_sel; 598 o = o_menu_icon_sel;
599 eo_do(o, evas_obj_position_set(x - ((48 - w) / 2), y - ((48 - h) / 2)), 599 eo_do(o, efl_gfx_position_set(x - ((48 - w) / 2), y - ((48 - h) / 2)),
600 evas_obj_color_set(a, a, a, a)); 600 efl_gfx_color_set(a, a, a, a));
601 601
602 o = o_menu_title; 602 o = o_menu_title;
603 eo_do(o, evas_obj_color_set(a, a, a, a), 603 eo_do(o, efl_gfx_color_set(a, a, a, a),
604 efl_text_set(mi->text), 604 efl_text_set(mi->text),
605 evas_obj_size_get(&tw, &th)); 605 efl_gfx_size_get(&tw, &th));
606 x = (win_w - tw) / 2; 606 x = (win_w - tw) / 2;
607 y = (win_h / 2) + len + 48; 607 y = (win_h / 2) + len + 48;
608 eo_do(o, evas_obj_position_set(x, y)); 608 eo_do(o, efl_gfx_position_set(x, y));
609 609
610 o = o_menu_text_sel; 610 o = o_menu_text_sel;
611 w = tw + 24; 611 w = tw + 24;
612 h = 28; 612 h = 28;
613 x = x - 12; 613 x = x - 12;
614 y = y + ((th - h) / 2); 614 y = y + ((th - h) / 2);
615 eo_do(o, evas_obj_position_set(x, y), 615 eo_do(o, efl_gfx_position_set(x, y),
616 evas_obj_size_set(w, h), 616 efl_gfx_size_set(w, h),
617 evas_obj_image_fill_set(0, 0, w, h), 617 efl_gfx_fill_set(0, 0, w, h),
618 evas_obj_color_set(a, a, a, a)); 618 efl_gfx_color_set(a, a, a, a));
619 619
620 o = o_menu_icon; 620 o = o_menu_icon;
621 snprintf(buf, 4096, "%s%s", data_dir, mi->icon); 621 snprintf(buf, 4096, "%s%s", data_dir, mi->icon);
622 eo_do(o, efl_file_set(buf, NULL), 622 eo_do(o, efl_file_set(buf, NULL),
623 evas_obj_color_set(a / 2, a / 2, a / 2, a / 2)); 623 efl_gfx_color_set(a / 2, a / 2, a / 2, a / 2));
624 } 624 }
625 i++; 625 i++;
626 } 626 }
627 eo_do(o_menu_logo, evas_obj_position_set((win_w - 120) / 2, ((win_h - 160) / 2)), 627 eo_do(o_menu_logo, efl_gfx_position_set((win_w - 120) / 2, ((win_h - 160) / 2)),
628 evas_obj_visibility_set(EINA_TRUE)); 628 efl_gfx_visible_set(EINA_TRUE));
629 _ui_menu_show(EINA_TRUE); 629 _ui_menu_show(EINA_TRUE);
630 } 630 }
631 else 631 else
@@ -638,8 +638,8 @@ ui_loop(void *data EINA_UNUSED)
638void 638void
639ui_menu(void) 639ui_menu(void)
640{ 640{
641 eo_do(o_title, evas_obj_visibility_set(EINA_TRUE)); 641 eo_do(o_title, efl_gfx_visible_set(EINA_TRUE));
642 eo_do(o_byline, evas_obj_visibility_set(EINA_TRUE), 642 eo_do(o_byline, efl_gfx_visible_set(EINA_TRUE),
643 efl_text_set 643 efl_text_set
644 ("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit.")); 644 ("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."));
645 menu_active = 1; 645 menu_active = 1;
diff --git a/src/bin/widgets_file_icons.c b/src/bin/widgets_file_icons.c
index 6805d3d..e77735b 100644
--- a/src/bin/widgets_file_icons.c
+++ b/src/bin/widgets_file_icons.c
@@ -49,18 +49,18 @@ static void _setup(void)
49 o = eo_add(EVAS_IMAGE_CLASS, evas); 49 o = eo_add(EVAS_IMAGE_CLASS, evas);
50 o_images[i] = o; 50 o_images[i] = o;
51 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL), 51 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL),
52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 52 efl_gfx_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
53 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 53 efl_gfx_size_set(ICON_SIZE, ICON_SIZE),
54 evas_obj_visibility_set(EINA_TRUE)); 54 efl_gfx_visible_set(EINA_TRUE));
55 55
56 o = eo_add(EVAS_TEXT_CLASS, evas);