summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2018-06-18 17:17:48 -0400
committerMike Blumenkrantz <zmike@samsung.com>2018-06-18 18:20:58 -0400
commit27e5e02370799b4e9246fe6dde893207d1ac3f3b (patch)
tree76880350d9616ead78f591db9aaa219596f85665
parent1587f3e5eaad79c209f3698b10842ae42b3257bb (diff)
update efl api usage to work with current master
this is a bit hacky in some places where I created wrappers to avoid having to manually rewrite dozens of function calls in places where I was unable to sed/awk the changes that were needed this is a dead project, so submitting such a massive machine-generated patch for review would be futile. any bugs will probably never be seen since this app is no longer used ref T7037
-rw-r--r--INSTALL376
-rw-r--r--src/bin/about.c6
-rw-r--r--src/bin/image_blend_border.c10
-rw-r--r--src/bin/image_blend_border_recolor.c10
-rw-r--r--src/bin/image_blend_fade_pow2_unscaled.c8
-rw-r--r--src/bin/image_blend_fade_unscaled.c8
-rw-r--r--src/bin/image_blend_many_smooth_same_scaled.c12
-rw-r--r--src/bin/image_blend_nearest_same_scaled.c10
-rw-r--r--src/bin/image_blend_nearest_scaled.c10
-rw-r--r--src/bin/image_blend_nearest_solid_same_scaled.c10
-rw-r--r--src/bin/image_blend_nearest_solid_scaled.c10
-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.c10
-rw-r--r--src/bin/image_blend_smooth_scaled.c10
-rw-r--r--src/bin/image_blend_smooth_solid_same_scaled.c10
-rw-r--r--src/bin/image_blend_smooth_solid_scaled.c10
-rw-r--r--src/bin/image_blend_solid_border.c10
-rw-r--r--src/bin/image_blend_solid_fade_pow2_unscaled.c8
-rw-r--r--src/bin/image_blend_solid_fade_unscaled.c8
-rw-r--r--src/bin/image_blend_solid_middle_border.c12
-rw-r--r--src/bin/image_blend_solid_middle_unscaled.c12
-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.c12
-rw-r--r--src/bin/image_data_argb.c26
-rw-r--r--src/bin/image_data_argb_alpha.c26
-rw-r--r--src/bin/image_data_ycbcr601pl.c20
-rw-r--r--src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c12
-rw-r--r--src/bin/image_data_ycbcr601pl_map_solid_rotate.c12
-rw-r--r--src/bin/image_data_ycbcr601pl_wide_stride.c24
-rw-r--r--src/bin/image_map_3d_1.c12
-rw-r--r--src/bin/image_map_3d_2.c10
-rw-r--r--src/bin/image_map_3d_3.c8
-rw-r--r--src/bin/image_map_3d_4.c6
-rw-r--r--src/bin/image_map_3d_5.c12
-rw-r--r--src/bin/image_map_3d_6.c12
-rw-r--r--src/bin/image_map_3d_flow.c16
-rw-r--r--src/bin/image_map_color_alpha_nearest_rotate.c8
-rw-r--r--src/bin/image_map_color_alpha_nearest_solid_rotate.c8
-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.c8
-rw-r--r--src/bin/image_map_color_nearest_solid_rotate.c8
-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.c8
-rw-r--r--src/bin/image_map_nearest_solid_rotate.c8
-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.c22
-rw-r--r--src/bin/image_mask_13.c22
-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.c2
-rw-r--r--src/bin/main.c24
-rw-r--r--src/bin/main.h4
-rw-r--r--src/bin/poly_blend.c52
-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.c6
-rw-r--r--src/bin/rect_blend_few.c6
-rw-r--r--src/bin/rect_blend_pow2.c6
-rw-r--r--src/bin/rect_blend_pow2_few.c6
-rw-r--r--src/bin/rect_solid.c6
-rw-r--r--src/bin/rect_solid_few.c6
-rw-r--r--src/bin/snapshot_widgets_file_icons.c30
-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.c136
-rw-r--r--src/bin/vg_basic_circle.c12
-rw-r--r--src/bin/vg_basic_gradient.c16
-rw-r--r--src/bin/vg_basic_rect.c12
-rw-r--r--src/bin/vg_scaled.c22
-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.c16
-rw-r--r--src/bin/widgets_file_icons_2_same.c16
-rw-r--r--src/bin/widgets_file_icons_2_same_grouped.c16
-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.c16
-rw-r--r--src/bin/widgets_list_1_grouped.c16
-rw-r--r--src/bin/widgets_list_2.c16
-rw-r--r--src/bin/widgets_list_2_grouped.c16
-rw-r--r--src/bin/widgets_list_3.c24
-rw-r--r--src/bin/widgets_list_3_grouped.c24
-rw-r--r--src/bin/widgets_list_4.c24
-rw-r--r--src/bin/widgets_list_4_grouped.c24
117 files changed, 1174 insertions, 792 deletions
diff --git a/INSTALL b/INSTALL
index 39b0d58..8865734 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,14 +1,368 @@
1COMPILING and INSTALLING: 1Installation Instructions
2*************************
2 3
3If you got a official release tar archive do: 4 Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software
4 ./configure 5Foundation, Inc.
5
6( otherwise if you got this from enlightenment cvs do: ./autogen.sh )
7
8Then to compile:
9 make
10 6
11To install (run this as root, or the user who handles installs): 7 Copying and distribution of this file, with or without modification,
12 make install 8are permitted in any medium without royalty provided the copyright
9notice and this notice are preserved. This file is offered as-is,
10without warranty of any kind.
13 11
14NOTE: You MUST make install Expedite for it to run properly. 12Basic Installation
13==================
14
15 Briefly, the shell command './configure && make && make install'
16should configure, build, and install this package. The following
17more-detailed instructions are generic; see the 'README' file for
18instructions specific to this package. Some packages provide this
19'INSTALL' file but do not implement all of the features documented
20below. The lack of an optional feature in a given package is not
21necessarily a bug. More recommendations for GNU packages can be found
22in *note Makefile Conventions: (standards)Makefile Conventions.
23
24 The 'configure' shell script attempts to guess correct values for
25various system-dependent variables used during compilation. It uses
26those values to create a 'Makefile' in each directory of the package.
27It may also create one or more '.h' files containing system-dependent
28definitions. Finally, it creates a shell script 'config.status' that
29you can run in the future to recreate the current configuration, and a
30file 'config.log' containing compiler output (useful mainly for
31debugging 'configure').
32
33 It can also use an optional file (typically called 'config.cache' and
34enabled with '--cache-file=config.cache' or simply '-C') that saves the
35results of its tests to speed up reconfiguring. Caching is disabled by
36default to prevent problems with accidental use of stale cache files.
37
38 If you need to do unusual things to compile the package, please try
39to figure out how 'configure' could check whether to do them, and mail
40diffs or instructions to the address given in the 'README' so they can
41be considered for the next release. If you are using the cache, and at
42some point 'config.cache' contains results you don't want to keep, you
43may remove or edit it.
44
45 The file 'configure.ac' (or 'configure.in') is used to create
46'configure' by a program called 'autoconf'. You need 'configure.ac' if
47you want to change it or regenerate 'configure' using a newer version of
48'autoconf'.
49
50 The simplest way to compile this package is:
51
52 1. 'cd' to the directory containing the package's source code and type
53 './configure' to configure the package for your system.
54
55 Running 'configure' might take a while. While running, it prints
56 some messages telling which features it is checking for.
57
58 2. Type 'make' to compile the package.
59
60 3. Optionally, type 'make check' to run any self-tests that come with
61 the package, generally using the just-built uninstalled binaries.
62
63 4. Type 'make install' to install the programs and any data files and
64 documentation. When installing into a prefix owned by root, it is
65 recommended that the package be configured and built as a regular
66 user, and only the 'make install' phase executed with root
67 privileges.
68
69 5. Optionally, type 'make installcheck' to repeat any self-tests, but
70 this time using the binaries in their final installed location.
71 This target does not install anything. Running this target as a
72 regular user, particularly if the prior 'make install' required
73 root privileges, verifies that the installation completed
74 correctly.
75
76 6. You can remove the program binaries and object files from the
77 source code directory by typing 'make clean'. To also remove the
78 files that 'configure' created (so you can compile the package for
79 a different kind of computer), type 'make distclean'. There is
80 also a 'make maintainer-clean' target, but that is intended mainly
81 for the package's developers. If you use it, you may have to get
82 all sorts of other programs in order to regenerate files that came
83 with the distribution.
84
85 7. Often, you can also type 'make uninstall' to remove the installed
86 files again. In practice, not all packages have tested that
87 uninstallation works correctly, even though it is required by the
88 GNU Coding Standards.
89
90 8. Some packages, particularly those that use Automake, provide 'make
91 distcheck', which can by used by developers to test that all other
92 targets like 'make install' and 'make uninstall' work correctly.
93 This target is generally not run by end users.
94
95Compilers and Options
96=====================
97
98 Some systems require unusual options for compilation or linking that
99the 'configure' script does not know about. Run './configure --help'
100for details on some of the pertinent environment variables.
101
102 You can give 'configure' initial values for configuration parameters
103by setting variables in the command line or in the environment. Here is
104an example:
105
106 ./configure CC=c99 CFLAGS=-g LIBS=-lposix
107
108 *Note Defining Variables::, for more details.
109
110Compiling For Multiple Architectures
111====================================
112
113 You can compile the package for more than one kind of computer at the
114same time, by placing the object files for each architecture in their
115own directory. To do this, you can use GNU 'make'. 'cd' to the
116directory where you want the object files and executables to go and run
117the 'configure' script. 'configure' automatically checks for the source
118code in the directory that 'configure' is in and in '..'. This is known
119as a "VPATH" build.
120
121 With a non-GNU 'make', it is safer to compile the package for one
122architecture at a time in the source code directory. After you have
123installed the package for one architecture, use 'make distclean' before
124reconfiguring for another architecture.
125
126 On MacOS X 10.5 and later systems, you can create libraries and
127executables that work on multiple system types--known as "fat" or
128"universal" binaries--by specifying multiple '-arch' options to the
129compiler but only a single '-arch' option to the preprocessor. Like
130this:
131
132 ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
133 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
134 CPP="gcc -E" CXXCPP="g++ -E"
135
136 This is not guaranteed to produce working output in all cases, you
137may have to build one architecture at a time and combine the results
138using the 'lipo' tool if you have problems.
139
140Installation Names
141==================
142
143 By default, 'make install' installs the package's commands under
144'/usr/local/bin', include files under '/usr/local/include', etc. You
145can specify an installation prefix other than '/usr/local' by giving
146'configure' the option '--prefix=PREFIX', where PREFIX must be an
147absolute file name.
148
149 You can specify separate installation prefixes for
150architecture-specific files and architecture-independent files. If you
151pass the option '--exec-prefix=PREFIX' to 'configure', the package uses
152PREFIX as the prefix for installing programs and libraries.
153Documentation and other data files still use the regular prefix.
154
155 In addition, if you use an unusual directory layout you can give
156options like '--bindir=DIR' to specify different values for particular
157kinds of files. Run 'configure --help' for a list of the directories
158you can set and what kinds of files go in them. In general, the default
159for these options is expressed in terms of '${prefix}', so that
160specifying just '--prefix' will affect all of the other directory
161specifications that were not explicitly provided.
162
163 The most portable way to affect installation locations is to pass the
164correct locations to 'configure'; however, many packages provide one or
165both of the following shortcuts of passing variable assignments to the
166'make install' command line to change installation locations without
167having to reconfigure or recompile.
168
169 The first method involves providing an override variable for each
170affected directory. For example, 'make install
171prefix=/alternate/directory' will choose an alternate location for all
172directory configuration variables that were expressed in terms of
173'${prefix}'. Any directories that were specified during 'configure',
174but not in terms of '${prefix}', must each be overridden at install time
175for the entire installation to be relocated. The approach of makefile
176variable overrides for each directory variable is required by the GNU
177Coding Standards, and ideally causes no recompilation. However, some
178platforms have known limitations with the semantics of shared libraries
179that end up requiring recompilation when using this method, particularly
180noticeable in packages that use GNU Libtool.
181
182 The second method involves providing the 'DESTDIR' variable. For
183example, 'make install DESTDIR=/alternate/directory' will prepend
184'/alternate/directory' before all installation names. The approach of
185'DESTDIR' overrides is not required by the GNU Coding Standards, and
186does not work on platforms that have drive letters. On the other hand,
187it does better at avoiding recompilation issues, and works well even
188when some directory options were not specified in terms of '${prefix}'
189at 'configure' time.
190
191Optional Features
192=================
193
194 If the package supports it, you can cause programs to be installed
195with an extra prefix or suffix on their names by giving 'configure' the
196option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'.
197
198 Some packages pay attention to '--enable-FEATURE' options to
199'configure', where FEATURE indicates an optional part of the package.
200They may also pay attention to '--with-PACKAGE' options, where PACKAGE
201is something like 'gnu-as' or 'x' (for the X Window System). The
202'README' should mention any '--enable-' and '--with-' options that the
203package recognizes.
204
205 For packages that use the X Window System, 'configure' can usually
206find the X include and library files automatically, but if it doesn't,
207you can use the 'configure' options '--x-includes=DIR' and
208'--x-libraries=DIR' to specify their locations.
209
210 Some packages offer the ability to configure how verbose the
211execution of 'make' will be. For these packages, running './configure
212--enable-silent-rules' sets the default to minimal output, which can be
213overridden with 'make V=1'; while running './configure
214--disable-silent-rules' sets the default to verbose, which can be
215overridden with 'make V=0'.
216
217Particular systems
218==================
219
220 On HP-UX, the default C compiler is not ANSI C compatible. If GNU CC
221is not installed, it is recommended to use the following options in
222order to use an ANSI C compiler:
223
224 ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
225
226and if that doesn't work, install pre-built binaries of GCC for HP-UX.
227
228 HP-UX 'make' updates targets which have the same time stamps as their
229prerequisites, which makes it generally unusable when shipped generated
230files such as 'configure' are involved. Use GNU 'make' instead.
231
232 On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
233parse its '<wchar.h>' header file. The option '-nodtk' can be used as a
234workaround. If GNU CC is not installed, it is therefore recommended to
235try
236
237 ./configure CC="cc"
238
239and if that doesn't work, try
240
241 ./configure CC="cc -nodtk"
242
243 On Solaris, don't put '/usr/ucb' early in your 'PATH'. This
244directory contains several dysfunctional programs; working variants of
245these programs are available in '/usr/bin'. So, if you need '/usr/ucb'
246in your 'PATH', put it _after_ '/usr/bin'.
247
248 On Haiku, software installed for all users goes in '/boot/common',
249not '/usr/local'. It is recommended to use the following options:
250
251 ./configure --prefix=/boot/common
252
253Specifying the System Type
254==========================
255
256 There may be some features 'configure' cannot figure out
257automatically, but needs to determine by the type of machine the package
258will run on. Usually, assuming the package is built to be run on the
259_same_ architectures, 'configure' can figure that out, but if it prints
260a message saying it cannot guess the machine type, give it the
261'--build=TYPE' option. TYPE can either be a short name for the system
262type, such as 'sun4', or a canonical name which has the form:
263
264 CPU-COMPANY-SYSTEM
265
266where SYSTEM can have one of these forms:
267
268 OS
269 KERNEL-OS
270
271 See the file 'config.sub' for the possible values of each field. If
272'config.sub' isn't included in this package, then this package doesn't
273need to know the machine type.
274
275 If you are _building_ compiler tools for cross-compiling, you should
276use the option '--target=TYPE' to select the type of system they will
277produce code for.
278
279 If you want to _use_ a cross compiler, that generates code for a
280platform different from the build platform, you should specify the
281"host" platform (i.e., that on which the generated programs will
282eventually be run) with '--host=TYPE'.
283
284Sharing Defaults
285================
286
287 If you want to set default values for 'configure' scripts to share,
288you can create a site shell script called 'config.site' that gives
289default values for variables like 'CC', 'cache_file', and 'prefix'.
290'configure' looks for 'PREFIX/share/config.site' if it exists, then
291'PREFIX/etc/config.site' if it exists. Or, you can set the
292'CONFIG_SITE' environment variable to the location of the site script.
293A warning: not all 'configure' scripts look for a site script.
294
295Defining Variables
296==================
297
298 Variables not defined in a site shell script can be set in the
299environment passed to 'configure'. However, some packages may run
300configure again during the build, and the customized values of these
301variables may be lost. In order to avoid this problem, you should set
302them in the 'configure' command line, using 'VAR=value'. For example:
303
304 ./configure CC=/usr/local2/bin/gcc
305
306causes the specified 'gcc' to be used as the C compiler (unless it is
307overridden in the site shell script).
308
309Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an
310Autoconf limitation. Until the limitation is lifted, you can use this
311workaround:
312
313 CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
314
315'configure' Invocation
316======================
317
318 'configure' recognizes the following options to control how it
319operates.
320
321'--help'
322'-h'
323 Print a summary of all of the options to 'configure', and exit.
324
325'--help=short'
326'--help=recursive'
327 Print a summary of the options unique to this package's
328 'configure', and exit. The 'short' variant lists options used only
329 in the top level, while the 'recursive' variant lists options also
330 present in any nested packages.
331
332'--version'
333'-V'
334 Print the version of Autoconf used to generate the 'configure'
335 script, and exit.
336
337'--cache-file=FILE'
338 Enable the cache: use and save the results of the tests in FILE,
339 traditionally 'config.cache'. FILE defaults to '/dev/null' to
340 disable caching.
341
342'--config-cache'
343'-C'
344 Alias for '--cache-file=config.cache'.
345
346'--quiet'
347'--silent'
348'-q'
349 Do not print messages saying which checks are being made. To
350 suppress all normal output, redirect it to '/dev/null' (any error
351 messages will still be shown).
352
353'--srcdir=DIR'
354 Look for the package's source code in directory DIR. Usually
355 'configure' can determine that directory automatically.
356
357'--prefix=DIR'
358 Use DIR as the installation prefix. *note Installation Names:: for
359 more details, including other options available for fine-tuning the
360 installation locations.
361
362'--no-create'
363'-n'
364 Run the configure checks, but stop before creating any output
365 files.
366
367'configure' also accepts some other, not widely useful, options. Run
368'configure --help' for more details.
diff --git a/src/bin/about.c b/src/bin/about.c
index c5a780f..d816827 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 = evas_object_textblock_add(evas); 11 o = evas_object_textblock_add(evas);
12 efl_gfx_position_set(o, 10, 40); 12 efl_gfx_entity_position_set(o, EINA_POSITION2D(10, 40));
13 efl_gfx_size_set(o, win_w - 20, win_h - 50); 13 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w - 20, win_h - 50));
14 efl_gfx_visible_set(o, EINA_TRUE); 14 efl_gfx_entity_visible_set(o, 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 eb05518..3c9ee8f 100644
--- a/src/bin/image_blend_border.c
+++ b/src/bin/image_blend_border.c
@@ -26,8 +26,8 @@ static void _setup(void)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("bar.png"), NULL); 28 efl_file_set(o, build_path("bar.png"), NULL);
29 efl_image_border_set(o, 6, 6, 6, 6); 29 efl_gfx_image_border_set(o, 6, 6, 6, 6);
30 efl_gfx_visible_set(o, EINA_TRUE); 30 efl_gfx_entity_visible_set(o, EINA_TRUE);
31 } 31 }
32 done = 0; 32 done = 0;
33} 33}
@@ -54,9 +54,9 @@ static void _loop(double t, int f)
54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 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)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
57 efl_gfx_position_set(o_images[i], x, y); 57 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
58 efl_gfx_size_set(o_images[i], w, h); 58 efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h));
59 efl_gfx_fill_set(o_images[i], 0, 0, w, h); 59 efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h));
60 } 60 }
61 FPS_STD(NAME); 61 FPS_STD(NAME);
62} 62}
diff --git a/src/bin/image_blend_border_recolor.c b/src/bin/image_blend_border_recolor.c
index ebdbc77..3218e18 100644
--- a/src/bin/image_blend_border_recolor.c
+++ b/src/bin/image_blend_border_recolor.c
@@ -27,8 +27,8 @@ static void _setup(void)
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("pan.png"), NULL); 28 efl_file_set(o, build_path("pan.png"), NULL);
29 efl_gfx_color_set(o, 64, 64, 64, 255); 29 efl_gfx_color_set(o, 64, 64, 64, 255);
30 efl_image_border_set(o, 3, 3, 3, 3); 30 efl_gfx_image_border_set(o, 3, 3, 3, 3);
31 efl_gfx_visible_set(o, EINA_TRUE); 31 efl_gfx_entity_visible_set(o, EINA_TRUE);
32 } 32 }
33 done = 0; 33 done = 0;
34} 34}
@@ -55,9 +55,9 @@ static void _loop(double t, int f)
55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
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 efl_gfx_position_set(o_images[i], x, y); 58 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
59 efl_gfx_size_set(o_images[i], w, h); 59 efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h));
60 efl_gfx_fill_set(o_images[i], 0, 0, w, h); 60 efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h));
61 } 61 }
62 FPS_STD(NAME); 62 FPS_STD(NAME);
63} 63}
diff --git a/src/bin/image_blend_fade_pow2_unscaled.c b/src/bin/image_blend_fade_pow2_unscaled.c
index 0e76376..69f40e5 100644
--- a/src/bin/image_blend_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_fade_pow2_unscaled.c
@@ -28,12 +28,12 @@ static void _setup(void)
28 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 28 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
29 o_images[i] = o; 29 o_images[i] = o;
30 efl_file_set(o, build_path("logo.png"), NULL); 30 efl_file_set(o, build_path("logo.png"), NULL);
31 efl_gfx_fill_set(o, 0, 0, 120, 160); 31 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
32 efl_gfx_size_set(o, 120, 160); 32 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
33 a = 256 - (1 << ((rnd() % 8) + 1)); 33 a = 256 - (1 << ((rnd() % 8) + 1));
34 if (a < 128) a = 128; 34 if (a < 128) a = 128;
35 efl_gfx_color_set(o, a, a, a, a); 35 efl_gfx_color_set(o, a, a, a, a);
36 efl_gfx_visible_set(o, EINA_TRUE); 36 efl_gfx_entity_visible_set(o, EINA_TRUE);
37 } 37 }
38 done = 0; 38 done = 0;
39} 39}
@@ -58,7 +58,7 @@ static void _loop(double t, int f)
58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
59 y = (win_h / 2) - (h / 2); 59 y = (win_h / 2) - (h / 2);
60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
61 efl_gfx_position_set(o_images[i], x, y); 61 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/image_blend_fade_unscaled.c b/src/bin/image_blend_fade_unscaled.c
index 53d436e..adbc87a 100644
--- a/src/bin/image_blend_fade_unscaled.c
+++ b/src/bin/image_blend_fade_unscaled.c
@@ -28,10 +28,10 @@ static void _setup(void)
28 o_images[i] = o; 28 o_images[i] = o;
29 a = rnd()&0xff; 29 a = rnd()&0xff;
30 efl_file_set(o, build_path("logo.png"), NULL); 30 efl_file_set(o, build_path("logo.png"), NULL);
31 efl_gfx_fill_set(o, 0, 0, 120, 160); 31 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
32 efl_gfx_size_set(o, 120, 160); 32 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
33 efl_gfx_color_set(o, a, a, a, a); 33 efl_gfx_color_set(o, a, a, a, a);
34 efl_gfx_visible_set(o, EINA_TRUE); 34 efl_gfx_entity_visible_set(o, 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 efl_gfx_position_set(o_images[i], x, y); 59 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
60 } 60 }
61 FPS_STD(NAME); 61 FPS_STD(NAME);
62} 62}
diff --git a/src/bin/image_blend_many_smooth_same_scaled.c b/src/bin/image_blend_many_smooth_same_scaled.c
index ca2257a..d830968 100644
--- a/src/bin/image_blend_many_smooth_same_scaled.c
+++ b/src/bin/image_blend_many_smooth_same_scaled.c
@@ -31,10 +31,10 @@ static void _setup(void)
31 w = 3 + ((n * (60 - 3)) / 100); 31 w = 3 + ((n * (60 - 3)) / 100);
32 h = 4 + ((n * (80 - 4)) / 100); 32 h = 4 + ((n * (80 - 4)) / 100);
33 efl_file_set(o, build_path("logo.png"), NULL); 33 efl_file_set(o, build_path("logo.png"), NULL);
34 efl_image_smooth_scale_set(o, 1); 34 efl_gfx_image_smooth_scale_set(o, 1);
35 efl_gfx_size_set(o, w, h); 35 efl_gfx_entity_size_set(o, EINA_SIZE2D(w, h));
36 efl_gfx_fill_set(o, 0, 0, w, h); 36 efl_gfx_fill_set(o, EINA_RECT(0, 0, w, h));
37 efl_gfx_visible_set(o, EINA_TRUE); 37 efl_gfx_entity_visible_set(o, EINA_TRUE);
38 } 38 }
39 done = 0; 39 done = 0;
40} 40}
@@ -53,12 +53,12 @@ static void _loop(double t, int f)
53 Evas_Coord x, y, w, h; 53 Evas_Coord x, y, w, h;
54 for (i = 0; i < MANYNUM; i++) 54 for (i = 0; i < MANYNUM; i++)
55 { 55 {
56 efl_gfx_size_get(o_images[i], &w, &h); 56 exp_size_get(o_images[i], &w, &h);
57 x = (win_w / 2) - (w / 2); 57 x = (win_w / 2) - (w / 2);
58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 2); 58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 2);
59 y = (win_h / 2) - (h / 2); 59 y = (win_h / 2) - (h / 2);
60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 2); 60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 2);
61 efl_gfx_position_set(o_images[i], x, y); 61 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/image_blend_nearest_same_scaled.c b/src/bin/image_blend_nearest_same_scaled.c
index 10d57d3..4df527a 100644
--- a/src/bin/image_blend_nearest_same_scaled.c
+++ b/src/bin/image_blend_nearest_same_scaled.c
@@ -26,8 +26,8 @@ static void _setup(void)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("logo.png"), NULL); 28 efl_file_set(o, build_path("logo.png"), NULL);
29 efl_image_smooth_scale_set(o, 0); 29 efl_gfx_image_smooth_scale_set(o, 0);
30 efl_gfx_visible_set(o, EINA_TRUE); 30 efl_gfx_entity_visible_set(o, EINA_TRUE);
31 } 31 }
32 done = 0; 32 done = 0;
33} 33}
@@ -54,9 +54,9 @@ static void _loop(double t, int f)
54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 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)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
57 efl_gfx_position_set(o_images[i], x, y); 57 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
58 efl_gfx_size_set(o_images[i], w, h); 58 efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h));
59 efl_gfx_fill_set(o_images[i], 0, 0, w, h); 59 efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h));
60 } 60 }
61 FPS_STD(NAME); 61 FPS_STD(NAME);
62} 62}
diff --git a/src/bin/image_blend_nearest_scaled.c b/src/bin/image_blend_nearest_scaled.c
index 8f4b1bb..c7360b9 100644
--- a/src/bin/image_blend_nearest_scaled.c
+++ b/src/bin/image_blend_nearest_scaled.c
@@ -26,8 +26,8 @@ static void _setup(void)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("logo.png"), NULL); 28 efl_file_set(o, build_path("logo.png"), NULL);
29 efl_image_smooth_scale_set(o, 0); 29 efl_gfx_image_smooth_scale_set(o, 0);
30 efl_gfx_visible_set(o, EINA_TRUE); 30 efl_gfx_entity_visible_set(o, EINA_TRUE);
31 } 31 }
32 done = 0; 32 done = 0;
33} 33}
@@ -54,9 +54,9 @@ static void _loop(double t, int f)
54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 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)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
57 efl_gfx_position_set(o_images[i], x, y); 57 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
58 efl_gfx_size_set(o_images[i], w, h); 58 efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h));
59 efl_gfx_fill_set(o_images[i], 0, 0, w, h); 59 efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h));
60 } 60 }
61 FPS_STD(NAME); 61 FPS_STD(NAME);
62} 62}
diff --git a/src/bin/image_blend_nearest_solid_same_scaled.c b/src/bin/image_blend_nearest_solid_same_scaled.c
index d95ac47..e5421f6 100644
--- a/src/bin/image_blend_nearest_solid_same_scaled.c
+++ b/src/bin/image_blend_nearest_solid_same_scaled.c
@@ -26,8 +26,8 @@ static void _setup(void)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("image.png"), NULL); 28 efl_file_set(o, build_path("image.png"), NULL);
29 efl_image_smooth_scale_set(o, 0); 29 efl_gfx_image_smooth_scale_set(o, 0);
30 efl_gfx_visible_set(o, EINA_TRUE); 30 efl_gfx_entity_visible_set(o, EINA_TRUE);
31 } 31 }
32 done = 0; 32 done = 0;
33} 33}
@@ -54,9 +54,9 @@ static void _loop(double t, int f)
54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 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)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
57 efl_gfx_position_set(o_images[i], x, y); 57 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
58 efl_gfx_size_set(o_images[i], w, h); 58 efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h));
59 efl_gfx_fill_set(o_images[i], 0, 0, w, h); 59 efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h));
60 } 60 }
61 FPS_STD(NAME); 61 FPS_STD(NAME);
62} 62}
diff --git a/src/bin/image_blend_nearest_solid_scaled.c b/src/bin/image_blend_nearest_solid_scaled.c
index 9ce4919..a6a6b9a 100644
--- a/src/bin/image_blend_nearest_solid_scaled.c
+++ b/src/bin/image_blend_nearest_solid_scaled.c
@@ -26,8 +26,8 @@ static void _setup(void)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("image.png"), NULL); 28 efl_file_set(o, build_path("image.png"), NULL);
29 efl_image_smooth_scale_set(o, 0); 29 efl_gfx_image_smooth_scale_set(o, 0);
30 efl_gfx_visible_set(o, EINA_TRUE); 30 efl_gfx_entity_visible_set(o, EINA_TRUE);
31 } 31 }
32 done = 0; 32 done = 0;
33} 33}
@@ -54,9 +54,9 @@ static void _loop(double t, int f)
54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 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)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
57 efl_gfx_position_set(o_images[i], x, y); 57 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
58 efl_gfx_size_set(o_images[i], w, h); 58 efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h));
59 efl_gfx_fill_set(o_images[i], 0, 0, w, h); 59 efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h));
60 } 60 }
61 FPS_STD(NAME); 61 FPS_STD(NAME);
62} 62}
diff --git a/src/bin/image_blend_occlude1.c b/src/bin/image_blend_occlude1.c
index b530c07..a3430f0 100644
--- a/src/bin/image_blend_occlude1.c
+++ b/src/bin/image_blend_occlude1.c
@@ -37,11 +37,11 @@ static void _setup(void)
37 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 37 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
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 efl_file_set(o, build_path("image.png"), NULL); 39 efl_file_set(o, build_path("image.png"), NULL);
40 efl_gfx_position_set(o, x, y); 40 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
41 } 41 }
42 efl_gfx_fill_set(o, 0, 0, 120, 160); 42 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
43 efl_gfx_size_set(o, 120, 160); 43 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
44 efl_gfx_visible_set(o, EINA_TRUE); 44 efl_gfx_entity_visible_set(o, 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 efl_gfx_position_set(o_images[i], x, y); 71 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
72 } 72 }
73 } 73 }
74 FPS_STD(NAME); 74 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude1_few.c b/src/bin/image_blend_occlude1_few.c
index e48a27f..4f19696 100644
--- a/src/bin/image_blend_occlude1_few.c
+++ b/src/bin/image_blend_occlude1_few.c
@@ -40,11 +40,11 @@ static void _setup(void)
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 efl_file_set(o, PACKAGE_DATA_DIR"/data/image.png", NULL); 42 efl_file_set(o, PACKAGE_DATA_DIR"/data/image.png", NULL);
43 efl_gfx_position_set(o, x, y); 43 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
44 } 44 }
45 efl_gfx_fill_set(o, 0, 0, 120, 160); 45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
46 efl_gfx_size_set(o, 120, 160); 46 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
47 efl_gfx_visible_set(o, EINA_TRUE); 47 efl_gfx_entity_visible_set(o, EINA_TRUE);
48 } 48 }
49 done = 0; 49 done = 0;
50} 50}
@@ -71,7 +71,7 @@ static void _loop(double t, int f)
71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
72 y = (win_h / 2) - (h / 2); 72 y = (win_h / 2) - (h / 2);
73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
74 efl_gfx_position_set(o_images[i], x, y); 74 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
75 } 75 }
76 } 76 }
77 FPS_STD(NAME); 77 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude1_many.c b/src/bin/image_blend_occlude1_many.c
index 94d4255..481f0bd 100644
--- a/src/bin/image_blend_occlude1_many.c
+++ b/src/bin/image_blend_occlude1_many.c
@@ -40,11 +40,11 @@ static void _setup(void)
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 efl_file_set(o, build_path("image.png"), NULL); 42 efl_file_set(o, build_path("image.png"), NULL);
43 efl_gfx_position_set(o, x, y); 43 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
44 } 44 }
45 efl_gfx_fill_set(o, 0, 0, 120, 160); 45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
46 efl_gfx_size_set(o, 120, 160); 46 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
47 efl_gfx_visible_set(o, EINA_TRUE); 47 efl_gfx_entity_visible_set(o, EINA_TRUE);
48 } 48 }
49 done = 0; 49 done = 0;
50} 50}
@@ -71,7 +71,7 @@ static void _loop(double t, int f)
71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
72 y = (win_h / 2) - (h / 2); 72 y = (win_h / 2) - (h / 2);
73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
74 efl_gfx_position_set(o_images[i], x, y); 74 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
75 } 75 }
76 } 76 }
77 FPS_STD(NAME); 77 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude1_very_many.c b/src/bin/image_blend_occlude1_very_many.c
index d7f538e..06f5540 100644
--- a/src/bin/image_blend_occlude1_very_many.c
+++ b/src/bin/image_blend_occlude1_very_many.c
@@ -40,11 +40,11 @@ static void _setup(void)
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 efl_file_set(o, build_path("image.png"), NULL); 42 efl_file_set(o, build_path("image.png"), NULL);
43 efl_gfx_position_set(o, x, y); 43 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
44 } 44 }
45 efl_gfx_fill_set(o, 0, 0, 120, 160); 45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
46 efl_gfx_size_set(o, 120, 160); 46 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
47 efl_gfx_visible_set(o, EINA_TRUE); 47 efl_gfx_entity_visible_set(o, EINA_TRUE);
48 } 48 }
49 done = 0; 49 done = 0;
50} 50}
@@ -71,7 +71,7 @@ static void _loop(double t, int f)
71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
72 y = (win_h / 2) - (h / 2); 72 y = (win_h / 2) - (h / 2);
73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
74 efl_gfx_position_set(o_images[i], x, y); 74 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
75 } 75 }
76 } 76 }
77 FPS_STD(NAME); 77 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude2.c b/src/bin/image_blend_occlude2.c
index 4d2d3d5..8f105f2 100644
--- a/src/bin/image_blend_occlude2.c
+++ b/src/bin/image_blend_occlude2.c
@@ -37,11 +37,11 @@ static void _setup(void)
37 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 37 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
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 efl_file_set(o, build_path("image.png"), NULL); 39 efl_file_set(o, build_path("image.png"), NULL);
40 efl_gfx_position_set(o, x, y); 40 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
41 } 41 }
42 efl_gfx_fill_set(o, 0, 0, 120, 160); 42 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
43 efl_gfx_size_set(o, 120, 160); 43 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
44 efl_gfx_visible_set(o, EINA_TRUE); 44 efl_gfx_entity_visible_set(o, 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 efl_gfx_position_set(o_images[i], x, y); 71 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
72 } 72 }
73 } 73 }
74 FPS_STD(NAME); 74 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude2_few.c b/src/bin/image_blend_occlude2_few.c
index 4b73cfe..38f7232 100644
--- a/src/bin/image_blend_occlude2_few.c
+++ b/src/bin/image_blend_occlude2_few.c
@@ -40,11 +40,11 @@ static void _setup(void)
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 efl_file_set(o, build_path("image.png"), NULL); 42 efl_file_set(o, build_path("image.png"), NULL);
43 efl_gfx_position_set(o, x, y); 43 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
44 } 44 }
45 efl_gfx_fill_set(o, 0, 0, 120, 160); 45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
46 efl_gfx_size_set(o, 120, 160); 46 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
47 efl_gfx_visible_set(o, EINA_TRUE); 47 efl_gfx_entity_visible_set(o, EINA_TRUE);
48 } 48 }
49 done = 0; 49 done = 0;
50} 50}
@@ -71,7 +71,7 @@ static void _loop(double t, int f)
71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
72 y = (win_h / 2) - (h / 2); 72 y = (win_h / 2) - (h / 2);
73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
74 efl_gfx_position_set(o_images[i], x, y); 74 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
75 } 75 }
76 } 76 }
77 FPS_STD(NAME); 77 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude2_many.c b/src/bin/image_blend_occlude2_many.c
index 9d661d4..3f271f1 100644
--- a/src/bin/image_blend_occlude2_many.c
+++ b/src/bin/image_blend_occlude2_many.c
@@ -40,11 +40,11 @@ static void _setup(void)
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 efl_file_set(o, build_path("image.png"), NULL); 42 efl_file_set(o, build_path("image.png"), NULL);
43 efl_gfx_position_set(o, x, y); 43 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
44 } 44 }
45 efl_gfx_fill_set(o, 0, 0, 120, 160); 45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
46 efl_gfx_size_set(o, 120, 160); 46 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
47 efl_gfx_visible_set(o, EINA_TRUE); 47 efl_gfx_entity_visible_set(o, EINA_TRUE);
48 } 48 }
49 done = 0; 49 done = 0;
50} 50}
@@ -71,7 +71,7 @@ static void _loop(double t, int f)
71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
72 y = (win_h / 2) - (h / 2); 72 y = (win_h / 2) - (h / 2);
73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
74 efl_gfx_position_set(o_images[i], x, y); 74 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
75 } 75 }
76 } 76 }
77 FPS_STD(NAME); 77 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude2_very_many.c b/src/bin/image_blend_occlude2_very_many.c
index 3c4310b..c91e72e 100644
--- a/src/bin/image_blend_occlude2_very_many.c
+++ b/src/bin/image_blend_occlude2_very_many.c
@@ -40,11 +40,11 @@ static void _setup(void)
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 efl_file_set(o, build_path("image.png"), NULL); 42 efl_file_set(o, build_path("image.png"), NULL);
43 efl_gfx_position_set(o, x, y); 43 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
44 } 44 }
45 efl_gfx_fill_set(o, 0, 0, 120, 160); 45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
46 efl_gfx_size_set(o, 120, 160); 46 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
47 efl_gfx_visible_set(o, EINA_TRUE); 47 efl_gfx_entity_visible_set(o, EINA_TRUE);
48 } 48 }
49 done = 0; 49 done = 0;
50} 50}
@@ -71,7 +71,7 @@ static void _loop(double t, int f)
71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
72 y = (win_h / 2) - (h / 2); 72 y = (win_h / 2) - (h / 2);
73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
74 efl_gfx_position_set(o_images[i], x, y); 74 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
75 } 75 }
76 } 76 }
77 FPS_STD(NAME); 77 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude3.c b/src/bin/image_blend_occlude3.c
index 7423975..de92621 100644
--- a/src/bin/image_blend_occlude3.c
+++ b/src/bin/image_blend_occlude3.c
@@ -37,11 +37,11 @@ static void _setup(void)
37 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 37 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
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 efl_file_set(o, build_path("image.png"), NULL); 39 efl_file_set(o, build_path("image.png"), NULL);
40 efl_gfx_position_set(o, x, y); 40 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
41 } 41 }
42 efl_gfx_fill_set(o, 0, 0, 120, 160); 42 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
43 efl_gfx_size_set(o, 120, 160); 43 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
44 efl_gfx_visible_set(o, EINA_TRUE); 44 efl_gfx_entity_visible_set(o, 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 efl_gfx_position_set(o_images[i], x, y); 71 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
72 } 72 }
73 } 73 }
74 FPS_STD(NAME); 74 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude3_few.c b/src/bin/image_blend_occlude3_few.c
index 0a122d4..e7b2b56 100644
--- a/src/bin/image_blend_occlude3_few.c
+++ b/src/bin/image_blend_occlude3_few.c
@@ -40,11 +40,11 @@ static void _setup(void)
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 efl_file_set(o, build_path("image.png"), NULL); 42 efl_file_set(o, build_path("image.png"), NULL);
43 efl_gfx_position_set(o, x, y); 43 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
44 } 44 }
45 efl_gfx_fill_set(o, 0, 0, 120, 160); 45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
46 efl_gfx_size_set(o, 120, 160); 46 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
47 efl_gfx_visible_set(o, EINA_TRUE); 47 efl_gfx_entity_visible_set(o, EINA_TRUE);
48 } 48 }
49 done = 0; 49 done = 0;
50} 50}
@@ -71,7 +71,7 @@ static void _loop(double t, int f)
71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
72 y = (win_h / 2) - (h / 2); 72 y = (win_h / 2) - (h / 2);
73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
74 efl_gfx_position_set(o_images[i], x, y); 74 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
75 } 75 }
76 } 76 }
77 FPS_STD(NAME); 77 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude3_many.c b/src/bin/image_blend_occlude3_many.c
index ab3617e..0926c9b 100644
--- a/src/bin/image_blend_occlude3_many.c
+++ b/src/bin/image_blend_occlude3_many.c
@@ -40,11 +40,11 @@ static void _setup(void)
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 efl_file_set(o, build_path("image.png"), NULL); 42 efl_file_set(o, build_path("image.png"), NULL);
43 efl_gfx_position_set(o, x, y); 43 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
44 } 44 }
45 efl_gfx_fill_set(o, 0, 0, 120, 160); 45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
46 efl_gfx_size_set(o, 120, 160); 46 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
47 efl_gfx_visible_set(o, EINA_TRUE); 47 efl_gfx_entity_visible_set(o, EINA_TRUE);
48 } 48 }
49 done = 0; 49 done = 0;
50} 50}
@@ -71,7 +71,7 @@ static void _loop(double t, int f)
71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
72 y = (win_h / 2) - (h / 2); 72 y = (win_h / 2) - (h / 2);
73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
74 efl_gfx_position_set(o_images[i], x, y); 74 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
75 } 75 }
76 } 76 }
77 FPS_STD(NAME); 77 FPS_STD(NAME);
diff --git a/src/bin/image_blend_occlude3_very_many.c b/src/bin/image_blend_occlude3_very_many.c
index 4479343..f193727 100644
--- a/src/bin/image_blend_occlude3_very_many.c
+++ b/src/bin/image_blend_occlude3_very_many.c
@@ -40,11 +40,11 @@ static void _setup(void)
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 efl_file_set(o, build_path("image.png"), NULL); 42 efl_file_set(o, build_path("image.png"), NULL);
43 efl_gfx_position_set(o, x, y); 43 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
44 } 44 }
45 efl_gfx_fill_set(o, 0, 0, 120, 160); 45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
46 efl_gfx_size_set(o, 120, 160); 46 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
47 efl_gfx_visible_set(o, EINA_TRUE); 47 efl_gfx_entity_visible_set(o, EINA_TRUE);
48 } 48 }
49 done = 0; 49 done = 0;
50} 50}
@@ -71,7 +71,7 @@ static void _loop(double t, int f)
71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
72 y = (win_h / 2) - (h / 2); 72 y = (win_h / 2) - (h / 2);
73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
74 efl_gfx_position_set(o_images[i], x, y); 74 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
75 } 75 }
76 } 76 }
77 FPS_STD(NAME); 77 FPS_STD(NAME);
diff --git a/src/bin/image_blend_smooth_same_scaled.c b/src/bin/image_blend_smooth_same_scaled.c
index 6a84b35..3106941 100644
--- a/src/bin/image_blend_smooth_same_scaled.c
+++ b/src/bin/image_blend_smooth_same_scaled.c
@@ -26,8 +26,8 @@ static void _setup(void)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("logo.png"), NULL); 28 efl_file_set(o, build_path("logo.png"), NULL);
29 efl_image_smooth_scale_set(o, 1); 29 efl_gfx_image_smooth_scale_set(o, 1);
30 efl_gfx_visible_set(o, EINA_TRUE); 30 efl_gfx_entity_visible_set(o, EINA_TRUE);
31 } 31 }
32 done = 0; 32 done = 0;
33} 33}
@@ -54,9 +54,9 @@ static void _loop(double t, int f)
54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 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)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
57 efl_gfx_position_set(o_images[i], x, y); 57 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
58 efl_gfx_size_set(o_images[i], w, h); 58 efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h));
59 efl_gfx_fill_set(o_images[i], 0, 0, w, h); 59 efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h));
60 } 60 }
61 FPS_STD(NAME); 61 FPS_STD(NAME);
62} 62}
diff --git a/src/bin/image_blend_smooth_scaled.c b/src/bin/image_blend_smooth_scaled.c
index 3888efb..5d9547d 100644
--- a/src/bin/image_blend_smooth_scaled.c
+++ b/src/bin/image_blend_smooth_scaled.c
@@ -26,8 +26,8 @@ static void _setup(void)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("logo.png"), NULL); 28 efl_file_set(o, build_path("logo.png"), NULL);
29 efl_image_smooth_scale_set(o, 1); 29 efl_gfx_image_smooth_scale_set(o, 1);
30 efl_gfx_visible_set(o, EINA_TRUE); 30 efl_gfx_entity_visible_set(o, EINA_TRUE);
31 } 31 }
32 done = 0; 32 done = 0;
33} 33}
@@ -54,9 +54,9 @@ static void _loop(double t, int f)
54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 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)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
57 efl_gfx_position_set(o_images[i], x, y); 57 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
58 efl_gfx_size_set(o_images[i], w, h); 58 efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h));
59 efl_gfx_fill_set(o_images[i], 0, 0, w, h); 59 efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h));
60 } 60 }
61 FPS_STD(NAME); 61 FPS_STD(NAME);
62} 62}
diff --git a/src/bin/image_blend_smooth_solid_same_scaled.c b/src/bin/image_blend_smooth_solid_same_scaled.c
index 00cdb36..d1a349e 100644
--- a/src/bin/image_blend_smooth_solid_same_scaled.c
+++ b/src/bin/image_blend_smooth_solid_same_scaled.c
@@ -26,8 +26,8 @@ static void _setup(void)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("image.png"), NULL); 28 efl_file_set(o, build_path("image.png"), NULL);
29 efl_image_smooth_scale_set(o, 1); 29 efl_gfx_image_smooth_scale_set(o, 1);
30 efl_gfx_visible_set(o, EINA_TRUE); 30 efl_gfx_entity_visible_set(o, EINA_TRUE);
31 } 31 }
32 done = 0; 32 done = 0;
33} 33}
@@ -54,9 +54,9 @@ static void _loop(double t, int f)
54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 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)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
57 efl_gfx_position_set(o_images[i], x, y); 57 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
58 efl_gfx_size_set(o_images[i], w, h); 58 efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h));
59 efl_gfx_fill_set(o_images[i], 0, 0, w, h); 59 efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h));
60 } 60 }
61 FPS_STD(NAME); 61 FPS_STD(NAME);
62} 62}
diff --git a/src/bin/image_blend_smooth_solid_scaled.c b/src/bin/image_blend_smooth_solid_scaled.c
index bc32293..e6e3931 100644
--- a/src/bin/image_blend_smooth_solid_scaled.c
+++ b/src/bin/image_blend_smooth_solid_scaled.c
@@ -26,8 +26,8 @@ static void _setup(void)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("image.png"), NULL); 28 efl_file_set(o, build_path("image.png"), NULL);
29 efl_image_smooth_scale_set(o, 1); 29 efl_gfx_image_smooth_scale_set(o, 1);
30 efl_gfx_visible_set(o, EINA_TRUE); 30 efl_gfx_entity_visible_set(o, EINA_TRUE);
31 } 31 }
32 done = 0; 32 done = 0;
33} 33}
@@ -54,9 +54,9 @@ static void _loop(double t, int f)
54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 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)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
57 efl_gfx_position_set(o_images[i], x, y); 57 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
58 efl_gfx_size_set(o_images[i], w, h); 58 efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h));
59 efl_gfx_fill_set(o_images[i], 0, 0, w, h); 59 efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h));
60 } 60 }
61 FPS_STD(NAME); 61 FPS_STD(NAME);
62} 62}
diff --git a/src/bin/image_blend_solid_border.c b/src/bin/image_blend_solid_border.c
index eca9176..8d3a02d 100644
--- a/src/bin/image_blend_solid_border.c
+++ b/src/bin/image_blend_solid_border.c
@@ -26,8 +26,8 @@ static void _setup(void)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("frame.png"), NULL); 28 efl_file_set(o, build_path("frame.png"), NULL);
29 efl_image_border_set(o, 8, 8, 8, 8); 29 efl_gfx_image_border_set(o, 8, 8, 8, 8);
30 efl_gfx_visible_set(o, EINA_TRUE); 30 efl_gfx_entity_visible_set(o, EINA_TRUE);
31 } 31 }
32 done = 0; 32 done = 0;
33} 33}
@@ -54,9 +54,9 @@ static void _loop(double t, int f)
54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 54 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 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)) * (h0 / 2); 56 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
57 efl_gfx_position_set(o_images[i], x, y); 57 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
58 efl_gfx_size_set(o_images[i], w, h); 58 efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h));
59 efl_gfx_fill_set(o_images[i], 0, 0, w, h); 59 efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h));
60 } 60 }
61 FPS_STD(NAME); 61 FPS_STD(NAME);
62} 62}
diff --git a/src/bin/image_blend_solid_fade_pow2_unscaled.c b/src/bin/image_blend_solid_fade_pow2_unscaled.c
index 148ee12..4ed7adf 100644
--- a/src/bin/image_blend_solid_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_solid_fade_pow2_unscaled.c
@@ -28,12 +28,12 @@ static void _setup(void)
28 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 28 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
29 o_images[i] = o; 29 o_images[i] = o;
30 efl_file_set(o, build_path("image.png"), NULL); 30 efl_file_set(o, build_path("image.png"), NULL);
31 efl_gfx_fill_set(o, 0, 0, 120, 160); 31 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
32 efl_gfx_size_set(o, 120, 160); 32 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
33 a = 256 - (1 << ((rnd() % 8) + 1)); 33 a = 256 - (1 << ((rnd() % 8) + 1));
34 if (a < 128) a = 128; 34 if (a < 128) a = 128;
35 efl_gfx_color_set(o, a, a, a, a); 35 efl_gfx_color_set(o, a, a, a, a);
36 efl_gfx_visible_set(o, EINA_TRUE); 36 efl_gfx_entity_visible_set(o, EINA_TRUE);
37 } 37 }
38 done = 0; 38 done = 0;
39} 39}
@@ -58,7 +58,7 @@ static void _loop(double t, int f)
58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
59 y = (win_h / 2) - (h / 2); 59 y = (win_h / 2) - (h / 2);
60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
61 efl_gfx_position_set(o_images[i], x, y); 61 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
62 } 62 }
63 FPS_STD(NAME); 63 FPS_STD(NAME);
64} 64}
diff --git a/src/bin/image_blend_solid_fade_unscaled.c b/src/bin/image_blend_solid_fade_unscaled.c
index f861222..5508e91 100644
--- a/src/bin/image_blend_solid_fade_unscaled.c
+++ b/src/bin/image_blend_solid_fade_unscaled.c
@@ -28,11 +28,11 @@ static void _setup(void)
28 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 28 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
29 o_images[i] = o; 29 o_images[i] = o;
30 efl_file_set(o, build_path("image.png"), NULL); 30 efl_file_set(o, build_path("image.png"), NULL);
31 efl_gfx_fill_set(o, 0, 0, 120, 160); 31 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
32 efl_gfx_size_set(o, 120, 160); 32 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
33 a = rnd()&0xff; 33 a = rnd()&0xff;
34 efl_gfx_color_set(o, a, a, a, a); 34 efl_gfx_color_set(o, a, a, a, a);
35 efl_gfx_visible_set(o, EINA_TRUE); 35 efl_gfx_entity_visible_set(o, 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 efl_gfx_position_set(o_images[i], x, y); 60 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
61 } 61 }
62 FPS_STD(NAME); 62 FPS_STD(NAME);
63} 63}
diff --git a/src/bin/image_blend_solid_middle_border.c b/src/bin/image_blend_solid_middle_border.c
index f1c5011..2569abd 100644
--- a/src/bin/image_blend_solid_middle_border.c
+++ b/src/bin/image_blend_solid_middle_border.c
@@ -26,9 +26,9 @@ static void _setup(void)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("bar.png"), NULL); 28 efl_file_set(o, build_path("bar.png"), NULL);
29 efl_image_border_set(o, 6, 6, 6, 6); 29 efl_gfx_image_border_set(o, 6, 6, 6, 6);
30 efl_image_border_center_fill_set(o, EFL_GFX_BORDER_FILL_MODE_SOLID); 30 efl_gfx_image_border_center_fill_set(o, EFL_GFX_BORDER_FILL_MODE_SOLID);
31 efl_gfx_visible_set(o, EINA_TRUE); 31 efl_gfx_entity_visible_set(o, EINA_TRUE);
32 } 32 }
33 done = 0; 33 done = 0;
34} 34}
@@ -55,9 +55,9 @@ static void _loop(double t, int f)
55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
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 efl_gfx_position_set(o_images[i], x, y); 58 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
59 efl_gfx_size_set(o_images[i], w, h); 59 efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h));
60 efl_gfx_fill_set(o_images[i], 0, 0, w, h); 60 efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h));
61 } 61 }
62 FPS_STD(NAME); 62 FPS_STD(NAME);
63} 63}
diff --git a/src/bin/image_blend_solid_middle_unscaled.c b/src/bin/image_blend_solid_middle_unscaled.c
index db0b341..60607b2 100644
--- a/src/bin/image_blend_solid_middle_unscaled.c
+++ b/src/bin/image_blend_solid_middle_unscaled.c
@@ -26,11 +26,11 @@ static void _setup(void)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("logo.png"), NULL); 28 efl_file_set(o, build_path("logo.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 120, 160); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
30 efl_gfx_size_set(o, 120, 160); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
31 efl_image_border_set(o, 43, 48, 48, 83); 31 efl_gfx_image_border_set(o, 43, 48, 48, 83);
32 efl_image_border_center_fill_set(o, EFL_GFX_BORDER_FILL_MODE_SOLID); 32 efl_gfx_image_border_center_fill_set(o, EFL_GFX_BORDER_FILL_MODE_SOLID);
33 efl_gfx_visible_set(o, EINA_TRUE); 33 efl_gfx_entity_visible_set(o, EINA_TRUE);
34 } 34 }
35 done = 0; 35 done = 0;
36} 36}
@@ -55,7 +55,7 @@ static void _loop(double t, int f)
55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 55 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
56 y = (win_h / 2) - (h / 2); 56 y = (win_h / 2) - (h / 2);
57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 57 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
58 efl_gfx_position_set(o_images[i], x, y); 58 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
59 } 59 }
60 FPS_STD(NAME); 60 FPS_STD(NAME);
61} 61}
diff --git a/src/bin/image_blend_solid_unscaled.c b/src/bin/image_blend_solid_unscaled.c
index 0f31d2b..12dffcf 100644
--- a/src/bin/image_blend_solid_unscaled.c
+++ b/src/bin/image_blend_solid_unscaled.c
@@ -26,9 +26,9 @@ static void _setup(void)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("image.png"), NULL); 28 efl_file_set(o, build_path("image.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 120, 160); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
30 efl_gfx_size_set(o, 120, 160); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
31 efl_gfx_visible_set(o, EINA_TRUE); 31 efl_gfx_entity_visible_set(o, EINA_TRUE);
32 } 32 }
33 done = 0; 33 done = 0;
34} 34}
@@ -53,7 +53,7 @@ static void _loop(double t, int f)
53 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 53 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
54 y = (win_h / 2) - (h / 2); 54 y = (win_h / 2) - (h / 2);
55 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 55 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
56 efl_gfx_position_set(o_images[i], x, y); 56 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
57 } 57 }
58 FPS_STD(NAME); 58 FPS_STD(NAME);
59} 59}
diff --git a/src/bin/image_blend_unscaled.c b/src/bin/image_blend_unscaled.c
index 7e656ac..d4ab662 100644
--- a/src/bin/image_blend_unscaled.c
+++ b/src/bin/image_blend_unscaled.c
@@ -26,9 +26,9 @@ static void _setup(void)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("logo.png"), NULL); 28 efl_file_set(o, build_path("logo.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 120, 160); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
30 efl_gfx_size_set(o, 120, 160); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
31 efl_gfx_visible_set(o, EINA_TRUE); 31 efl_gfx_entity_visible_set(o, EINA_TRUE);
32 } 32 }
33 done = 0; 33 done = 0;
34} 34}
@@ -53,7 +53,7 @@ static void _loop(double t, int f)
53 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 53 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
54 y = (win_h / 2) - (h / 2); 54 y = (win_h / 2) - (h / 2);
55 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 55 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
56 efl_gfx_position_set(o_images[i], x, y); 56 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
57 } 57 }
58 FPS_STD(NAME); 58 FPS_STD(NAME);
59} 59}
diff --git a/src/bin/image_crossfade.c b/src/bin/image_crossfade.c
index 7eb1606..d3e9dc8 100644
--- a/src/bin/image_crossfade.c
+++ b/src/bin/image_crossfade.c
@@ -25,16 +25,16 @@ static void _setup(void)
25 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 25 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
26 o_images[0] = o; 26 o_images[0] = o;
27 efl_file_set(o, build_path("im1.png"), NULL); 27 efl_file_set(o, build_path("im1.png"), NULL);
28 efl_gfx_fill_set(o, 0, 0, 720, 420); 28 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
29 efl_gfx_size_set(o, 720, 420); 29 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
30 efl_gfx_visible_set(o, EINA_TRUE); 30 efl_gfx_entity_visible_set(o, EINA_TRUE);
31 31
32 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 32 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
33 o_images[1] = o; 33 o_images[1] = o;
34 efl_file_set(o, build_path("im2.png"), NULL); 34 efl_file_set(o, build_path("im2.png"), NULL);
35 efl_gfx_fill_set(o, 0, 0, 720, 420); 35 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
36 efl_gfx_size_set(o, 720, 420); 36 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
37 efl_gfx_visible_set(o, EINA_TRUE); 37 efl_gfx_entity_visible_set(o, EINA_TRUE);
38 38
39 done = 0; 39 done = 0;
40} 40}
diff --git a/src/bin/image_data_argb.c b/src/bin/image_data_argb.c
index d5889ce..7e345a4 100644
--- a/src/bin/image_data_argb.c
+++ b/src/bin/image_data_argb.c
@@ -29,12 +29,12 @@ static void _setup(void)
29 { 29 {
30 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 30 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); 32 efl_gfx_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
33 efl_gfx_buffer_alpha_set(o, 0); 33 efl_gfx_buffer_alpha_set(o, 0);
34 efl_gfx_fill_set(o, 0, 0, 640, 480); 34 efl_gfx_fill_set(o, EINA_RECT(0, 0, 640, 480));
35 efl_gfx_size_set(o, 640, 480); 35 efl_gfx_entity_size_set(o, EINA_SIZE2D(640, 480));
36 efl_gfx_visible_set(o, EINA_TRUE); 36 efl_gfx_entity_visible_set(o, EINA_TRUE);
37 efl_gfx_buffer_managed_set(o, &sl, 640, 480, 0, EFL_GFX_COLORSPACE_ARGB8888, 0); 37 efl_gfx_buffer_managed_set(o, &sl, EINA_SIZE2D(640, 480), 0, EFL_GFX_COLORSPACE_ARGB8888, 0);
38 } 38 }
39 done = 0; 39 done = 0;
40} 40}
@@ -47,7 +47,7 @@ static void _cleanup(void)
47 Evas_Object *o = o_images[i]; 47 Evas_Object *o = o_images[i];
48 Eina_Slice sl = {}; 48 Eina_Slice sl = {};
49 49
50 efl_gfx_buffer_managed_get(o, &sl, 0); 50 sl = efl_gfx_buffer_managed_get(o, 0);
51 free((void *) sl.mem); 51 free((void *) sl.mem);
52 efl_del(o); 52 efl_del(o);
53 } 53 }
@@ -68,11 +68,11 @@ static void _loop(double t, int f)
68 h = 480; 68 h = 480;
69 x = (win_w / 2) - (w / 2); 69 x = (win_w / 2) - (w / 2);
70 y = (win_h / 2) - (h / 2); 70 y = (win_h / 2) - (h / 2);
71 efl_gfx_position_set(o, x, y); 71 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
72 efl_gfx_size_set(o, w, h); 72 efl_gfx_entity_size_set(o, EINA_SIZE2D(w, h));
73 efl_gfx_fill_set(o, 0, 0, w, h); 73 efl_gfx_fill_set(o, EINA_RECT(0, 0, w, h));
74 efl_gfx_buffer_map(o, &sl, EFL_GFX_BUFFER_ACCESS_MODE_WRITE, 74 sl = efl_gfx_buffer_map(o, EFL_GFX_BUFFER_ACCESS_MODE_WRITE,
75 0, 0, 0, 0, EFL_GFX_COLORSPACE_ARGB8888, 0, &st); 75 &EINA_RECT(0, 0, 0, 0), EFL_GFX_COLORSPACE_ARGB8888, 0, &st);
76 data = sl.mem; 76 data = sl.mem;
77 if (!data) 77 if (!data)
78 { 78 {
@@ -90,8 +90,8 @@ static void _loop(double t, int f)
90 } 90 }
91 p += (st - w); 91 p += (st - w);
92 } 92 }
93 efl_gfx_buffer_unmap(o, &sl); 93 efl_gfx_buffer_unmap(o, sl);
94 efl_gfx_buffer_update_add(o, 0, 0, w, h); 94 efl_gfx_buffer_update_add(o, &EINA_RECT(0, 0, w, h));
95 } 95 }
96 FPS_STD(NAME); 96 FPS_STD(NAME);
97} 97}
diff --git a/src/bin/image_data_argb_alpha.c b/src/bin/image_data_argb_alpha.c
index 79f4c54..f7306fd 100644
--- a/src/bin/image_data_argb_alpha.c
+++ b/src/bin/image_data_argb_alpha.c
@@ -29,12 +29,12 @@ static void _setup(void)
29 { 29 {
30 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 30 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); 32 efl_gfx_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
33 efl_gfx_buffer_alpha_set(o, 1); 33 efl_gfx_buffer_alpha_set(o, 1);
34 efl_gfx_fill_set(o, 0, 0, 640, 480); 34 efl_gfx_fill_set(o, EINA_RECT(0, 0, 640, 480));
35 efl_gfx_size_set(o, 640, 480); 35 efl_gfx_entity_size_set(o, EINA_SIZE2D(640, 480));
36 efl_gfx_visible_set(o, EINA_TRUE); 36 efl_gfx_entity_visible_set(o, EINA_TRUE);
37 efl_gfx_buffer_managed_set(o, &sl, 640, 480, 0, EFL_GFX_COLORSPACE_ARGB8888, 0); 37 efl_gfx_buffer_managed_set(o, &sl, EINA_SIZE2D(640, 480), 0, EFL_GFX_COLORSPACE_ARGB8888, 0);
38 } 38 }
39 done = 0; 39 done = 0;
40} 40}
@@ -47,7 +47,7 @@ static void _cleanup(void)
47 Evas_Object *o = o_images[i]; 47 Evas_Object *o = o_images[i];
48 Eina_Slice sl = {}; 48 Eina_Slice sl = {};
49 49
50 efl_gfx_buffer_managed_get(o, &sl, 0); 50 sl = efl_gfx_buffer_managed_get(o, 0);
51 free((void *) sl.mem); 51 free((void *) sl.mem);
52 efl_del(o); 52 efl_del(o);
53 } 53 }
@@ -70,11 +70,11 @@ static void _loop(double t, int f)
70 h = 480; 70 h = 480;
71 x = (win_w / 2) - (w / 2); 71 x = (win_w / 2) - (w / 2);
72 y = (win_h / 2) - (h / 2); 72 y = (win_h / 2) - (h / 2);
73 efl_gfx_position_set(o, x, y); 73 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
74 efl_gfx_size_set(o, w, h); 74 efl_gfx_entity_size_set(o, EINA_SIZE2D(w, h));
75 efl_gfx_fill_set(o, 0, 0, w, h); 75 efl_gfx_fill_set(o, EINA_RECT(0, 0, w, h));
76 efl_gfx_buffer_map(o, &sl, EFL_GFX_BUFFER_ACCESS_MODE_WRITE, 76 sl = efl_gfx_buffer_map(o, EFL_GFX_BUFFER_ACCESS_MODE_WRITE,
77 0, 0, 0, 0, EFL_GFX_COLORSPACE_ARGB8888, 0, &st); 77 &EINA_RECT(0, 0, 0, 0), EFL_GFX_COLORSPACE_ARGB8888, 0, &st);
78 if (!sl.mem) 78 if (!sl.mem)
79 { 79 {
80 fprintf(stderr, "ERROR: Failed to map image!\n"); 80 fprintf(stderr, "ERROR: Failed to map image!\n");
@@ -102,8 +102,8 @@ static void _loop(double t, int f)
102 } 102 }
103 p += (st - w); 103 p += (st - w);
104 } 104 }
105 efl_gfx_buffer_unmap(o, &sl); 105 efl_gfx_buffer_unmap(o, sl);
106 efl_gfx_buffer_update_add(o, 0, 0, w, h); 106 efl_gfx_buffer_update_add(o, &EINA_RECT(0, 0, w, h));
107 } 107 }
108 FPS_STD(NAME); 108 FPS_STD(NAME);
109} 109}
diff --git a/src/bin/image_data_ycbcr601pl.c b/src/bin/image_data_ycbcr601pl.c
index 032d5b3..7578879 100644
--- a/src/bin/image_data_ycbcr601pl.c
+++ b/src/bin/image_data_ycbcr601pl.c
@@ -26,11 +26,11 @@ static void _setup(void)
26 { 26 {
27 Evas_Object *o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 Evas_Object *o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); 29 efl_gfx_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
30 efl_gfx_buffer_alpha_set(o, 0); 30 efl_gfx_buffer_alpha_set(o, 0);
31 efl_gfx_fill_set(o, 0, 0, 640, 480); 31 efl_gfx_fill_set(o, EINA_RECT(0, 0, 640, 480));
32 efl_gfx_size_set(o, 640, 480); 32 efl_gfx_entity_size_set(o, EINA_SIZE2D(640, 480));
33 efl_gfx_visible_set(o, EINA_TRUE); 33 efl_gfx_entity_visible_set(o, EINA_TRUE);
34 34
35 slice[0].len = 640 * 480; 35 slice[0].len = 640 * 480;
36 slice[1].len = 320 * 240; 36 slice[1].len = 320 * 240;
@@ -41,7 +41,7 @@ static void _setup(void)
41 { 41 {
42 slice[p].mem = malloc(slice[p].len); 42 slice[p].mem = malloc(slice[p].len);
43 fread((void *) slice[p].mem, slice[p].len, 1, f); 43 fread((void *) slice[p].mem, slice[p].len, 1, f);
44 efl_gfx_buffer_managed_set(o, &slice[p], 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p); 44 efl_gfx_buffer_managed_set(o, &slice[p], EINA_SIZE2D(640, 480), 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p);
45 } 45 }
46 fclose(f); 46 fclose(f);
47 } 47 }
@@ -56,7 +56,7 @@ static void _cleanup(void)
56 Evas_Object *o = o_images[i]; 56 Evas_Object *o = o_images[i];
57 for (int p = 0; p < 3; p++) 57 for (int p = 0; p < 3; p++)
58 { 58 {
59 efl_gfx_buffer_managed_set(o, NULL, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p); 59 efl_gfx_buffer_managed_set(o, NULL, EINA_SIZE2D(640, 480), 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p);
60 free((void *) slice[p].mem); 60 free((void *) slice[p].mem);
61 } 61 }
62 efl_del(o); 62 efl_del(o);
@@ -74,10 +74,10 @@ static void _loop(double t, int f)
74 h = 480; 74 h = 480;
75 x = (win_w / 2) - (w / 2); 75 x = (win_w / 2) - (w / 2);
76 y = (win_h / 2) - (h / 2); 76 y = (win_h / 2) - (h / 2);
77 efl_gfx_position_set(o_images[i], x, y); 77 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
78 efl_gfx_size_set(o_images[i], w, h); 78 efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h));
79 efl_gfx_fill_set(o_images[i], 0, 0, w, h); 79 efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h));
80 efl_gfx_buffer_update_add(o_images[i], 0, 0, 640, 480); 80 efl_gfx_buffer_update_add(o_images[i], &EINA_RECT(0, 0, 640, 480));
81 } 81 }
82 FPS_STD(NAME); 82 FPS_STD(NAME);
83} 83}
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 0a5bcf4..417b694 100644
--- a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
@@ -26,11 +26,11 @@ static void _setup(void)
26 { 26 {
27 Evas_Object *o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 Evas_Object *o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); 29 efl_gfx_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
30 efl_gfx_buffer_alpha_set(o, 0); 30 efl_gfx_buffer_alpha_set(o, 0);
31 efl_gfx_fill_set(o, 0, 0, 640, 480); 31 efl_gfx_fill_set(o, EINA_RECT(0, 0, 640, 480));
32 efl_gfx_size_set(o, 640, 480); 32 efl_gfx_entity_size_set(o, EINA_SIZE2D(640, 480));
33 efl_gfx_visible_set(o, EINA_TRUE); 33 efl_gfx_entity_visible_set(o, EINA_TRUE);
34 34
35 slice[0].len = 640 * 480; 35 slice[0].len = 640 * 480;
36 slice[1].len = 320 * 240; 36 slice[1].len = 320 * 240;
@@ -41,7 +41,7 @@ static void _setup(void)
41 { 41 {
42 slice[p].mem = malloc(slice[p].len); 42 slice[p].mem = malloc(slice[p].len);
43 fread((void *) slice[p].mem, slice[p].len, 1, f); 43 fread((void *) slice[p].mem, slice[p].len, 1, f);
44 efl_gfx_buffer_managed_set(o, &slice[p], 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p); 44 efl_gfx_buffer_managed_set(o, &slice[p], EINA_SIZE2D(640, 480), 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p);
45 } 45 }
46 fclose(f); 46 fclose(f);
47 } 47 }
@@ -56,7 +56,7 @@ static void _cleanup(void)
56 Evas_Object *o = o_images[i]; 56 Evas_Object *o = o_images[i];
57 for (int p = 0; p < 3; p++) 57 for (int p = 0; p < 3; p++)
58 { 58 {
59 efl_gfx_buffer_managed_set(o, NULL, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p); 59 efl_gfx_buffer_managed_set(o, NULL, EINA_SIZE2D(640, 480), 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p);
60 free((void *) slice[p].mem); 60 free((void *) slice[p].mem);
61 } 61 }
62 efl_del(o); 62 efl_del(o);
diff --git a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
index 355293f..d25ef3e 100644
--- a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
@@ -26,11 +26,11 @@ static void _setup(void)
26 { 26 {
27 Evas_Object *o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 Evas_Object *o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); 29 efl_gfx_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
30 efl_gfx_buffer_alpha_set(o, 0); 30 efl_gfx_buffer_alpha_set(o, 0);
31 efl_gfx_fill_set(o, 0, 0, 640, 480); 31 efl_gfx_fill_set(o, EINA_RECT(0, 0, 640, 480));
32 efl_gfx_size_set(o, 640, 480); 32 efl_gfx_entity_size_set(o, EINA_SIZE2D(640, 480));
33 efl_gfx_visible_set(o, EINA_TRUE); 33 efl_gfx_entity_visible_set(o, EINA_TRUE);
34 34
35 slice[0].len = 640 * 480; 35 slice[0].len = 640 * 480;
36 slice[1].len = 320 * 240; 36 slice[1].len = 320 * 240;
@@ -41,7 +41,7 @@ static void _setup(void)
41 { 41 {
42 slice[p].mem = malloc(slice[p].len); 42 slice[p].mem = malloc(slice[p].len);
43 fread((void *) slice[p].mem, slice[p].len, 1, f); 43 fread((void *) slice[p].mem, slice[p].len, 1, f);
44 efl_gfx_buffer_managed_set(o, &slice[p], 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p); 44 efl_gfx_buffer_managed_set(o, &slice[p], EINA_SIZE2D(640, 480), 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p);
45 } 45 }
46 fclose(f); 46 fclose(f);
47 } 47 }
@@ -56,7 +56,7 @@ static void _cleanup(void)
56 Evas_Object *o = o_images[i]; 56 Evas_Object *o = o_images[i];
57 for (int p = 0; p < 3; p++) 57 for (int p = 0; p < 3; p++)
58 { 58 {
59 efl_gfx_buffer_managed_set(o, NULL, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p); 59 efl_gfx_buffer_managed_set(o, NULL, EINA_SIZE2D(640, 480), 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p);
60 free((void *) slice[p].mem); 60 free((void *) slice[p].mem);
61 } 61 }
62 efl_del(o); 62 efl_del(o);
diff --git a/src/bin/image_data_ycbcr601pl_wide_stride.c b/src/bin/image_data_ycbcr601pl_wide_stride.c
index d4e8fa2..40398ac 100644
--- a/src/bin/image_data_ycbcr601pl_wide_stride.c
+++ b/src/bin/image_data_ycbcr601pl_wide_stride.c
@@ -28,11 +28,11 @@ static void _setup(void)
28 { 28 {
29 Evas_Object *o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 29 Evas_Object *o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
30 o_images[i] = o; 30 o_images[i] = o;
31 efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); 31 efl_gfx_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
32 efl_gfx_buffer_alpha_set(o, 0); 32 efl_gfx_buffer_alpha_set(o, 0);
33 efl_gfx_fill_set(o, 0, 0, 640, 480); 33 efl_gfx_fill_set(o, EINA_RECT(0, 0, 640, 480));
34 efl_gfx_size_set(o, 640, 480); 34 efl_gfx_entity_size_set(o, EINA_SIZE2D(640, 480));
35 efl_gfx_visible_set(o, EINA_TRUE); 35 efl_gfx_entity_visible_set(o, EINA_TRUE);
36 36
37 // in this test, the stride is 640 but the width changes 37 // in this test, the stride is 640 but the width changes
38 slice[0].len = 640 * 480; 38 slice[0].len = 640 * 480;
@@ -45,7 +45,7 @@ static void _setup(void)
45 { 45 {
46 slice[p].mem = malloc(slice[p].len); 46 slice[p].mem = malloc(slice[p].len);
47 fread((void *) slice[p].mem, slice[p].len, 1, f); 47 fread((void *) slice[p].mem, slice[p].len, 1, f);
48 efl_gfx_buffer_managed_set(o, &slice[p], w, 480, stride, 48 efl_gfx_buffer_managed_set(o, &slice[p], EINA_SIZE2D(w, 480), stride,
49 EFL_GFX_COLORSPACE_YCBCR422P601_PL, p); 49 EFL_GFX_COLORSPACE_YCBCR422P601_PL, p);
50 stride = 320; 50 stride = 320;
51 } 51 }
@@ -62,7 +62,7 @@ static void _cleanup(void)
62 Evas_Object *o = o_images[i]; 62 Evas_Object *o = o_images[i];
63 for (int p = 0; p < 3; p++) 63 for (int p = 0; p < 3; p++)
64 { 64 {
65 efl_gfx_buffer_managed_set(o, NULL, 640, 480, 0, 65 efl_gfx_buffer_managed_set(o, NULL, EINA_SIZE2D(640, 480), 0,
66 EFL_GFX_COLORSPACE_YCBCR422P601_PL, p); 66 EFL_GFX_COLORSPACE_YCBCR422P601_PL, p);
67 free((void *) slice[p].mem); 67 free((void *) slice[p].mem);
68 } 68 }
@@ -82,15 +82,15 @@ static void _loop(double t, int f)
82 int stride; 82 int stride;
83 83
84 for (int p = 0; p < 3; p++) 84 for (int p = 0; p < 3; p++)
85 efl_gfx_buffer_managed_get(o, &sl[p], p); 85 sl[p] = efl_gfx_buffer_managed_get(o, p);
86 86
87 w = 640; 87 w = 640;
88 h = 480; 88 h = 480;
89 x = (win_w / 2) - (w / 2); 89 x = (win_w / 2) - (w / 2);
90 y = (win_h / 2) - (h / 2); 90 y = (win_h / 2) - (h / 2);
91 efl_gfx_position_set(o, x, y); 91 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
92 efl_gfx_size_set(o, w, h); 92 efl_gfx_entity_size_set(o, EINA_SIZE2D(w, h));
93 efl_gfx_fill_set(o, 0, 0, w, h); 93 efl_gfx_fill_set(o, EINA_RECT(0, 0, w, h));
94 94
95 // logic here differs a bit from old expedite 95 // logic here differs a bit from old expedite
96 w = 320 - 16 + (f * 2) % 336; 96 w = 320 - 16 + (f * 2) % 336;
@@ -99,11 +99,11 @@ static void _loop(double t, int f)
99 stride = 640; 99 stride = 640;
100 for (int p = 0; p < 3; p++) 100 for (int p = 0; p < 3; p++)
101 { 101 {
102 efl_gfx_buffer_managed_set(o, &sl[p], w, 480, stride, 102 efl_gfx_buffer_managed_set(o, &sl[p], EINA_SIZE2D(w, 480), stride,
103 EFL_GFX_COLORSPACE_YCBCR422P601_PL, p); 103 EFL_GFX_COLORSPACE_YCBCR422P601_PL, p);
104 stride = 320; 104 stride = 320;
105 } 105 }
106 efl_gfx_buffer_update_add(o, 0, 0, w, 480); 106 efl_gfx_buffer_update_add(o, &EINA_RECT(0, 0, w, 480));
107 } 107 }
108 FPS_STD(NAME); 108 FPS_STD(NAME);
109} 109}
diff --git a/src/bin/image_map_3d_1.c b/src/bin/image_map_3d_1.c
index 4d528e9..8703570 100644
--- a/src/bin/image_map_3d_1.c
+++ b/src/bin/image_map_3d_1.c
@@ -58,10 +58,10 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
60 efl_file_set(o, build_path(buf), NULL); 60 efl_file_set(o, build_path(buf), NULL);
61 efl_gfx_fill_set(o, 0, 0, 256, 256); 61 efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256));
62 efl_gfx_size_set(o, 256, 256); 62 efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256));
63 efl_image_smooth_scale_set(o, 0); 63 efl_gfx_image_smooth_scale_set(o, 0);
64 efl_gfx_visible_set(o, EINA_TRUE); 64 efl_gfx_entity_visible_set(o, 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 { 132 {
133 evas_object_map_enable_set(c->side[i].o, 1); 133 evas_object_map_enable_set(c->side[i].o, 1);
134 evas_object_map_set(c->side[i].o, m); 134 evas_object_map_set(c->side[i].o, m);
135 efl_gfx_visible_set(c->side[i].o, EINA_TRUE); 135 efl_gfx_entity_visible_set(c->side[i].o, EINA_TRUE);
136 } 136 }
137 else 137 else
138 { 138 {
139 efl_gfx_visible_set(c->side[i].o, EINA_FALSE); 139 efl_gfx_entity_visible_set(c->side[i].o, EINA_FALSE);
140 } 140 }
141 141
142 order[i] = i; 142 order[i] = i;
diff --git a/src/bin/image_map_3d_2.c b/src/bin/image_map_3d_2.c
index 587be91..a5b1a8b 100644
--- a/src/bin/image_map_3d_2.c
+++ b/src/bin/image_map_3d_2.c
@@ -58,9 +58,9 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
60 efl_file_set(o, build_path(buf), NULL); 60 efl_file_set(o, build_path(buf), NULL);
61 efl_gfx_fill_set(o, 0, 0, 256, 256); 61 efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256));
62 efl_gfx_size_set(o, 256, 256); 62 efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256));
63 efl_gfx_visible_set(o, EINA_TRUE); 63 efl_gfx_entity_visible_set(o, EINA_TRUE);
64 } 64 }
65 POINT(0, 0, -w, -h, -d, 0, 0); 65 POINT(0, 0, -w, -h, -d, 0, 0);
66 POINT(0, 1, w, -h, -d, 256, 0); 66 POINT(0, 1, w, -h, -d, 256, 0);
@@ -130,11 +130,11 @@ _cube_pos(Cube *c,
130 { 130 {
131 evas_object_map_enable_set(c->side[i].o, 1); 131 evas_object_map_enable_set(c->side[i].o, 1);
132 evas_object_map_set(c->side[i].o, m); 132 evas_object_map_set(c->side[i].o, m);
133 efl_gfx_visible_set(c->side[i].o, EINA_TRUE); 133 efl_gfx_entity_visible_set(c->side[i].o, EINA_TRUE);
134 } 134 }
135 else 135 else
136 { 136 {
137 efl_gfx_visible_set(c->side[i].o, EINA_FALSE); 137 efl_gfx_entity_visible_set(c->side[i].o, EINA_FALSE);
138 } 138 }
139 139
140 order[i] = i; 140 order[i] = i;
diff --git a/src/bin/image_map_3d_3.c b/src/bin/image_map_3d_3.c
index 83f7026..701ee35 100644
--- a/src/bin/image_map_3d_3.c
+++ b/src/bin/image_map_3d_3.c
@@ -58,10 +58,10 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
60 efl_file_set(o, build_path(buf), NULL); 60 efl_file_set(o, build_path(buf), NULL);
61 efl_gfx_fill_set(o, 0, 0, 256, 256); 61 efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256));
62 efl_gfx_size_set(o, 256, 256); 62 efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256));
63 efl_image_smooth_scale_set(o, 0); 63 efl_gfx_image_smooth_scale_set(o, 0);
64 efl_gfx_visible_set(o, EINA_TRUE); 64 efl_gfx_entity_visible_set(o, 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);
diff --git a/src/bin/image_map_3d_4.c b/src/bin/image_map_3d_4.c
index 04b7f81..b44f7d8 100644
--- a/src/bin/image_map_3d_4.c
+++ b/src/bin/image_map_3d_4.c
@@ -58,9 +58,9 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
60 efl_file_set(o, build_path(buf), NULL); 60 efl_file_set(o, build_path(buf), NULL);
61 efl_gfx_fill_set(o, 0, 0, 256, 256); 61 efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256));
62 efl_gfx_size_set(o, 256, 256); 62 efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256));
63 efl_gfx_visible_set(o, EINA_TRUE); 63 efl_gfx_entity_visible_set(o, EINA_TRUE);
64 } 64 }
65 POINT(0, 0, -w, -h, -d, 0, 0); 65 POINT(0, 0, -w, -h, -d, 0, 0);
66 POINT(0, 1, w, -h, -d, 256, 0); 66 POINT(0, 1, w, -h, -d, 256, 0);
diff --git a/src/bin/image_map_3d_5.c b/src/bin/image_map_3d_5.c
index 66a3710..8aba670 100644
--- a/src/bin/image_map_3d_5.c
+++ b/src/bin/image_map_3d_5.c
@@ -58,10 +58,10 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1); 59 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
60 efl_file_set(o, build_path(buf), NULL); 60 efl_file_set(o, build_path(buf), NULL);
61 efl_gfx_fill_set(o, 0, 0, 720, 420); 61 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
62 efl_gfx_size_set(o, 720, 420); 62 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
63 efl_image_smooth_scale_set(o, 0); 63 efl_gfx_image_smooth_scale_set(o, 0);
64 efl_gfx_visible_set(o, EINA_TRUE); 64 efl_gfx_entity_visible_set(o, 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, 720, 0); 67 POINT(0, 1, w, -h, -d, 720, 0);
@@ -132,11 +132,11 @@ _cube_pos(Cube *c,
132 { 132 {
133 evas_object_map_enable_set(c->side[i].o, 1); 133 evas_object_map_enable_set(c->side[i].o, 1);
134 evas_object_map_set(c->side[i].o, m); 134 evas_object_map_set(c->side[i].o, m);
135 efl_gfx_visible_set(c->side[i].o, EINA_TRUE); 135 efl_gfx_entity_visible_set(c->side[i].o, EINA_TRUE);
136 } 136 }
137 else 137 else
138 { 138 {
139 efl_gfx_visible_set(c->side[i].o, EINA_FALSE); 139 efl_gfx_entity_visible_set(c->side[i].o, EINA_FALSE);
140 } 140 }
141 141
142 order[i] = i; 142 order[i] = i;
diff --git a/src/bin/image_map_3d_6.c b/src/bin/image_map_3d_6.c
index 9ec1efe..f8581ff 100644
--- a/src/bin/image_map_3d_6.c
+++ b/src/bin/image_map_3d_6.c
@@ -58,10 +58,10 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1); 59 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
60 efl_file_set(o, build_path(buf), NULL); 60 efl_file_set(o, build_path(buf), NULL);
61 efl_gfx_fill_set(o, 0, 0, 720, 420); 61 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
62 efl_gfx_size_set(o, 720, 420); 62 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
63 efl_image_smooth_scale_set(o, 0); 63 efl_gfx_image_smooth_scale_set(o, 0);
64 efl_gfx_visible_set(o, EINA_TRUE); 64 efl_gfx_entity_visible_set(o, 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, 720, 0); 67 POINT(0, 1, w, -h, -d, 720, 0);
@@ -129,11 +129,11 @@ _cube_pos(Cube *c,
129 { 129 {
130 evas_object_map_enable_set(c->side[i].o, 1); 130 evas_object_map_enable_set(c->side[i].o, 1);
131 evas_object_map_set(c->side[i].o, m); 131 evas_object_map_set(c->side[i].o, m);
132 efl_gfx_visible_set(c->side[i].o, EINA_TRUE); 132 efl_gfx_entity_visible_set(c->side[i].o, EINA_TRUE);
133 } 133 }
134 else 134 else
135 { 135 {
136 efl_gfx_visible_set(c->side[i].o, EINA_FALSE); 136 efl_gfx_entity_visible_set(c->side[i].o, EINA_FALSE);
137 } 137 }
138 138
139 order[i] = i; 139 order[i] = i;
diff --git a/src/bin/image_map_3d_flow.c b/src/bin/image_map_3d_flow.c
index 378b127..55ceb02 100644
--- a/src/bin/image_map_3d_flow.c
+++ b/src/bin/image_map_3d_flow.c
@@ -33,19 +33,19 @@ static void _setup(void)
33 o_images[i] = o; 33 o_images[i] = o;
34 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); 34 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
35 efl_file_set(o, build_path(buf), NULL); 35 efl_file_set(o, build_path(buf), NULL);
36 efl_gfx_fill_set(o, 0, 0, 256, 256); 36 efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256));
37 efl_gfx_size_set(o, 256, 256); 37 efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256));
38 efl_image_smooth_scale_set(o, 0); 38 efl_gfx_image_smooth_scale_set(o, 0);
39 efl_gfx_visible_set(o, EINA_TRUE); 39 efl_gfx_entity_visible_set(o, EINA_TRUE);
40 40
41 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 41 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
42 o_reflec[i] = o; 42 o_reflec[i] = o;
43 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); 43 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
44 efl_file_set(o, build_path(buf), NULL); 44 efl_file_set(o, build_path(buf), NULL);
45 efl_gfx_fill_set(o, 0, 0, 256, 256); 45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256));
46 efl_gfx_size_set(o, 256, 256); 46 efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256));
47 efl_image_smooth_scale_set(o, 0); 47 efl_gfx_image_smooth_scale_set(o, 0);
48 efl_gfx_visible_set(o, EINA_TRUE); 48 efl_gfx_entity_visible_set(o, EINA_TRUE);
49 } 49 }
50 done = 0; 50 done = 0;
51} 51}
diff --git a/src/bin/image_map_color_alpha_nearest_rotate.c b/src/bin/image_map_color_alpha_nearest_rotate.c
index 3ca4c8b..b7b72dc 100644
--- a/src/bin/image_map_color_alpha_nearest_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_rotate.c
@@ -27,10 +27,10 @@ static void _setup(void)
27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("logo.png"), NULL); 29 efl_file_set(o, build_path("logo.png"), NULL);
30 efl_gfx_fill_set(o, 0, 0, 120, 160); 30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
31 efl_gfx_size_set(o, 120, 160); 31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
32 efl_image_smooth_scale_set(o, 0); 32 efl_gfx_image_smooth_scale_set(o, 0);
33 efl_gfx_visible_set(o, EINA_TRUE); 33 efl_gfx_entity_visible_set(o, EINA_TRUE);
34 } 34 }
35 done = 0; 35 done = 0;
36} 36}
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 bf2085a..dc4f931 100644
--- a/src/bin/image_map_color_alpha_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
@@ -27,10 +27,10 @@ static void _setup(void)
27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("image.png"), NULL); 29 efl_file_set(o, build_path("image.png"), NULL);
30 efl_gfx_fill_set(o, 0, 0, 120, 160); 30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
31 efl_gfx_size_set(o, 120, 160); 31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
32 efl_image_smooth_scale_set(o, 0); 32 efl_gfx_image_smooth_scale_set(o, 0);
33 efl_gfx_visible_set(o, EINA_TRUE); 33 efl_gfx_entity_visible_set(o, EINA_TRUE);
34 } 34 }
35 done = 0; 35 done = 0;
36} 36}
diff --git a/src/bin/image_map_color_alpha_rotate.c b/src/bin/image_map_color_alpha_rotate.c
index f0a7599..f35dd41 100644
--- a/src/bin/image_map_color_alpha_rotate.c
+++ b/src/bin/image_map_color_alpha_rotate.c
@@ -27,9 +27,9 @@ static void _setup(void)
27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("logo.png"), NULL); 29 efl_file_set(o, build_path("logo.png"), NULL);
30 efl_gfx_fill_set(o, 0, 0, 120, 160); 30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
31 efl_gfx_size_set(o, 120, 160); 31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
32 efl_gfx_visible_set(o, EINA_TRUE); 32 efl_gfx_entity_visible_set(o, EINA_TRUE);
33 } 33 }
34 done = 0; 34 done = 0;
35} 35}
diff --git a/src/bin/image_map_color_alpha_solid_rotate.c b/src/bin/image_map_color_alpha_solid_rotate.c
index f456325..ad9b4fd 100644
--- a/src/bin/image_map_color_alpha_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_solid_rotate.c
@@ -27,9 +27,9 @@ static void _setup(void)
27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("image.png"), NULL); 29 efl_file_set(o, build_path("image.png"), NULL);
30 efl_gfx_fill_set(o, 0, 0, 120, 160); 30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
31 efl_gfx_size_set(o, 120, 160); 31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
32 efl_gfx_visible_set(o, EINA_TRUE); 32 efl_gfx_entity_visible_set(o, EINA_TRUE);
33 } 33 }
34 done = 0; 34 done = 0;
35} 35}
diff --git a/src/bin/image_map_color_nearest_rotate.c b/src/bin/image_map_color_nearest_rotate.c
index 0c3e13a..28befcf 100644
--- a/src/bin/image_map_color_nearest_rotate.c
+++ b/src/bin/image_map_color_nearest_rotate.c
@@ -27,10 +27,10 @@ static void _setup(void)
27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("logo.png"), NULL); 29 efl_file_set(o, build_path("logo.png"), NULL);
30 efl_gfx_fill_set(o, 0, 0, 120, 160); 30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
31 efl_gfx_size_set(o, 120, 160); 31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
32 efl_image_smooth_scale_set(o, 0); 32 efl_gfx_image_smooth_scale_set(o, 0);
33 efl_gfx_visible_set(o, EINA_TRUE); 33 efl_gfx_entity_visible_set(o, EINA_TRUE);
34 } 34 }
35 done = 0; 35 done = 0;
36} 36}
diff --git a/src/bin/image_map_color_nearest_solid_rotate.c b/src/bin/image_map_color_nearest_solid_rotate.c
index 288ef6f..18fb435 100644
--- a/src/bin/image_map_color_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_nearest_solid_rotate.c
@@ -27,10 +27,10 @@ static void _setup(void)
27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("image.png"), NULL); 29 efl_file_set(o, build_path("image.png"), NULL);
30 efl_gfx_fill_set(o, 0, 0, 120, 160); 30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
31 efl_gfx_size_set(o, 120, 160); 31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
32 efl_image_smooth_scale_set(o, 0); 32 efl_gfx_image_smooth_scale_set(o, 0);
33 efl_gfx_visible_set(o, EINA_TRUE); 33 efl_gfx_entity_visible_set(o, EINA_TRUE);
34 } 34 }
35 done = 0; 35 done = 0;
36} 36}
diff --git a/src/bin/image_map_color_rotate.c b/src/bin/image_map_color_rotate.c
index 01dcfc1..f026081 100644
--- a/src/bin/image_map_color_rotate.c
+++ b/src/bin/image_map_color_rotate.c
@@ -27,9 +27,9 @@ static void _setup(void)
27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("logo.png"), NULL); 29 efl_file_set(o, build_path("logo.png"), NULL);
30 efl_gfx_fill_set(o, 0, 0, 120, 160); 30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
31 efl_gfx_size_set(o, 120, 160); 31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
32 efl_gfx_visible_set(o, EINA_TRUE); 32 efl_gfx_entity_visible_set(o, EINA_TRUE);
33 } 33 }
34 done = 0; 34 done = 0;
35} 35}
diff --git a/src/bin/image_map_color_solid_rotate.c b/src/bin/image_map_color_solid_rotate.c
index ab5515a..ed5dba5 100644
--- a/src/bin/image_map_color_solid_rotate.c
+++ b/src/bin/image_map_color_solid_rotate.c
@@ -27,9 +27,9 @@ static void _setup(void)
27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("image.png"), NULL); 29 efl_file_set(o, build_path("image.png"), NULL);
30 efl_gfx_fill_set(o, 0, 0, 120, 160); 30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
31 efl_gfx_size_set(o, 120, 160); 31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
32 efl_gfx_visible_set(o, EINA_TRUE); 32 efl_gfx_entity_visible_set(o, EINA_TRUE);
33 } 33 }
34 done = 0; 34 done = 0;
35} 35}
diff --git a/src/bin/image_map_nearest_rotate.c b/src/bin/image_map_nearest_rotate.c
index d080bc0..a4bf4ba 100644
--- a/src/bin/image_map_nearest_rotate.c
+++ b/src/bin/image_map_nearest_rotate.c
@@ -27,10 +27,10 @@ static void _setup(void)
27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("logo.png"), NULL); 29 efl_file_set(o, build_path("logo.png"), NULL);
30 efl_gfx_fill_set(o, 0, 0, 120, 160); 30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
31 efl_gfx_size_set(o, 120, 160); 31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
32 efl_image_smooth_scale_set(o, 0); 32 efl_gfx_image_smooth_scale_set(o, 0);
33 efl_gfx_visible_set(o, EINA_TRUE); 33 efl_gfx_entity_visible_set(o, EINA_TRUE);
34 } 34 }
35 done = 0; 35 done = 0;
36} 36}
diff --git a/src/bin/image_map_nearest_solid_rotate.c b/src/bin/image_map_nearest_solid_rotate.c
index 5499121..2f40227 100644
--- a/src/bin/image_map_nearest_solid_rotate.c
+++ b/src/bin/image_map_nearest_solid_rotate.c
@@ -27,10 +27,10 @@ static void _setup(void)
27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("image.png"), NULL); 29 efl_file_set(o, build_path("image.png"), NULL);
30 efl_gfx_fill_set(o, 0, 0, 120, 160); 30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
31 efl_gfx_size_set(o, 120, 160); 31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
32 efl_image_smooth_scale_set(o, 0); 32 efl_gfx_image_smooth_scale_set(o, 0);
33 efl_gfx_visible_set(o, EINA_TRUE); 33 efl_gfx_entity_visible_set(o, EINA_TRUE);
34 } 34 }
35 done = 0; 35 done = 0;
36} 36}
diff --git a/src/bin/image_map_rotate.c b/src/bin/image_map_rotate.c
index 6ed37ab..ab1ae84 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 = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("logo.png"), NULL); 29 efl_file_set(o, build_path("logo.png"), NULL);
30 efl_gfx_fill_set(o, 0, 0, 120, 160); 30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
31 efl_gfx_size_set(o, 120, 160); 31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
32 efl_gfx_visible_set(o, EINA_TRUE); 32 efl_gfx_entity_visible_set(o, 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 08ece39..3aab338 100644
--- a/src/bin/image_map_solid_rotate.c
+++ b/src/bin/image_map_solid_rotate.c
@@ -27,9 +27,9 @@ static void _setup(void)
27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("image.png"), NULL); 29 efl_file_set(o, build_path("image.png"), NULL);
30 efl_gfx_fill_set(o, 0, 0, 120, 160); 30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
31 efl_gfx_size_set(o, 120, 160); 31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
32 efl_gfx_visible_set(o, EINA_TRUE); 32 efl_gfx_entity_visible_set(o, EINA_TRUE);
33 } 33 }
34 done = 0; 34 done = 0;
35} 35}
diff --git a/src/bin/image_mask.c b/src/bin/image_mask.c
index 9d51f26..66a36bd 100644
--- a/src/bin/image_mask.c
+++ b/src/bin/image_mask.c
@@ -26,16 +26,16 @@ static void _setup(void)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("image.png"), NULL); 28 efl_file_set(o, build_path("image.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 120, 160); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
30 efl_gfx_size_set(o, 120, 160); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
31 efl_gfx_visible_set(o, EINA_TRUE); 31 efl_gfx_entity_visible_set(o, EINA_TRUE);
32 32
33 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 33 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
34 o_images[i + 1] = o; 34 o_images[i + 1] = o;
35 efl_file_set(o, build_path("e-logo.png"), NULL); 35 efl_file_set(o, build_path("e-logo.png"), NULL);
36 efl_gfx_fill_set(o, 0, 0, 120, 160); 36 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
37 efl_gfx_size_set(o, 120, 160); 37 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
38 efl_gfx_visible_set(o, EINA_TRUE); 38 efl_gfx_entity_visible_set(o, EINA_TRUE);
39 39
40 evas_object_clip_set(o_images[i], o); 40 evas_object_clip_set(o_images[i], o);
41 } 41 }
@@ -62,8 +62,8 @@ static void _loop(double t, int f)
62 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 62 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
63 y = (win_h / 2) - (h / 2); 63 y = (win_h / 2) - (h / 2);
64 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 64 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
65 efl_gfx_position_set(o_images[i], x, y); 65 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
66 efl_gfx_position_set(o_images[i + 1], x, y); 66 efl_gfx_entity_position_set(o_images[i + 1], EINA_POSITION2D(x, y));
67 } 67 }
68 FPS_STD(NAME); 68 FPS_STD(NAME);
69} 69}
diff --git a/src/bin/image_mask_10.c b/src/bin/image_mask_10.c
index 41b86eb..24a46bb 100644
--- a/src/bin/image_mask_10.c
+++ b/src/bin/image_mask_10.c
@@ -26,20 +26,20 @@ static void _setup(void)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-mask.png"), NULL); 28 efl_file_set(o, build_path("e-logo-mask.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 720, 420); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
30 efl_gfx_size_set(o, 720, 420); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
31 efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2); 31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2));
32 efl_gfx_visible_set(o, EINA_TRUE); 32 efl_gfx_entity_visible_set(o, EINA_TRUE);
33 33
34 for (i = 0; i < 1; i++) 34 for (i = 0; i < 1; i++)
35 { 35 {
36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("texture.png"), NULL); 38 efl_file_set(o, build_path("texture.png"), NULL);
39 efl_gfx_fill_set(o, 0, 0, win_w * 4, win_h * 4); 39 efl_gfx_fill_set(o, EINA_RECT(0, 0, win_w * 4, win_h * 4));
40 efl_gfx_size_set(o, win_w * 4, win_h * 4); 40 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w * 4, win_h * 4));
41 evas_object_clip_set(o, o_mask); 41 evas_object_clip_set(o, o_mask);
42 efl_gfx_visible_set(o, EINA_TRUE); 42 efl_gfx_entity_visible_set(o, EINA_TRUE);
43 } 43 }
44 done = 0; 44 done = 0;
45} 45}
diff --git a/src/bin/image_mask_11.c b/src/bin/image_mask_11.c
index 2626cd2..168bdc3 100644
--- a/src/bin/image_mask_11.c
+++ b/src/bin/image_mask_11.c
@@ -26,20 +26,20 @@ static void _setup(void)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-mask.png"), NULL); 28 efl_file_set(o, build_path("e-logo-mask.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 720, 420); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
30 efl_gfx_size_set(o, 720, 420); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
31 efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2); 31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2));
32 efl_gfx_visible_set(o, EINA_TRUE); 32 efl_gfx_entity_visible_set(o, EINA_TRUE);
33 33
34 for (i = 0; i < OBNUM; i++) 34 for (i = 0; i < OBNUM; i++)
35 { 35 {
36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("logo.png"), NULL); 38 efl_file_set(o, build_path("logo.png"), NULL);
39 efl_gfx_fill_set(o, 0, 0, 120, 160); 39 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
40 efl_gfx_size_set(o, 120, 160); 40 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
41 evas_object_clip_set(o, o_mask); 41 evas_object_clip_set(o, o_mask);
42 efl_gfx_visible_set(o, EINA_TRUE); 42 efl_gfx_entity_visible_set(o, EINA_TRUE);
43 } 43 }
44 done = 0; 44 done = 0;
45} 45}
@@ -66,7 +66,7 @@ static void _loop(double t, int f)
66 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 66 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
67 y = (win_h / 2) - (h / 2); 67 y = (win_h / 2) - (h / 2);
68 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 68 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
69 efl_gfx_position_set(o_images[i], x, y); 69 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
70 } 70 }
71 if (!m) m = evas_map_new(4); 71 if (!m) m = evas_map_new(4);
72 evas_map_util_points_populate_from_geometry(m, 72 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 821fb5b..9a5462d 100644
--- a/src/bin/image_mask_12.c
+++ b/src/bin/image_mask_12.c
@@ -26,21 +26,21 @@ static void _setup(void)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-mask.png"), NULL); 28 efl_file_set(o, build_path("e-logo-mask.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 720, 420); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
30 efl_gfx_size_set(o, 720, 420); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
31 efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2); 31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2));
32 efl_gfx_visible_set(o, EINA_TRUE); 32 efl_gfx_entity_visible_set(o, EINA_TRUE);
33 33
34 for (i = 0; i < OBNUM; i++) 34 for (i = 0; i < OBNUM; i++)
35 { 35 {
36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("logo.png"), NULL); 38 efl_file_set(o, build_path("logo.png"), NULL);
39 efl_gfx_fill_set(o, 0, 0, 120, 160); 39 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
40 efl_gfx_size_set(o, 120, 160); 40 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
41 efl_image_smooth_scale_set(o, 1); 41 efl_gfx_image_smooth_scale_set(o, 1);
42 evas_object_clip_set(o, o_mask); 42 evas_object_clip_set(o, o_mask);
43 efl_gfx_visible_set(o, EINA_TRUE); 43 efl_gfx_entity_visible_set(o, EINA_TRUE);
44 } 44 }
45 done = 0; 45 done = 0;
46} 46}
@@ -69,9 +69,9 @@ static void _loop(double t, int f)
69 y = (win_h / 2) - (h / 2); 69 y = (win_h / 2) - (h / 2);
70 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 70 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
71 71
72 efl_gfx_position_set(o_images[i], x, y); 72 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
73 efl_gfx_size_set(o_images[i], w, h); 73 efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h));
74 efl_gfx_fill_set(o_images[i], 0, 0, w, h); 74 efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h));
75 } 75 }
76 FPS_STD(NAME); 76 FPS_STD(NAME);
77} 77}
diff --git a/src/bin/image_mask_13.c b/src/bin/image_mask_13.c
index 175cb41..d627525 100644
--- a/src/bin/image_mask_13.c
+++ b/src/bin/image_mask_13.c
@@ -26,21 +26,21 @@ static void _setup(void)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-mask.png"), NULL); 28 efl_file_set(o, build_path("e-logo-mask.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 720, 420); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
30 efl_gfx_size_set(o, 720, 420); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
31 efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2); 31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2));
32 efl_gfx_visible_set(o, EINA_TRUE); 32 efl_gfx_entity_visible_set(o, EINA_TRUE);
33 33
34 for (i = 0; i < OBNUM; i++) 34 for (i = 0; i < OBNUM; i++)
35 { 35 {
36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("logo.png"), NULL); 38 efl_file_set(o, build_path("logo.png"), NULL);
39 efl_gfx_fill_set(o, 0, 0, 120, 160); 39 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
40 efl_gfx_size_set(o, 120, 160); 40 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
41 efl_image_smooth_scale_set(o, 0); 41 efl_gfx_image_smooth_scale_set(o, 0);
42 evas_object_clip_set(o, o_mask); 42 evas_object_clip_set(o, o_mask);
43 efl_gfx_visible_set(o, EINA_TRUE); 43 efl_gfx_entity_visible_set(o, EINA_TRUE);
44 } 44 }
45 done = 0; 45 done = 0;
46} 46}
@@ -69,9 +69,9 @@ static void _loop(double t, int f)
69 y = (win_h / 2) - (h / 2); 69 y = (win_h / 2) - (h / 2);
70 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 70 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
71 71
72 efl_gfx_position_set(o_images[i], x, y); 72 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
73 efl_gfx_size_set(o_images[i], w, h); 73 efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h));
74 efl_gfx_fill_set(o_images[i], 0, 0, w, h); 74 efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h));
75 } 75 }
76 FPS_STD(NAME); 76 FPS_STD(NAME);
77} 77}
diff --git a/src/bin/image_mask_2.c b/src/bin/image_mask_2.c
index ef38394..85b0c71 100644
--- a/src/bin/image_mask_2.c
+++ b/src/bin/image_mask_2.c
@@ -26,16 +26,16 @@ static void _setup(void)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("image.png"), NULL); 28 efl_file_set(o, build_path("image.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 120, 160); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
30 efl_gfx_size_set(o, 120, 160); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
31 efl_gfx_visible_set(o, EINA_TRUE); 31 efl_gfx_entity_visible_set(o, EINA_TRUE);
32 32
33 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 33 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
34 o_images[i + 1] = o; 34 o_images[i + 1] = o;
35 efl_file_set(o, build_path("e-logo-2.png"), NULL); 35 efl_file_set(o, build_path("e-logo-2.png"), NULL);
36 efl_gfx_fill_set(o, 0, 0, 120, 160); 36 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
37 efl_gfx_size_set(o, 120, 160); 37 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
38 efl_gfx_visible_set(o, EINA_TRUE); 38 efl_gfx_entity_visible_set(o, EINA_TRUE);
39 39
40 evas_object_clip_set(o_images[i], o); 40 evas_object_clip_set(o_images[i], o);
41 } 41 }
@@ -62,8 +62,8 @@ static void _loop(double t, int f)
62 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 62 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
63 y = (win_h / 2) - (h / 2); 63 y = (win_h / 2) - (h / 2);
64 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 64 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
65 efl_gfx_position_set(o_images[i], x, y); 65 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
66 efl_gfx_position_set(o_images[i + 1], x, y); 66 efl_gfx_entity_position_set(o_images[i + 1], EINA_POSITION2D(x, y));
67 } 67 }
68 FPS_STD(NAME); 68 FPS_STD(NAME);
69} 69}
diff --git a/src/bin/image_mask_3.c b/src/bin/image_mask_3.c
index 4e45e32..16d882f 100644
--- a/src/bin/image_mask_3.c
+++ b/src/bin/image_mask_3.c
@@ -26,16 +26,16 @@ static void _setup(void)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("e-logo-2.png"), NULL); 28 efl_file_set(o, build_path("e-logo-2.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 120, 160); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
30 efl_gfx_size_set(o, 120, 160); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
31 efl_gfx_visible_set(o, EINA_TRUE); 31 efl_gfx_entity_visible_set(o, EINA_TRUE);
32 32
33 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 33 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
34 o_images[i + 1] = o; 34 o_images[i + 1] = o;
35 efl_file_set(o, build_path("logo.png"), NULL); 35 efl_file_set(o, build_path("logo.png"), NULL);
36 efl_gfx_fill_set(o, 0, 0, 120, 160); 36 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
37 efl_gfx_size_set(o, 120, 160); 37 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
38 efl_gfx_visible_set(o, EINA_TRUE); 38 efl_gfx_entity_visible_set(o, EINA_TRUE);
39 39
40 evas_object_clip_set(o_images[i], o); 40 evas_object_clip_set(o_images[i], o);
41 } 41 }
@@ -62,8 +62,8 @@ static void _loop(double t, int f)
62 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 62 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
63 y = (win_h / 2) - (h / 2); 63 y = (win_h / 2) - (h / 2);
64 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 64 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
65 efl_gfx_position_set(o_images[i], x, y); 65 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
66 efl_gfx_position_set(o_images[i + 1], x, y); 66 efl_gfx_entity_position_set(o_images[i + 1], EINA_POSITION2D(x, y));
67 } 67 }
68 FPS_STD(NAME); 68 FPS_STD(NAME);
69} 69}
diff --git a/src/bin/image_mask_4.c b/src/bin/image_mask_4.c
index c4a01aa..549e7bd 100644
--- a/src/bin/image_mask_4.c
+++ b/src/bin/image_mask_4.c
@@ -26,20 +26,20 @@ static void _setup(void)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-mask.png"), NULL); 28 efl_file_set(o, build_path("e-logo-mask.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 720, 420); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
30 efl_gfx_size_set(o, 720, 420); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
31 efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2); 31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2));
32 efl_gfx_visible_set(o, EINA_TRUE); 32 efl_gfx_entity_visible_set(o, EINA_TRUE);
33 33
34 for (i = 0; i < OBNUM; i++) 34 for (i = 0; i < OBNUM; i++)
35 { 35 {
36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("logo.png"), NULL); 38 efl_file_set(o, build_path("logo.png"), NULL);
39 efl_gfx_fill_set(o, 0, 0, 120, 160); 39 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
40 efl_gfx_size_set(o, 120, 160); 40 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
41 evas_object_clip_set(o, o_mask); 41 evas_object_clip_set(o, o_mask);
42 efl_gfx_visible_set(o, EINA_TRUE); 42 efl_gfx_entity_visible_set(o, EINA_TRUE);
43 } 43 }
44 done = 0; 44 done = 0;
45} 45}
@@ -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 efl_gfx_position_set(o_images[i], x, y); 68 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
69 } 69 }
70 FPS_STD(NAME); 70 FPS_STD(NAME);
71} 71}
diff --git a/src/bin/image_mask_5.c b/src/bin/image_mask_5.c
index facdf61..a7d564d 100644
--- a/src/bin/image_mask_5.c
+++ b/src/bin/image_mask_5.c
@@ -26,20 +26,20 @@ static void _setup(void)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-2.png"), NULL); 28 efl_file_set(o, build_path("e-logo-2.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 120, 160); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
30 efl_gfx_size_set(o, 120, 160); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
31 efl_gfx_position_set(o, (win_w - 120) / 2, (win_h - 160) / 2); 31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 120) / 2, (win_h - 160) / 2));
32 efl_gfx_visible_set(o, EINA_TRUE); 32 efl_gfx_entity_visible_set(o, EINA_TRUE);
33 33
34 for (i = 0; i < OBNUM; i++) 34 for (i = 0; i < OBNUM; i++)
35 { 35 {
36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("logo.png"), NULL); 38 efl_file_set(o, build_path("logo.png"), NULL);
39 efl_gfx_fill_set(o, 0, 0, 120, 160); 39 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
40 efl_gfx_size_set(o, 120, 160); 40 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
41 evas_object_clip_set(o, o_mask); 41 evas_object_clip_set(o, o_mask);
42 efl_gfx_visible_set(o, EINA_TRUE); 42 efl_gfx_entity_visible_set(o, EINA_TRUE);
43 } 43 }
44 done = 0; 44 done = 0;
45} 45}
@@ -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 efl_gfx_position_set(o_images[i], x, y); 68 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
69 } 69 }
70 FPS_STD(NAME); 70 FPS_STD(NAME);
71} 71}
diff --git a/src/bin/image_mask_6.c b/src/bin/image_mask_6.c
index d24bba4..0e6f58c 100644
--- a/src/bin/image_mask_6.c
+++ b/src/bin/image_mask_6.c
@@ -26,20 +26,20 @@ static void _setup(void)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-mask.png"), NULL); 28 efl_file_set(o, build_path("e-logo-mask.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 720, 420); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
30 efl_gfx_size_set(o, 720, 420); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
31 efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2); 31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2));
32 efl_gfx_visible_set(o, EINA_TRUE); 32 efl_gfx_entity_visible_set(o, EINA_TRUE);
33 33
34 for (i = 0; i < OBNUM; i++) 34 for (i = 0; i < OBNUM; i++)
35 { 35 {
36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("logo.png"), NULL); 38 efl_file_set(o, build_path("logo.png"), NULL);
39 efl_gfx_fill_set(o, 0, 0, 120 / 2, 160 / 2); 39 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120 / 2, 160 / 2));
40 efl_gfx_size_set(o, 120 / 2, 160 / 2); 40 efl_gfx_entity_size_set(o, EINA_SIZE2D(120 / 2, 160 / 2));
41 evas_object_clip_set(o, o_mask); 41 evas_object_clip_set(o, o_mask);
42 efl_gfx_visible_set(o, EINA_TRUE); 42 efl_gfx_entity_visible_set(o, EINA_TRUE);
43 } 43 }
44 done = 0; 44 done = 0;
45} 45}
@@ -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 efl_gfx_position_set(o_images[i], x, y); 68 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
69 } 69 }
70 FPS_STD(NAME); 70 FPS_STD(NAME);
71} 71}
diff --git a/src/bin/image_mask_7.c b/src/bin/image_mask_7.c
index 8a85596..6f57d6b 100644
--- a/src/bin/image_mask_7.c
+++ b/src/bin/image_mask_7.c
@@ -26,20 +26,20 @@ static void _setup(void)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-2.png"), NULL); 28 efl_file_set(o, build_path("e-logo-2.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 120, 160); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
30 efl_gfx_size_set(o, 120, 160); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
31 efl_gfx_position_set(o, (win_w - 120) / 2, (win_h - 160) / 2); 31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 120) / 2, (win_h - 160) / 2));
32 efl_gfx_visible_set(o, EINA_TRUE); 32 efl_gfx_entity_visible_set(o, EINA_TRUE);
33 33
34 for (i = 0; i < OBNUM; i++) 34 for (i = 0; i < OBNUM; i++)
35 { 35 {
36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("logo.png"), NULL); 38 efl_file_set(o, build_path("logo.png"), NULL);
39 efl_gfx_fill_set(o, 0, 0, 120, 160); 39 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
40 efl_gfx_size_set(o, 120, 160); 40 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
41 evas_object_clip_set(o, o_mask); 41 evas_object_clip_set(o, o_mask);
42 efl_gfx_visible_set(o, EINA_TRUE); 42 efl_gfx_entity_visible_set(o, EINA_TRUE);
43 } 43 }
44 done = 0; 44 done = 0;
45} 45}
@@ -65,13 +65,13 @@ 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 efl_gfx_position_set(o_images[i], x, y); 68 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
69 } 69 }
70 w = 10 + (110 + (110 * sin((double)(f) / (14.3 * SLOW)))); 70 w = 10 + (110 + (110 * sin((double)(f) / (14.3 * SLOW))));
71 h = 10 + (150 + (150 * sin((double)(f) / (21.7 * SLOW)))); 71 h = 10 + (150 + (150 * sin((double)(f) / (21.7 * SLOW))));
72 efl_gfx_fill_set(o_mask, 0, 0, w, h); 72 efl_gfx_fill_set(o_mask, EINA_RECT(0, 0, w, h));
73 efl_gfx_size_set(o_mask, w, h); 73 efl_gfx_entity_size_set(o_mask, EINA_SIZE2D(w, h));
74 efl_gfx_position_set(o_mask, (win_w - w) / 2, (win_h - h) / 2); 74 efl_gfx_entity_position_set(o_mask, EINA_POSITION2D((win_w - w) / 2, (win_h - h) / 2));
75 FPS_STD(NAME); 75 FPS_STD(NAME);
76} 76}
77 77
diff --git a/src/bin/image_mask_8.c b/src/bin/image_mask_8.c
index 8d586f7..ba58050 100644
--- a/src/bin/image_mask_8.c
+++ b/src/bin/image_mask_8.c
@@ -26,20 +26,20 @@ static void _setup(void)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-mask.png"), NULL); 28 efl_file_set(o, build_path("e-logo-mask.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 720, 420); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
30 efl_gfx_size_set(o, 720, 420); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
31 efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2); 31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2));
32 efl_gfx_visible_set(o, EINA_TRUE); 32 efl_gfx_entity_visible_set(o, EINA_TRUE);
33 33
34 for (i = 0; i < 1; i++) 34 for (i = 0; i < 1; i++)
35 { 35 {
36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("texture.png"), NULL); 38 efl_file_set(o, build_path("texture.png"), NULL);
39 efl_gfx_fill_set(o, 0, 0, 500, 444); 39 efl_gfx_fill_set(o, EINA_RECT(0, 0, 500, 444));
40 efl_gfx_size_set(o, win_w * 4, win_h * 4); 40 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w * 4, win_h * 4));
41 evas_object_clip_set(o, o_mask); 41 evas_object_clip_set(o, o_mask);
42 efl_gfx_visible_set(o, EINA_TRUE); 42 efl_gfx_entity_visible_set(o, EINA_TRUE);
43 } 43 }
44 done = 0; 44 done = 0;
45} 45}
@@ -65,7 +65,7 @@ static void _loop(double t, int f)
65 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (500 / 2); 65 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (500 / 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)) * (444 / 2); 67 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (444 / 2);
68 efl_gfx_position_set(o_images[i], x, y); 68 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
69 } 69 }
70 FPS_STD(NAME); 70 FPS_STD(NAME);
71} 71}
diff --git a/src/bin/image_mask_9.c b/src/bin/image_mask_9.c
index 4d5ac81..6c50d9e 100644
--- a/src/bin/image_mask_9.c
+++ b/src/bin/image_mask_9.c
@@ -26,20 +26,20 @@ static void _setup(void)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-mask.png"), NULL); 28 efl_file_set(o, build_path("e-logo-mask.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 720, 420); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
30 efl_gfx_size_set(o, 720, 420); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
31 efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2); 31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2));
32 efl_gfx_visible_set(o, EINA_TRUE); 32 efl_gfx_entity_visible_set(o, EINA_TRUE);
33 33
34 for (i = 0; i < 1; i++) 34 for (i = 0; i < 1; i++)
35 { 35 {
36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("texture.png"), NULL); 38 efl_file_set(o, build_path("texture.png"), NULL);
39 efl_gfx_fill_set(o, 0, 0, 500, 444); 39 efl_gfx_fill_set(o, EINA_RECT(0, 0, 500, 444));
40 efl_gfx_size_set(o, win_w * 4, win_h * 4); 40 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w * 4, win_h * 4));
41 evas_object_clip_set(o, o_mask); 41 evas_object_clip_set(o, o_mask);
42 efl_gfx_visible_set(o, EINA_TRUE); 42 efl_gfx_entity_visible_set(o, EINA_TRUE);
43 } 43 }
44 done = 0; 44 done = 0;
45} 45}
@@ -66,7 +66,7 @@ static void _loop(double t, int f)
66 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (500 / 2); 66 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (500 / 2);
67 y = (win_h / 2) - (h / 2); 67 y = (win_h / 2) - (h / 2);
68 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (444 / 2); 68 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (444 / 2);
69 efl_gfx_position_set(o_images[i], x, y); 69 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
70 } 70 }
71 if (!m) m = evas_map_new(4); 71 if (!m) m = evas_map_new(4);
72 72
diff --git a/src/bin/image_quality_scale.c b/src/bin/image_quality_scale.c
index 4eda01f..9a6b58f 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 = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("tp.png"), NULL); 29 efl_file_set(o, build_path("tp.png"), NULL);
30 efl_gfx_fill_set(o, 0, 0, 640, 480); 30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 640, 480));
31 efl_gfx_size_set(o, 640, 480); 31 efl_gfx_entity_size_set(o, EINA_SIZE2D(640, 480));
32 efl_gfx_visible_set(o, EINA_TRUE); 32 efl_gfx_entity_visible_set(o, 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 efl_gfx_position_set(o_images[i], x, y); 57 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
58 efl_gfx_size_set(o_images[i], w, h); 58 efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h));
59 efl_gfx_fill_set(o_images[i], 0, 0, w, h); 59 efl_gfx_fill_set(o_images[i], EINA_RECT(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 dab8ef0..9ea9c72 100644
--- a/src/bin/line_blend.c
+++ b/src/bin/line_blend.c
@@ -34,7 +34,7 @@ static void _setup(void)
34 b = ((rnd()&0xff) * a) / 255; 34 b = ((rnd()&0xff) * a) / 255;
35 efl_gfx_color_set(o, r, g, b, a); 35 efl_gfx_color_set(o, r, g, b, a);
36 evas_object_line_xy_set(o, ((win_w / 2) * (rnd()&0xff)) / 255, ((win_h / 2) * (rnd()&0xff)) / 255, ((win_w / 2) * (rnd()&0xff)) / 255 + (win_w / 2), ((win_h / 2) * (rnd()&0xff)) / 255 + (win_h / 2)); 36 evas_object_line_xy_set(o, ((win_w / 2) * (rnd()&0xff)) / 255, ((win_h / 2) * (rnd()&0xff)) / 255, ((win_w / 2) * (rnd()&0xff)) / 255 + (win_w / 2), ((win_h / 2) * (rnd()&0xff)) / 255 + (win_h / 2));
37 efl_gfx_visible_set(o, EINA_TRUE); 37 efl_gfx_entity_visible_set(o, EINA_TRUE);
38 38
39 39
40 } 40 }
diff --git a/src/bin/main.c b/src/bin/main.c
index 4e26070..9681f25 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -1203,6 +1203,30 @@ _cb_anim(void *data EINA_UNUSED)
1203 return EINA_TRUE; 1203 return EINA_TRUE;
1204} 1204}
1205 1205
1206void
1207exp_size_get(Eo *obj, int *w, int *h)
1208{
1209 Eina_Size2D size = efl_gfx_entity_size_get(obj);
1210 if (w) *w = size.w;
1211 if (h) *h = size.h;
1212}
1213
1214void
1215exp_pos_get(Eo *obj, int *x, int *y)
1216{
1217 Eina_Position2D position = efl_gfx_entity_position_get(obj);
1218 if (x) *x = position.x;
1219 if (y) *y = position.y;
1220}
1221
1222void
1223exp_input_pointer_pos_get(Eo *obj, int *x, int *y)
1224{
1225 Eina_Position2D position = efl_input_pointer_position_get(obj);
1226 if (x) *x = position.x;
1227 if (y) *y = position.y;
1228}
1229
1206static Ecore_Job *_job = NULL; 1230static Ecore_Job *_job = NULL;
1207 1231
1208static void 1232static void
diff --git a/src/bin/main.h b/src/bin/main.h
index cd481b1..3db08c7 100644
--- a/src/bin/main.h
+++ b/src/bin/main.h
@@ -79,6 +79,10 @@ const char *build_path(const char *filename);
79void engine_loop(void); 79void engine_loop(void);
80int engine_abort(void); 80int engine_abort(void);
81 81
82void exp_size_get(Eo *obj, int *w, int *h);
83void exp_pos_get(Eo *obj, int *x, int *y);
84void exp_input_pointer_pos_get(Eo *obj, int *x, int *y);
85
82#ifdef __cplusplus 86#ifdef __cplusplus
83} 87}
84#endif 88#endif
diff --git a/src/bin/poly_blend.c b/src/bin/poly_blend.c
index 3bc3ca7..789efd4 100644
--- a/src/bin/poly_blend.c
+++ b/src/bin/poly_blend.c
@@ -23,35 +23,35 @@ poly(Evas_Object *o, int type, Evas_Coord x, Evas_Coord y)
23 switch (type % 4) 23 switch (type % 4)
24 { 24 {
25 case 0: /* triangle */ 25 case 0: /* triangle */
26 efl_canvas_polygon_point_add(o, x + 50, y + 0); 26 efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 50, y + 0));
27 efl_canvas_polygon_point_add(o, x + 100, y + 100); 27 efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 100, y + 100));
28 efl_canvas_polygon_point_add(o, x + 0, y + 100); 28 efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 0, y + 100));
29 break; 29 break;
30 case 1: /* square */ 30 case 1: /* square */
31 efl_canvas_polygon_point_add(o, x + 0, y + 0); 31 efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 0, y + 0));
32 efl_canvas_polygon_point_add(o, x + 100, y + 0); 32 efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 100, y + 0));
33 efl_canvas_polygon_point_add(o, x + 100, y + 100); 33 efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 100, y + 100));
34 efl_canvas_polygon_point_add(o, x + 0, y + 100); 34 efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 0, y + 100));
35 break; 35 break;
36 case 2: /* hex */ 36 case 2: /* hex */
37 efl_canvas_polygon_point_add(o, x + 50, y + 0); 37 efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 50, y + 0));
38 efl_canvas_polygon_point_add(o, x + 100, y + 30); 38 efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 100, y + 30));
39 efl_canvas_polygon_point_add(o, x + 100, y + 70); 39 efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 100, y + 70));
40 efl_canvas_polygon_point_add(o, x + 50, y + 100); 40 efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 50, y + 100));
41 efl_canvas_polygon_point_add(o, x + 0, y + 70); 41 efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 0, y + 70));
42 efl_canvas_polygon_point_add(o, x + 0, y + 30); 42 efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 0, y + 30));
43 break; 43 break;
44 case 3: /* star */ 44 case 3: /* star */
45 efl_canvas_polygon_point_add(o, x + 50, y + 0); 45 efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 50, y + 0));
46 efl_canvas_polygon_point_add(o, x + 60, y + 40); 46 efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 60, y + 40));
47 efl_canvas_polygon_point_add(o, x + 90, y + 30); 47 efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 90, y + 30));
48 efl_canvas_polygon_point_add(o, x + 70, y + 60); 48 efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 70, y + 60));
49 efl_canvas_polygon_point_add(o, x + 90, y + 100); 49 efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 90, y + 100));
50 efl_canvas_polygon_point_add(o, x + 50, y + 70); 50 efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 50, y + 70));
51 efl_canvas_polygon_point_add(o, x + 10, y + 100); 51 efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 10, y + 100));
52 efl_canvas_polygon_point_add(o, x + 30, y + 60); 52 efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 30, y + 60));
53 efl_canvas_polygon_point_add(o, x + 10, y + 30); 53 efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 10, y + 30));
54 efl_canvas_polygon_point_add(o, x + 40, y + 40); 54 efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 40, y + 40));
55 break; 55 break;
56 default: 56 default:
57 break; 57 break;
@@ -75,7 +75,7 @@ static void _setup(void)
75 g = ((rnd()&0xff) * a) / 255; 75 g = ((rnd()&0xff) * a) / 255;
76 b = ((rnd()&0xff) * a) / 255; 76 b = ((rnd()&0xff) * a) / 255;
77 efl_gfx_color_set(o, r, g, b, a); 77 efl_gfx_color_set(o, r, g, b, a);
78 efl_gfx_visible_set(o, EINA_TRUE); 78 efl_gfx_entity_visible_set(o, EINA_TRUE);
79 poly(o, i, 0, 0); 79 poly(o, i, 0, 0);
80 } 80 }
81 done = 0; 81 done = 0;
@@ -99,13 +99,13 @@ static void _loop(double t, int f)
99 { 99 {
100 o = o_images[i]; 100 o = o_images[i];
101 if (o) 101 if (o)
102 efl_gfx_size_get(o, &w, &h); 102 exp_size_get(o, &w, &h);
103 x = (win_w / 2) - (w / 2); 103 x = (win_w / 2) - (w / 2);
104 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 4); 104 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 4);
105 y = (win_h / 2) - (h / 2); 105 y = (win_h / 2) - (h / 2);
106 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 4); 106 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 4);
107 if (o) 107 if (o)
108 efl_gfx_position_set(o, x, y); 108 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
109 } 109 }
110 FPS_STD(NAME); 110 FPS_STD(NAME);
111} 111}
diff --git a/src/bin/proxy_image.c b/src/bin/proxy_image.c
index 3538877..8d9f0a0 100644
--- a/src/bin/proxy_image.c
+++ b/src/bin/proxy_image.c
@@ -24,9 +24,9 @@ static void _setup(void)
24 24
25 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 25 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
26 efl_file_set(o, build_path("logo.png"), NULL); 26 efl_file_set(o, build_path("logo.png"), NULL);
27 efl_gfx_fill_set(o, 0, 0, 120, 160); 27 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
28 efl_gfx_size_set(o, 120, 160); 28 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
29 efl_gfx_visible_set(o, EINA_TRUE); 29 efl_gfx_entity_visible_set(o, EINA_TRUE);
30 src = o; 30 src = o;
31 o_images[0] = src; 31 o_images[0] = src;
32 32
@@ -35,9 +35,9 @@ static void _setup(void)
35 o = efl_add(EFL_CANVAS_PROXY_CLASS, evas); 35 o = efl_add(EFL_CANVAS_PROXY_CLASS, evas);
36 o_images[i] = o; 36 o_images[i] = o;
37 efl_canvas_proxy_source_set(o, src); 37 efl_canvas_proxy_source_set(o, src);
38 efl_gfx_size_set(o, 120, 160); 38 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
39 efl_gfx_fill_set(o, 0, 0, 120, 160); 39 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
40 efl_gfx_visible_set(o, EINA_TRUE); 40 efl_gfx_entity_visible_set(o, EINA_TRUE);
41 } 41 }
42 done = 0; 42 done = 0;
43} 43}
@@ -62,7 +62,7 @@ static void _loop(double t, int f)
62 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 62 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
63 y = (win_h / 2) - (h / 2); 63 y = (win_h / 2) - (h / 2);
64 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 64 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
65 efl_gfx_position_set(o_images[i], x, y); 65 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
66 } 66 }
67 FPS_STD(NAME); 67 FPS_STD(NAME);
68} 68}
diff --git a/src/bin/proxy_image_offscreen.c b/src/bin/proxy_image_offscreen.c
index b4522e6..0827435 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(EFL_CANVAS_IMAGE_CLASS, evas); 29 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
30 efl_file_set(o, build_path("logo.png"), NULL); 30 efl_file_set(o, build_path("logo.png"), NULL);
31 efl_gfx_fill_set(o, 0, 0, 120, 160); 31 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
32 efl_gfx_size_set(o, 120, 160); 32 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
33 efl_gfx_position_set(o, -400, -300); 33 efl_gfx_entity_position_set(o, EINA_POSITION2D(-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(EFL_CANVAS_PROXY_CLASS, evas); 38 o = eo_add(EFL_CANVAS_PROXY_CLASS, evas);
39 o_images[i] = o; 39 o_images[i] = o;
40 efl_canvas_proxy_source_set(o, src, NULL); 40 efl_canvas_proxy_source_set(o, src, NULL);
41 efl_gfx_size_set(o, 120, 160); 41 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
42 efl_gfx_fill_set(o, 0, 0, 120, 160); 42 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
43 efl_gfx_visible_set(o, EINA_TRUE); 43 efl_gfx_entity_visible_set(o, 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 efl_gfx_position_set(o_images[i], x, y); 68 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(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 66d6fee..4b19988 100644
--- a/src/bin/proxy_text_fixed.c
+++ b/src/bin/proxy_text_fixed.c
@@ -29,7 +29,7 @@ static void _setup(void)
29 { 29 {
30 o = evas_object_text_add(evas); 30 o = evas_object_text_add(evas);
31 o_texts[i] = o; 31 o_texts[i] = o;
32 efl_text_properties_font_set(o, "Vera-Bold", 20); 32 efl_text_font_set(o, "Vera-Bold", 20);
33 efl_text_set(o, "This is a test string"); 33 efl_text_set(o, "This is a test string");
34 evas_object_text_style_set(o, st); 34 evas_object_text_style_set(o, st);
35 efl_gfx_color_set(o, 255, 255, 255, 255); 35 efl_gfx_color_set(o, 255, 255, 255, 255);
@@ -37,7 +37,7 @@ static void _setup(void)
37 evas_object_text_glow_color_set(o, 100, 80, 40, 100); 37 evas_object_text_glow_color_set(o, 100, 80, 40, 100);
38 evas_object_text_glow2_color_set(o, 50, 10, 5, 50); 38 evas_object_text_glow2_color_set(o, 50, 10, 5, 50);
39 evas_object_text_outline_color_set(o, 0, 0, 0, 255); 39 evas_object_text_outline_color_set(o, 0, 0, 0, 255);
40 efl_gfx_visible_set(o, EINA_TRUE); 40 efl_gfx_entity_visible_set(o, EINA_TRUE);
41 st++; 41 st++;
42 } 42 }
43 st = i; 43 st = i;
@@ -49,10 +49,10 @@ static void _setup(void)
49 o_texts[i] = o; 49 o_texts[i] = o;
50 efl_canvas_proxy_source_set(o, s); 50 efl_canvas_proxy_source_set(o, s);
51 /* FIXME s == NULL*/ 51 /* FIXME s == NULL*/
52 efl_gfx_size_get(s, &w, &h); 52 exp_size_get(s, &w, &h);
53 efl_gfx_size_set(o, w, h); 53 efl_gfx_entity_size_set(o, EINA_SIZE2D(w, h));
54 efl_gfx_fill_set(o, 0, 0, w, h); 54 efl_gfx_fill_set(o, EINA_RECT(0, 0, w, h));
55 efl_gfx_visible_set(o, EINA_TRUE); 55 efl_gfx_entity_visible_set(o, EINA_TRUE);
56 } 56 }
57 57
58 done = 0; 58 done = 0;
@@ -72,12 +72,12 @@ static void _loop(double t, int f)
72 Evas_Coord x, y, w, h; 72 Evas_Coord x, y, w, h;
73 for (i = 0; i < OBNUM; i++) 73 for (i = 0; i < OBNUM; i++)
74 { 74 {
75 efl_gfx_size_get(o_texts[i], &w, &h); 75 exp_size_get(o_texts[i], &w, &h);
76 x = (win_w / 2) - (w / 2); 76 x = (win_w / 2) - (w / 2);
77 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 77 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
78 y = (win_h / 2) - (h / 2); 78 y = (win_h / 2) - (h / 2);
79 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2); 79 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
80 efl_gfx_position_set(o_texts[i], x, y); 80 efl_gfx_entity_position_set(o_texts[i], EINA_POSITION2D(x, y));
81 } 81 }
82 FPS_STD(NAME); 82 FPS_STD(NAME);
83} 83}
diff --git a/src/bin/proxy_text_random.c b/src/bin/proxy_text_random.c
index 453b3b8..c052f5b 100644
--- a/src/bin/proxy_text_random.c
+++ b/src/bin/proxy_text_random.c
@@ -38,30 +38,30 @@ static void _setup(void)
38 strs[rnd() % (sizeof(strs) / sizeof(char *))], 38 strs[rnd() % (sizeof(strs) / sizeof(char *))],
39 strs[rnd() % (sizeof(strs) / sizeof(char *))]); 39 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
40 40
41 efl_text_properties_font_set(o, "Vera-Bold", 20); 41 efl_text_font_set(o, "Vera-Bold", 20);
42 efl_text_set(o, buf); 42 efl_text_set(o, buf);
43 efl_gfx_color_set(o, 0, 0, 0, 255); 43 efl_gfx_color_set(o, 0, 0, 0, 255);
44 efl_gfx_size_get(o, &w, &h); 44 exp_size_get(o, &w, &h);
45 x = (win_w / 2) - (w / 2); 45 x = (win_w / 2) - (w / 2);
46 x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2); 46 x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2);
47 y = (win_h / 2) - (h / 2); 47 y = (win_h / 2) - (h / 2);
48 y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2); 48 y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2);
49 efl_gfx_position_set(o, x, y); 49 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
50 efl_gfx_visible_set(o, EINA_TRUE); 50 efl_gfx_entity_visible_set(o, EINA_TRUE);
51 for (i = 1 ; i < OBNUM ; i ++) 51 for (i = 1 ; i < OBNUM ; i ++)
52 { 52 {
53 o = efl_add(EFL_CANVAS_PROXY_CLASS, evas); 53 o = efl_add(EFL_CANVAS_PROXY_CLASS, evas);
54 o_texts[i] = o; 54 o_texts[i] = o;
55 efl_canvas_proxy_source_set(o, o_texts[0]); 55 efl_canvas_proxy_source_set(o, o_texts[0]);
56 efl_gfx_size_get(o_texts[0], &w, &h); 56 exp_size_get(o_texts[0], &w, &h);
57 efl_gfx_size_set(o, w, h); 57 efl_gfx_entity_size_set(o, EINA_SIZE2D(w, h));
58 efl_gfx_fill_set(o, 0, 0, w, h); 58 efl_gfx_fill_set(o, EINA_RECT(0, 0, w, h));
59 x = (win_w / 2) - (w / 2); 59 x = (win_w / 2) - (w / 2);
60 x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2); 60 x += sin((double)((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)((i * 28)) / (43.8 * SLOW)) * (w / 2); 62 y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2);
63 efl_gfx_position_set(o, x, y); 63 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
64 efl_gfx_visible_set(o, EINA_TRUE); 64 efl_gfx_entity_visible_set(o, EINA_TRUE);
65 } 65 }
66 66
67 done = 0; 67 done = 0;
@@ -90,11 +90,11 @@ static void _loop(double t, int f)
90 strs[rnd() % (sizeof(strs) / sizeof(char *))], 90 strs[rnd() % (sizeof(strs) / sizeof(char *))],
91 strs[rnd() % (sizeof(strs) / sizeof(char *))]); 91 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
92 efl_text_set(o_texts[0], buf); 92 efl_text_set(o_texts[0], buf);
93 efl_gfx_size_get(o_texts[0], &w, &h); 93 exp_size_get(o_texts[0], &w, &h);
94 for (i = 1; i < OBNUM; i++) 94 for (i = 1; i < OBNUM; i++)
95 { 95 {
96 efl_gfx_size_set(o_texts[i], w, h); 96 efl_gfx_entity_size_set(o_texts[i], EINA_SIZE2D(w, h));
97 efl_gfx_fill_set(o_texts[i], 0, 0, w, h); 97 efl_gfx_fill_set(o_texts[i], EINA_RECT(0, 0, w, h));
98 } 98 }
99 FPS_STD(NAME); 99 FPS_STD(NAME);
100} 100}
diff --git a/src/bin/rect_blend.c b/src/bin/rect_blend.c
index abaea7f..d108e72 100644
--- a/src/bin/rect_blend.c
+++ b/src/bin/rect_blend.c
@@ -33,7 +33,7 @@ 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 efl_gfx_color_set(o, r, g, b, a); 35 efl_gfx_color_set(o, r, g, b, a);
36 efl_gfx_visible_set(o, EINA_TRUE); 36 efl_gfx_entity_visible_set(o, EINA_TRUE);
37 } 37 }
38 done = 0; 38 done = 0;
39} 39}
@@ -60,8 +60,8 @@ static void _loop(double t, int f)
60 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 60 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 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)) * (h0 / 2); 62 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
63 efl_gfx_position_set(o_images[i], x, y); 63 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
64 efl_gfx_size_set(o_images[i], w, h); 64 efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h));
65 } 65 }
66 FPS_STD(NAME); 66 FPS_STD(NAME);
67} 67}
diff --git a/src/bin/rect_blend_few.c b/src/bin/rect_blend_few.c
index 3277454..84d8b0d 100644
--- a/src/bin/rect_blend_few.c
+++ b/src/bin/rect_blend_few.c
@@ -36,7 +36,7 @@ static void _setup(void)
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 efl_gfx_color_set(o, r, g, b, a); 38 efl_gfx_color_set(o, r, g, b, a);
39 efl_gfx_visible_set(o, EINA_TRUE); 39 efl_gfx_entity_visible_set(o, 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 efl_gfx_position_set(o_images[i], x, y); 66 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
67 efl_gfx_size_set(o_images[i], w, h); 67 efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(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 79b65cd..9aef9f9 100644
--- a/src/bin/rect_blend_pow2.c
+++ b/src/bin/rect_blend_pow2.c
@@ -34,7 +34,7 @@ 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 efl_gfx_color_set(o, r, g, b, a); 36 efl_gfx_color_set(o, r, g, b, a);
37 efl_gfx_visible_set(o, EINA_TRUE); 37 efl_gfx_entity_visible_set(o, EINA_TRUE);
38 } 38 }
39 done = 0; 39 done = 0;
40} 40}
@@ -61,8 +61,8 @@ static void _loop(double t, int f)
61 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 61 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
62 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 efl_gfx_position_set(o_images[i], x, y); 64 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
65 efl_gfx_size_set(o_images[i], w, h); 65 efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h));
66 } 66 }
67 FPS_STD(NAME); 67 FPS_STD(NAME);
68} 68}
diff --git a/src/bin/rect_blend_pow2_few.c b/src/bin/rect_blend_pow2_few.c
index adf9f48..736436e 100644
--- a/src/bin/rect_blend_pow2_few.c
+++ b/src/bin/rect_blend_pow2_few.c
@@ -37,7 +37,7 @@ static void _setup(void)
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 efl_gfx_color_set(o, r, g, b, a); 39 efl_gfx_color_set(o, r, g, b, a);
40 efl_gfx_visible_set(o, EINA_TRUE); 40 efl_gfx_entity_visible_set(o, 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 efl_gfx_position_set(o_images[i], x, y); 67 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
68 efl_gfx_size_set(o_images[i], w, h); 68 efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(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 60b8d8c..2953d81 100644
--- a/src/bin/rect_solid.c
+++ b/src/bin/rect_solid.c
@@ -33,7 +33,7 @@ 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 efl_gfx_color_set(o, r, g, b, a); 35 efl_gfx_color_set(o, r, g, b, a);
36 efl_gfx_visible_set(o, EINA_TRUE); 36 efl_gfx_entity_visible_set(o, EINA_TRUE);
37 } 37 }
38 done = 0; 38 done = 0;
39} 39}
@@ -60,8 +60,8 @@ static void _loop(double t, int f)
60 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 60 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 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)) * (h0 / 2); 62 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
63 efl_gfx_position_set(o_images[i], x, y); 63 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
64 efl_gfx_size_set(o_images[i], w, h); 64 efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h));
65 } 65 }
66 FPS_STD(NAME); 66 FPS_STD(NAME);
67} 67}
diff --git a/src/bin/rect_solid_few.c b/src/bin/rect_solid_few.c
index 6e8e582..f3860b7 100644
--- a/src/bin/rect_solid_few.c
+++ b/src/bin/rect_solid_few.c
@@ -36,7 +36,7 @@ static void _setup(void)
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 efl_gfx_color_set(o, r, g, b, a); 38 efl_gfx_color_set(o, r, g, b, a);
39 efl_gfx_visible_set(o, EINA_TRUE); 39 efl_gfx_entity_visible_set(o, 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 efl_gfx_position_set(o_images[i], x, y); 66 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
67 efl_gfx_size_set(o_images[i], w, h); 67 efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h));
68 } 68 }
69 FPS_STD(NAME); 69 FPS_STD(NAME);
70} 70}
diff --git a/src/bin/snapshot_widgets_file_icons.c b/src/bin/snapshot_widgets_file_icons.c
index ce764c1..288eb2b 100644
--- a/src/bin/snapshot_widgets_file_icons.c
+++ b/src/bin/snapshot_widgets_file_icons.c
@@ -57,22 +57,22 @@ static void _setup(void)
57 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 57 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
58 o_images[i] = o; 58 o_images[i] = o;
59 efl_file_set(o, build_path(icons[i % 13]), NULL); 59 efl_file_set(o, build_path(icons[i % 13]), NULL);
60 efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE); 60 efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE));
61 efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE); 61 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE));
62 efl_gfx_position_set(o, x + 8, y); 62 efl_gfx_entity_position_set(o, EINA_POSITION2D(x + 8, y));
63 efl_gfx_visible_set(o, EINA_TRUE); 63 efl_gfx_entity_visible_set(o, EINA_TRUE);
64 64
65 o = evas_object_text_add(evas); 65 o = evas_object_text_add(evas);
66 o_texts[i] = o; 66 o_texts[i] = o;
67 efl_text_properties_font_set(o, "Vera-Bold", 10); 67 efl_text_font_set(o, "Vera-Bold", 10);
68 efl_text_set(o, icons[i % 13]); 68 efl_text_set(o, icons[i % 13]);
69 evas_object_text_style_set(o, EVAS_TEXT_STYLE_FAR_SOFT_SHADOW); 69 evas_object_text_style_set(o, EVAS_TEXT_STYLE_FAR_SOFT_SHADOW);
70 efl_gfx_color_set(o, 255, 255, 255, 255); 70 efl_gfx_color_set(o, 255, 255, 255, 255);
71 evas_object_text_shadow_color_set(o, 0, 0, 0, 24); 71 evas_object_text_shadow_color_set(o, 0, 0, 0, 24);
72 efl_gfx_visible_set(o, EINA_TRUE); 72 efl_gfx_entity_visible_set(o, EINA_TRUE);
73 efl_gfx_size_get(o, &tw, &th); 73 exp_size_get(o, &tw, &th);
74 cent = ICON_SIZE + 16 - tw / 2; 74 cent = ICON_SIZE + 16 - tw / 2;
75 efl_gfx_position_set(o, x + cent, y + ICON_SIZE + 4); 75 efl_gfx_entity_position_set(o, EINA_POSITION2D(x + cent, y + ICON_SIZE + 4));
76 x += ICON_SIZE + 16; 76 x += ICON_SIZE + 16;
77 if (x > win_w) 77 if (x > win_w)
78 { 78 {
@@ -87,10 +87,10 @@ static void _setup(void)
87 87
88 o = efl_add(EFL_CANVAS_SNAPSHOT_CLASS, evas); 88 o = efl_add(EFL_CANVAS_SNAPSHOT_CLASS, evas);
89 o_snap = o; 89 o_snap = o;
90 efl_gfx_visible_set(o, EINA_TRUE); 90 efl_gfx_entity_visible_set(o, EINA_TRUE);
91 efl_gfx_position_set(o, 50, 50); 91 efl_gfx_entity_position_set(o, EINA_POSITION2D(50, 50));
92 efl_gfx_size_set(o, 200, 200); 92 efl_gfx_entity_size_set(o, EINA_SIZE2D(200, 200));
93 efl_gfx_fill_set(o, 0, 0, 200, 200); 93 efl_gfx_fill_set(o, EINA_RECT(0, 0, 200, 200));
94 efl_gfx_filter_program_set(o, filter, "test"); 94 efl_gfx_filter_program_set(o, filter, "test");
95 95
96 done = 0; 96 done = 0;
@@ -120,10 +120,10 @@ static void _loop(double t, int f)
120 y = 0 - f; 120 y = 0 - f;
121 for (i = 0; i < NUM; i++) 121 for (i = 0; i < NUM; i++)
122 { 122 {
123 efl_gfx_position_set(o_images[i], x + 8, y); 123 efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x + 8, y));
124 efl_gfx_size_get(o_texts[i], &tw, &th); 124 exp_size_get(o_texts[i], &tw, &th);
125 cent = (ICON_SIZE + 16 - tw) / 2; 125 cent = (ICON_SIZE + 16 - tw) / 2;
126 efl_gfx_position_set(o_texts[i], x + cent, y + ICON_SIZE + 4); 126 efl_gfx_entity_position_set(o_texts[i], EINA_POSITION2D(x + cent, y + ICON_SIZE + 4));
127 x += ICON_SIZE + 16; 127 x += ICON_SIZE + 16;
128 if (x > win_w) 128 if (x > win_w)
129 { 129 {
diff --git a/src/bin/text_basic.c b/src/bin/text_basic.c
index b72d2a9..6b0a42b 100644
--- a/src/bin/text_basic.c
+++ b/src/bin/text_basic.c
@@ -27,10 +27,10 @@ static void _setup(void)
27 { 27 {
28 o = evas_object_text_add(evas); 28 o = evas_object_text_add(evas);
29 o_texts[i] = o; 29 o_texts[i] = o;
30 efl_text_properties_font_set(o, "Vera-Bold", 20); 30 efl_text_font_set(o, "Vera-Bold", 20);
31 efl_text_set(o, "This is a test string"); 31 efl_text_set(o, "This is a test string");
32 efl_gfx_color_set(o, 0, 0, 0, 255); 32 efl_gfx_color_set(o, 0, 0, 0, 255);
33 efl_gfx_visible_set(o, EINA_TRUE); 33 efl_gfx_entity_visible_set(o, 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 efl_gfx_size_get(o_texts[i], &w, &h); 52 exp_size_get(o_texts[i], &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 efl_gfx_position_set(o_texts[i], x, y); 57 efl_gfx_entity_position_set(o_texts[i], EINA_POSITION2D(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 0ad1321..e7f8ef0 100644
--- a/src/bin/text_change.c
+++ b/src/bin/text_change.c
@@ -34,7 +34,7 @@ static void _setup(void)
34 { 34 {
35 o = evas_object_text_add(evas); 35 o = evas_object_text_add(evas);
36 o_texts[i] = o; 36 o_texts[i] = o;
37 efl_text_properties_font_set(o, "Vera-Bold", 20); 37 efl_text_font_set(o, "Vera-Bold", 20);
38 snprintf(buf, sizeof(buf), "%s %s %s %s.", 38 snprintf(buf, sizeof(buf), "%s %s %s %s.",
39 strs[rnd() % (sizeof(strs) / sizeof(char *))], 39 strs[rnd() % (sizeof(strs) / sizeof(char *))],
40 strs[rnd() % (sizeof(strs) / sizeof(char *))], 40 strs[rnd() % (sizeof(strs) / sizeof(char *))],
@@ -42,13 +42,13 @@ static void _setup(void)
42 strs[rnd() % (sizeof(strs) / sizeof(char *))]); 42 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
43 efl_text_set(o, buf); 43 efl_text_set(o, buf);
44 efl_gfx_color_set(o, 0, 0, 0, 255); 44 efl_gfx_color_set(o, 0, 0, 0, 255);
45 efl_gfx_size_get(o, &w, &h); 45 exp_size_get(o, &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 efl_gfx_position_set(o, x, y); 50 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
51 efl_gfx_visible_set(o, EINA_TRUE); 51 efl_gfx_entity_visible_set(o, 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 58ce358..a3f4df2 100644
--- a/src/bin/text_styles.c
+++ b/src/bin/text_styles.c
@@ -29,7 +29,7 @@ static void _setup(void)
29 { 29 {
30 o = evas_object_text_add(evas); 30 o = evas_object_text_add(evas);
31 o_texts[i] = o; 31 o_texts[i] = o;
32 efl_text_properties_font_set(o, "Vera-Bold", 20); 32 efl_text_font_set(o, "Vera-Bold", 20);
33 efl_text_set(o, "This is a test string"); 33 efl_text_set(o, "This is a test string");
34 evas_object_text_style_set(o, st); 34 evas_object_text_style_set(o, st);
35 efl_gfx_color_set(o, 255, 255, 255, 255); 35 efl_gfx_color_set(o, 255, 255, 255, 255);
@@ -37,7 +37,7 @@ static void _setup(void)
37 evas_object_text_glow_color_set(o, 100, 80, 40, 100); 37 evas_object_text_glow_color_set(o, 100, 80, 40, 100);
38 evas_object_text_glow2_color_set(o, 50, 10, 5, 50); 38 evas_object_text_glow2_color_set(o, 50, 10, 5, 50);
39 evas_object_text_outline_color_set(o, 0, 0, 0, 255); 39 evas_object_text_outline_color_set(o, 0, 0, 0, 255);
40 efl_gfx_visible_set(o, EINA_TRUE); 40 efl_gfx_entity_visible_set(o, EINA_TRUE);
41 st++; 41 st++;
42 if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW; 42 if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW;
43 } 43 }
@@ -58,12 +58,12 @@ static void _loop(double t, int f)
58 Evas_Coord x, y, w, h; 58 Evas_Coord x, y, w, h;
59 for (i = 0; i < OBNUM; i++) 59 for (i = 0; i < OBNUM; i++)
60 { 60 {
61 efl_gfx_size_get(o_texts[i], &w, &h); 61 exp_size_get(o_texts[i], &w, &h);
62 x = (win_w / 2) - (w / 2); 62 x = (win_w / 2) - (w / 2);
63 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 63 x += sin((double)(f + (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)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2); 65 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
66 efl_gfx_position_set(o_texts[i], x, y); 66 efl_gfx_entity_position_set(o_texts[i], EINA_POSITION2D(x, y));
67 } 67 }
68 FPS_STD(NAME); 68 FPS_STD(NAME);
69} 69}
diff --git a/src/bin/text_styles_different_strings.c b/src/bin/text_styles_different_strings.c
index 8d074ed..807abc1 100644
--- a/src/bin/text_styles_different_strings.c
+++ b/src/bin/text_styles_different_strings.c
@@ -36,7 +36,7 @@ static void _setup(void)
36 { 36 {
37 o = evas_object_text_add(evas); 37 o = evas_object_text_add(evas);
38 o_texts[i] = o; 38 o_texts[i] = o;