From 27e5e02370799b4e9246fe6dde893207d1ac3f3b Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 18 Jun 2018 17:17:48 -0400 Subject: [PATCH] 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 --- INSTALL | 376 +++++++++++++++++- src/bin/about.c | 6 +- src/bin/image_blend_border.c | 10 +- src/bin/image_blend_border_recolor.c | 10 +- src/bin/image_blend_fade_pow2_unscaled.c | 8 +- src/bin/image_blend_fade_unscaled.c | 8 +- src/bin/image_blend_many_smooth_same_scaled.c | 12 +- src/bin/image_blend_nearest_same_scaled.c | 10 +- src/bin/image_blend_nearest_scaled.c | 10 +- .../image_blend_nearest_solid_same_scaled.c | 10 +- src/bin/image_blend_nearest_solid_scaled.c | 10 +- src/bin/image_blend_occlude1.c | 10 +- src/bin/image_blend_occlude1_few.c | 10 +- src/bin/image_blend_occlude1_many.c | 10 +- src/bin/image_blend_occlude1_very_many.c | 10 +- src/bin/image_blend_occlude2.c | 10 +- src/bin/image_blend_occlude2_few.c | 10 +- src/bin/image_blend_occlude2_many.c | 10 +- src/bin/image_blend_occlude2_very_many.c | 10 +- src/bin/image_blend_occlude3.c | 10 +- src/bin/image_blend_occlude3_few.c | 10 +- src/bin/image_blend_occlude3_many.c | 10 +- src/bin/image_blend_occlude3_very_many.c | 10 +- src/bin/image_blend_smooth_same_scaled.c | 10 +- src/bin/image_blend_smooth_scaled.c | 10 +- .../image_blend_smooth_solid_same_scaled.c | 10 +- src/bin/image_blend_smooth_solid_scaled.c | 10 +- src/bin/image_blend_solid_border.c | 10 +- .../image_blend_solid_fade_pow2_unscaled.c | 8 +- src/bin/image_blend_solid_fade_unscaled.c | 8 +- src/bin/image_blend_solid_middle_border.c | 12 +- src/bin/image_blend_solid_middle_unscaled.c | 12 +- src/bin/image_blend_solid_unscaled.c | 8 +- src/bin/image_blend_unscaled.c | 8 +- src/bin/image_crossfade.c | 12 +- src/bin/image_data_argb.c | 26 +- src/bin/image_data_argb_alpha.c | 26 +- src/bin/image_data_ycbcr601pl.c | 20 +- ...data_ycbcr601pl_map_nearest_solid_rotate.c | 12 +- .../image_data_ycbcr601pl_map_solid_rotate.c | 12 +- src/bin/image_data_ycbcr601pl_wide_stride.c | 24 +- src/bin/image_map_3d_1.c | 12 +- src/bin/image_map_3d_2.c | 10 +- src/bin/image_map_3d_3.c | 8 +- src/bin/image_map_3d_4.c | 6 +- src/bin/image_map_3d_5.c | 12 +- src/bin/image_map_3d_6.c | 12 +- src/bin/image_map_3d_flow.c | 16 +- .../image_map_color_alpha_nearest_rotate.c | 8 +- ...age_map_color_alpha_nearest_solid_rotate.c | 8 +- src/bin/image_map_color_alpha_rotate.c | 6 +- src/bin/image_map_color_alpha_solid_rotate.c | 6 +- src/bin/image_map_color_nearest_rotate.c | 8 +- .../image_map_color_nearest_solid_rotate.c | 8 +- src/bin/image_map_color_rotate.c | 6 +- src/bin/image_map_color_solid_rotate.c | 6 +- src/bin/image_map_nearest_rotate.c | 8 +- src/bin/image_map_nearest_solid_rotate.c | 8 +- src/bin/image_map_rotate.c | 6 +- src/bin/image_map_solid_rotate.c | 6 +- src/bin/image_mask.c | 16 +- src/bin/image_mask_10.c | 14 +- src/bin/image_mask_11.c | 16 +- src/bin/image_mask_12.c | 22 +- src/bin/image_mask_13.c | 22 +- src/bin/image_mask_2.c | 16 +- src/bin/image_mask_3.c | 16 +- src/bin/image_mask_4.c | 16 +- src/bin/image_mask_5.c | 16 +- src/bin/image_mask_6.c | 16 +- src/bin/image_mask_7.c | 22 +- src/bin/image_mask_8.c | 16 +- src/bin/image_mask_9.c | 16 +- src/bin/image_quality_scale.c | 12 +- src/bin/line_blend.c | 2 +- src/bin/main.c | 24 ++ src/bin/main.h | 4 + src/bin/poly_blend.c | 52 +-- src/bin/proxy_image.c | 14 +- src/bin/proxy_image_offscreen.c | 14 +- src/bin/proxy_text_fixed.c | 16 +- src/bin/proxy_text_random.c | 24 +- src/bin/rect_blend.c | 6 +- src/bin/rect_blend_few.c | 6 +- src/bin/rect_blend_pow2.c | 6 +- src/bin/rect_blend_pow2_few.c | 6 +- src/bin/rect_solid.c | 6 +- src/bin/rect_solid_few.c | 6 +- src/bin/snapshot_widgets_file_icons.c | 30 +- src/bin/text_basic.c | 8 +- src/bin/text_change.c | 8 +- src/bin/text_styles.c | 8 +- src/bin/text_styles_different_strings.c | 8 +- src/bin/textblock_auto_align.c | 6 +- src/bin/textblock_basic.c | 6 +- src/bin/textblock_intl.c | 6 +- src/bin/textblock_text_append.c | 6 +- src/bin/ui.c | 136 +++---- src/bin/vg_basic_circle.c | 12 +- src/bin/vg_basic_gradient.c | 16 +- src/bin/vg_basic_rect.c | 12 +- src/bin/vg_scaled.c | 22 +- src/bin/widgets_file_icons.c | 16 +- src/bin/widgets_file_icons_2.c | 16 +- src/bin/widgets_file_icons_2_grouped.c | 16 +- src/bin/widgets_file_icons_2_same.c | 16 +- src/bin/widgets_file_icons_2_same_grouped.c | 16 +- src/bin/widgets_file_icons_3.c | 16 +- src/bin/widgets_file_icons_4.c | 16 +- src/bin/widgets_list_1.c | 16 +- src/bin/widgets_list_1_grouped.c | 16 +- src/bin/widgets_list_2.c | 16 +- src/bin/widgets_list_2_grouped.c | 16 +- src/bin/widgets_list_3.c | 24 +- src/bin/widgets_list_3_grouped.c | 24 +- src/bin/widgets_list_4.c | 24 +- src/bin/widgets_list_4_grouped.c | 24 +- 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 @@ -COMPILING and INSTALLING: +Installation Instructions +************************* -If you got a official release tar archive do: - ./configure - -( otherwise if you got this from enlightenment cvs do: ./autogen.sh ) - -Then to compile: - make + Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software +Foundation, Inc. -To install (run this as root, or the user who handles installs): - make install + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. -NOTE: You MUST make install Expedite for it to run properly. +Basic Installation +================== + + Briefly, the shell command './configure && make && make install' +should configure, build, and install this package. The following +more-detailed instructions are generic; see the 'README' file for +instructions specific to this package. Some packages provide this +'INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. + + The 'configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a 'Makefile' in each directory of the package. +It may also create one or more '.h' files containing system-dependent +definitions. Finally, it creates a shell script 'config.status' that +you can run in the future to recreate the current configuration, and a +file 'config.log' containing compiler output (useful mainly for +debugging 'configure'). + + It can also use an optional file (typically called 'config.cache' and +enabled with '--cache-file=config.cache' or simply '-C') that saves the +results of its tests to speed up reconfiguring. Caching is disabled by +default to prevent problems with accidental use of stale cache files. + + If you need to do unusual things to compile the package, please try +to figure out how 'configure' could check whether to do them, and mail +diffs or instructions to the address given in the 'README' so they can +be considered for the next release. If you are using the cache, and at +some point 'config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file 'configure.ac' (or 'configure.in') is used to create +'configure' by a program called 'autoconf'. You need 'configure.ac' if +you want to change it or regenerate 'configure' using a newer version of +'autoconf'. + + The simplest way to compile this package is: + + 1. 'cd' to the directory containing the package's source code and type + './configure' to configure the package for your system. + + Running 'configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type 'make' to compile the package. + + 3. Optionally, type 'make check' to run any self-tests that come with + the package, generally using the just-built uninstalled binaries. + + 4. Type 'make install' to install the programs and any data files and + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the 'make install' phase executed with root + privileges. + + 5. Optionally, type 'make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior 'make install' required + root privileges, verifies that the installation completed + correctly. + + 6. You can remove the program binaries and object files from the + source code directory by typing 'make clean'. To also remove the + files that 'configure' created (so you can compile the package for + a different kind of computer), type 'make distclean'. There is + also a 'make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 7. Often, you can also type 'make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide 'make + distcheck', which can by used by developers to test that all other + targets like 'make install' and 'make uninstall' work correctly. + This target is generally not run by end users. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the 'configure' script does not know about. Run './configure --help' +for details on some of the pertinent environment variables. + + You can give 'configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here is +an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU 'make'. 'cd' to the +directory where you want the object files and executables to go and run +the 'configure' script. 'configure' automatically checks for the source +code in the directory that 'configure' is in and in '..'. This is known +as a "VPATH" build. + + With a non-GNU 'make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use 'make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple '-arch' options to the +compiler but only a single '-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the 'lipo' tool if you have problems. + +Installation Names +================== + + By default, 'make install' installs the package's commands under +'/usr/local/bin', include files under '/usr/local/include', etc. You +can specify an installation prefix other than '/usr/local' by giving +'configure' the option '--prefix=PREFIX', where PREFIX must be an +absolute file name. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option '--exec-prefix=PREFIX' to 'configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like '--bindir=DIR' to specify different values for particular +kinds of files. Run 'configure --help' for a list of the directories +you can set and what kinds of files go in them. In general, the default +for these options is expressed in terms of '${prefix}', so that +specifying just '--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to 'configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +'make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, 'make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +'${prefix}'. Any directories that were specified during 'configure', +but not in terms of '${prefix}', must each be overridden at install time +for the entire installation to be relocated. The approach of makefile +variable overrides for each directory variable is required by the GNU +Coding Standards, and ideally causes no recompilation. However, some +platforms have known limitations with the semantics of shared libraries +that end up requiring recompilation when using this method, particularly +noticeable in packages that use GNU Libtool. + + The second method involves providing the 'DESTDIR' variable. For +example, 'make install DESTDIR=/alternate/directory' will prepend +'/alternate/directory' before all installation names. The approach of +'DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of '${prefix}' +at 'configure' time. + +Optional Features +================= + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving 'configure' the +option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'. + + Some packages pay attention to '--enable-FEATURE' options to +'configure', where FEATURE indicates an optional part of the package. +They may also pay attention to '--with-PACKAGE' options, where PACKAGE +is something like 'gnu-as' or 'x' (for the X Window System). The +'README' should mention any '--enable-' and '--with-' options that the +package recognizes. + + For packages that use the X Window System, 'configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the 'configure' options '--x-includes=DIR' and +'--x-libraries=DIR' to specify their locations. + + Some packages offer the ability to configure how verbose the +execution of 'make' will be. For these packages, running './configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with 'make V=1'; while running './configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with 'make V=0'. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU CC +is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + HP-UX 'make' updates targets which have the same time stamps as their +prerequisites, which makes it generally unusable when shipped generated +files such as 'configure' are involved. Use GNU 'make' instead. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its '' header file. The option '-nodtk' can be used as a +workaround. If GNU CC is not installed, it is therefore recommended to +try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + + On Solaris, don't put '/usr/ucb' early in your 'PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in '/usr/bin'. So, if you need '/usr/ucb' +in your 'PATH', put it _after_ '/usr/bin'. + + On Haiku, software installed for all users goes in '/boot/common', +not '/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + +Specifying the System Type +========================== + + There may be some features 'configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, 'configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +'--build=TYPE' option. TYPE can either be a short name for the system +type, such as 'sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS + KERNEL-OS + + See the file 'config.sub' for the possible values of each field. If +'config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option '--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with '--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for 'configure' scripts to share, +you can create a site shell script called 'config.site' that gives +default values for variables like 'CC', 'cache_file', and 'prefix'. +'configure' looks for 'PREFIX/share/config.site' if it exists, then +'PREFIX/etc/config.site' if it exists. Or, you can set the +'CONFIG_SITE' environment variable to the location of the site script. +A warning: not all 'configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to 'configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the 'configure' command line, using 'VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified 'gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an +Autoconf limitation. Until the limitation is lifted, you can use this +workaround: + + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash + +'configure' Invocation +====================== + + 'configure' recognizes the following options to control how it +operates. + +'--help' +'-h' + Print a summary of all of the options to 'configure', and exit. + +'--help=short' +'--help=recursive' + Print a summary of the options unique to this package's + 'configure', and exit. The 'short' variant lists options used only + in the top level, while the 'recursive' variant lists options also + present in any nested packages. + +'--version' +'-V' + Print the version of Autoconf used to generate the 'configure' + script, and exit. + +'--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally 'config.cache'. FILE defaults to '/dev/null' to + disable caching. + +'--config-cache' +'-C' + Alias for '--cache-file=config.cache'. + +'--quiet' +'--silent' +'-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to '/dev/null' (any error + messages will still be shown). + +'--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + 'configure' can determine that directory automatically. + +'--prefix=DIR' + Use DIR as the installation prefix. *note Installation Names:: for + more details, including other options available for fine-tuning the + installation locations. + +'--no-create' +'-n' + Run the configure checks, but stop before creating any output + files. + +'configure' also accepts some other, not widely useful, options. Run +'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) Evas_Textblock_Style *st; o = evas_object_textblock_add(evas); - efl_gfx_position_set(o, 10, 40); - efl_gfx_size_set(o, win_w - 20, win_h - 50); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_position_set(o, EINA_POSITION2D(10, 40)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w - 20, win_h - 50)); + efl_gfx_entity_visible_set(o, EINA_TRUE); st = evas_textblock_style_new(); evas_textblock_style_set (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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("bar.png"), NULL); - efl_image_border_set(o, 6, 6, 6, 6); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_image_border_set(o, 6, 6, 6, 6); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -54,9 +54,9 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_size_set(o_images[i], w, h); - efl_gfx_fill_set(o_images[i], 0, 0, w, h); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h)); + efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h)); } FPS_STD(NAME); } 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) o_images[i] = o; efl_file_set(o, build_path("pan.png"), NULL); efl_gfx_color_set(o, 64, 64, 64, 255); - efl_image_border_set(o, 3, 3, 3, 3); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_image_border_set(o, 3, 3, 3, 3); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -55,9 +55,9 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_size_set(o_images[i], w, h); - efl_gfx_fill_set(o_images[i], 0, 0, w, h); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h)); + efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h)); } FPS_STD(NAME); } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); a = 256 - (1 << ((rnd() % 8) + 1)); if (a < 128) a = 128; efl_gfx_color_set(o, a, a, a, a); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -58,7 +58,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } FPS_STD(NAME); } 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) o_images[i] = o; a = rnd()&0xff; efl_file_set(o, build_path("logo.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); efl_gfx_color_set(o, a, a, a, a); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -56,7 +56,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } FPS_STD(NAME); } 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) w = 3 + ((n * (60 - 3)) / 100); h = 4 + ((n * (80 - 4)) / 100); efl_file_set(o, build_path("logo.png"), NULL); - efl_image_smooth_scale_set(o, 1); - efl_gfx_size_set(o, w, h); - efl_gfx_fill_set(o, 0, 0, w, h); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_image_smooth_scale_set(o, 1); + efl_gfx_entity_size_set(o, EINA_SIZE2D(w, h)); + efl_gfx_fill_set(o, EINA_RECT(0, 0, w, h)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -53,12 +53,12 @@ static void _loop(double t, int f) Evas_Coord x, y, w, h; for (i = 0; i < MANYNUM; i++) { - efl_gfx_size_get(o_images[i], &w, &h); + exp_size_get(o_images[i], &w, &h); x = (win_w / 2) - (w / 2); x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } FPS_STD(NAME); } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); - efl_image_smooth_scale_set(o, 0); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_image_smooth_scale_set(o, 0); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -54,9 +54,9 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_size_set(o_images[i], w, h); - efl_gfx_fill_set(o_images[i], 0, 0, w, h); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h)); + efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h)); } FPS_STD(NAME); } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); - efl_image_smooth_scale_set(o, 0); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_image_smooth_scale_set(o, 0); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -54,9 +54,9 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_size_set(o_images[i], w, h); - efl_gfx_fill_set(o_images[i], 0, 0, w, h); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h)); + efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h)); } FPS_STD(NAME); } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); - efl_image_smooth_scale_set(o, 0); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_image_smooth_scale_set(o, 0); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -54,9 +54,9 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_size_set(o_images[i], w, h); - efl_gfx_fill_set(o_images[i], 0, 0, w, h); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h)); + efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h)); } FPS_STD(NAME); } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); - efl_image_smooth_scale_set(o, 0); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_image_smooth_scale_set(o, 0); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -54,9 +54,9 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_size_set(o_images[i], w, h); - efl_gfx_fill_set(o_images[i], 0, 0, w, h); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h)); + efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h)); } FPS_STD(NAME); } 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) x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); efl_file_set(o, build_path("image.png"), NULL); - efl_gfx_position_set(o, x, y); + efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); } - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -68,7 +68,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } } 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) x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); efl_file_set(o, PACKAGE_DATA_DIR"/data/image.png", NULL); - efl_gfx_position_set(o, x, y); + efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); } - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -71,7 +71,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } } 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) x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); efl_file_set(o, build_path("image.png"), NULL); - efl_gfx_position_set(o, x, y); + efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); } - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -71,7 +71,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } } 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) x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); efl_file_set(o, build_path("image.png"), NULL); - efl_gfx_position_set(o, x, y); + efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); } - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -71,7 +71,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } } 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) x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); efl_file_set(o, build_path("image.png"), NULL); - efl_gfx_position_set(o, x, y); + efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); } - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -68,7 +68,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } } 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) x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); efl_file_set(o, build_path("image.png"), NULL); - efl_gfx_position_set(o, x, y); + efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); } - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -71,7 +71,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } } 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) x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); efl_file_set(o, build_path("image.png"), NULL); - efl_gfx_position_set(o, x, y); + efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); } - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -71,7 +71,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } } 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) x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); efl_file_set(o, build_path("image.png"), NULL); - efl_gfx_position_set(o, x, y); + efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); } - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -71,7 +71,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } } 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) x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); efl_file_set(o, build_path("image.png"), NULL); - efl_gfx_position_set(o, x, y); + efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); } - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -68,7 +68,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } } 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) x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); efl_file_set(o, build_path("image.png"), NULL); - efl_gfx_position_set(o, x, y); + efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); } - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -71,7 +71,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } } 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) x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); efl_file_set(o, build_path("image.png"), NULL); - efl_gfx_position_set(o, x, y); + efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); } - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -71,7 +71,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } } 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) x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); efl_file_set(o, build_path("image.png"), NULL); - efl_gfx_position_set(o, x, y); + efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); } - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -71,7 +71,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); - efl_image_smooth_scale_set(o, 1); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_image_smooth_scale_set(o, 1); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -54,9 +54,9 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_size_set(o_images[i], w, h); - efl_gfx_fill_set(o_images[i], 0, 0, w, h); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h)); + efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h)); } FPS_STD(NAME); } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); - efl_image_smooth_scale_set(o, 1); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_image_smooth_scale_set(o, 1); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -54,9 +54,9 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_size_set(o_images[i], w, h); - efl_gfx_fill_set(o_images[i], 0, 0, w, h); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h)); + efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h)); } FPS_STD(NAME); } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); - efl_image_smooth_scale_set(o, 1); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_image_smooth_scale_set(o, 1); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -54,9 +54,9 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_size_set(o_images[i], w, h); - efl_gfx_fill_set(o_images[i], 0, 0, w, h); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h)); + efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h)); } FPS_STD(NAME); } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); - efl_image_smooth_scale_set(o, 1); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_image_smooth_scale_set(o, 1); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -54,9 +54,9 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_size_set(o_images[i], w, h); - efl_gfx_fill_set(o_images[i], 0, 0, w, h); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h)); + efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h)); } FPS_STD(NAME); } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("frame.png"), NULL); - efl_image_border_set(o, 8, 8, 8, 8); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_image_border_set(o, 8, 8, 8, 8); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -54,9 +54,9 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_size_set(o_images[i], w, h); - efl_gfx_fill_set(o_images[i], 0, 0, w, h); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h)); + efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h)); } FPS_STD(NAME); } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); a = 256 - (1 << ((rnd() % 8) + 1)); if (a < 128) a = 128; efl_gfx_color_set(o, a, a, a, a); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -58,7 +58,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } FPS_STD(NAME); } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); a = rnd()&0xff; efl_gfx_color_set(o, a, a, a, a); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -57,7 +57,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } FPS_STD(NAME); } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("bar.png"), NULL); - efl_image_border_set(o, 6, 6, 6, 6); - efl_image_border_center_fill_set(o, EFL_GFX_BORDER_FILL_MODE_SOLID); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_image_border_set(o, 6, 6, 6, 6); + efl_gfx_image_border_center_fill_set(o, EFL_GFX_BORDER_FILL_MODE_SOLID); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -55,9 +55,9 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_size_set(o_images[i], w, h); - efl_gfx_fill_set(o_images[i], 0, 0, w, h); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h)); + efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h)); } FPS_STD(NAME); } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_image_border_set(o, 43, 48, 48, 83); - efl_image_border_center_fill_set(o, EFL_GFX_BORDER_FILL_MODE_SOLID); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_image_border_set(o, 43, 48, 48, 83); + efl_gfx_image_border_center_fill_set(o, EFL_GFX_BORDER_FILL_MODE_SOLID); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -55,7 +55,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } FPS_STD(NAME); } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -53,7 +53,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } FPS_STD(NAME); } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -53,7 +53,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } FPS_STD(NAME); } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[0] = o; efl_file_set(o, build_path("im1.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 720, 420); - efl_gfx_size_set(o, 720, 420); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420)); + efl_gfx_entity_visible_set(o, EINA_TRUE); o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[1] = o; efl_file_set(o, build_path("im2.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 720, 420); - efl_gfx_size_set(o, 720, 420); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420)); + efl_gfx_entity_visible_set(o, EINA_TRUE); done = 0; } 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) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; - efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); + efl_gfx_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); efl_gfx_buffer_alpha_set(o, 0); - efl_gfx_fill_set(o, 0, 0, 640, 480); - efl_gfx_size_set(o, 640, 480); - efl_gfx_visible_set(o, EINA_TRUE); - efl_gfx_buffer_managed_set(o, &sl, 640, 480, 0, EFL_GFX_COLORSPACE_ARGB8888, 0); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 640, 480)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(640, 480)); + efl_gfx_entity_visible_set(o, EINA_TRUE); + efl_gfx_buffer_managed_set(o, &sl, EINA_SIZE2D(640, 480), 0, EFL_GFX_COLORSPACE_ARGB8888, 0); } done = 0; } @@ -47,7 +47,7 @@ static void _cleanup(void) Evas_Object *o = o_images[i]; Eina_Slice sl = {}; - efl_gfx_buffer_managed_get(o, &sl, 0); + sl = efl_gfx_buffer_managed_get(o, 0); free((void *) sl.mem); efl_del(o); } @@ -68,11 +68,11 @@ static void _loop(double t, int f) h = 480; x = (win_w / 2) - (w / 2); y = (win_h / 2) - (h / 2); - efl_gfx_position_set(o, x, y); - efl_gfx_size_set(o, w, h); - efl_gfx_fill_set(o, 0, 0, w, h); - efl_gfx_buffer_map(o, &sl, EFL_GFX_BUFFER_ACCESS_MODE_WRITE, - 0, 0, 0, 0, EFL_GFX_COLORSPACE_ARGB8888, 0, &st); + efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(w, h)); + efl_gfx_fill_set(o, EINA_RECT(0, 0, w, h)); + sl = efl_gfx_buffer_map(o, EFL_GFX_BUFFER_ACCESS_MODE_WRITE, + &EINA_RECT(0, 0, 0, 0), EFL_GFX_COLORSPACE_ARGB8888, 0, &st); data = sl.mem; if (!data) { @@ -90,8 +90,8 @@ static void _loop(double t, int f) } p += (st - w); } - efl_gfx_buffer_unmap(o, &sl); - efl_gfx_buffer_update_add(o, 0, 0, w, h); + efl_gfx_buffer_unmap(o, sl); + efl_gfx_buffer_update_add(o, &EINA_RECT(0, 0, w, h)); } FPS_STD(NAME); } 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) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; - efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); + efl_gfx_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); efl_gfx_buffer_alpha_set(o, 1); - efl_gfx_fill_set(o, 0, 0, 640, 480); - efl_gfx_size_set(o, 640, 480); - efl_gfx_visible_set(o, EINA_TRUE); - efl_gfx_buffer_managed_set(o, &sl, 640, 480, 0, EFL_GFX_COLORSPACE_ARGB8888, 0); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 640, 480)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(640, 480)); + efl_gfx_entity_visible_set(o, EINA_TRUE); + efl_gfx_buffer_managed_set(o, &sl, EINA_SIZE2D(640, 480), 0, EFL_GFX_COLORSPACE_ARGB8888, 0); } done = 0; } @@ -47,7 +47,7 @@ static void _cleanup(void) Evas_Object *o = o_images[i]; Eina_Slice sl = {}; - efl_gfx_buffer_managed_get(o, &sl, 0); + sl = efl_gfx_buffer_managed_get(o, 0); free((void *) sl.mem); efl_del(o); } @@ -70,11 +70,11 @@ static void _loop(double t, int f) h = 480; x = (win_w / 2) - (w / 2); y = (win_h / 2) - (h / 2); - efl_gfx_position_set(o, x, y); - efl_gfx_size_set(o, w, h); - efl_gfx_fill_set(o, 0, 0, w, h); - efl_gfx_buffer_map(o, &sl, EFL_GFX_BUFFER_ACCESS_MODE_WRITE, - 0, 0, 0, 0, EFL_GFX_COLORSPACE_ARGB8888, 0, &st); + efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(w, h)); + efl_gfx_fill_set(o, EINA_RECT(0, 0, w, h)); + sl = efl_gfx_buffer_map(o, EFL_GFX_BUFFER_ACCESS_MODE_WRITE, + &EINA_RECT(0, 0, 0, 0), EFL_GFX_COLORSPACE_ARGB8888, 0, &st); if (!sl.mem) { fprintf(stderr, "ERROR: Failed to map image!\n"); @@ -102,8 +102,8 @@ static void _loop(double t, int f) } p += (st - w); } - efl_gfx_buffer_unmap(o, &sl); - efl_gfx_buffer_update_add(o, 0, 0, w, h); + efl_gfx_buffer_unmap(o, sl); + efl_gfx_buffer_update_add(o, &EINA_RECT(0, 0, w, h)); } FPS_STD(NAME); } 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) { Evas_Object *o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; - efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); + efl_gfx_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); efl_gfx_buffer_alpha_set(o, 0); - efl_gfx_fill_set(o, 0, 0, 640, 480); - efl_gfx_size_set(o, 640, 480); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 640, 480)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(640, 480)); + efl_gfx_entity_visible_set(o, EINA_TRUE); slice[0].len = 640 * 480; slice[1].len = 320 * 240; @@ -41,7 +41,7 @@ static void _setup(void) { slice[p].mem = malloc(slice[p].len); fread((void *) slice[p].mem, slice[p].len, 1, f); - efl_gfx_buffer_managed_set(o, &slice[p], 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p); + efl_gfx_buffer_managed_set(o, &slice[p], EINA_SIZE2D(640, 480), 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p); } fclose(f); } @@ -56,7 +56,7 @@ static void _cleanup(void) Evas_Object *o = o_images[i]; for (int p = 0; p < 3; p++) { - efl_gfx_buffer_managed_set(o, NULL, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p); + efl_gfx_buffer_managed_set(o, NULL, EINA_SIZE2D(640, 480), 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p); free((void *) slice[p].mem); } efl_del(o); @@ -74,10 +74,10 @@ static void _loop(double t, int f) h = 480; x = (win_w / 2) - (w / 2); y = (win_h / 2) - (h / 2); - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_size_set(o_images[i], w, h); - efl_gfx_fill_set(o_images[i], 0, 0, w, h); - efl_gfx_buffer_update_add(o_images[i], 0, 0, 640, 480); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h)); + efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h)); + efl_gfx_buffer_update_add(o_images[i], &EINA_RECT(0, 0, 640, 480)); } FPS_STD(NAME); } diff --git a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c index 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) { Evas_Object *o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; - efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); + efl_gfx_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); efl_gfx_buffer_alpha_set(o, 0); - efl_gfx_fill_set(o, 0, 0, 640, 480); - efl_gfx_size_set(o, 640, 480); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 640, 480)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(640, 480)); + efl_gfx_entity_visible_set(o, EINA_TRUE); slice[0].len = 640 * 480; slice[1].len = 320 * 240; @@ -41,7 +41,7 @@ static void _setup(void) { slice[p].mem = malloc(slice[p].len); fread((void *) slice[p].mem, slice[p].len, 1, f); - efl_gfx_buffer_managed_set(o, &slice[p], 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p); + efl_gfx_buffer_managed_set(o, &slice[p], EINA_SIZE2D(640, 480), 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p); } fclose(f); } @@ -56,7 +56,7 @@ static void _cleanup(void) Evas_Object *o = o_images[i]; for (int p = 0; p < 3; p++) { - efl_gfx_buffer_managed_set(o, NULL, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p); + efl_gfx_buffer_managed_set(o, NULL, EINA_SIZE2D(640, 480), 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p); free((void *) slice[p].mem); } 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) { Evas_Object *o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; - efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); + efl_gfx_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); efl_gfx_buffer_alpha_set(o, 0); - efl_gfx_fill_set(o, 0, 0, 640, 480); - efl_gfx_size_set(o, 640, 480); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 640, 480)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(640, 480)); + efl_gfx_entity_visible_set(o, EINA_TRUE); slice[0].len = 640 * 480; slice[1].len = 320 * 240; @@ -41,7 +41,7 @@ static void _setup(void) { slice[p].mem = malloc(slice[p].len); fread((void *) slice[p].mem, slice[p].len, 1, f); - efl_gfx_buffer_managed_set(o, &slice[p], 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p); + efl_gfx_buffer_managed_set(o, &slice[p], EINA_SIZE2D(640, 480), 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p); } fclose(f); } @@ -56,7 +56,7 @@ static void _cleanup(void) Evas_Object *o = o_images[i]; for (int p = 0; p < 3; p++) { - efl_gfx_buffer_managed_set(o, NULL, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p); + efl_gfx_buffer_managed_set(o, NULL, EINA_SIZE2D(640, 480), 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p); free((void *) slice[p].mem); } 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) { Evas_Object *o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; - efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); + efl_gfx_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); efl_gfx_buffer_alpha_set(o, 0); - efl_gfx_fill_set(o, 0, 0, 640, 480); - efl_gfx_size_set(o, 640, 480); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 640, 480)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(640, 480)); + efl_gfx_entity_visible_set(o, EINA_TRUE); // in this test, the stride is 640 but the width changes slice[0].len = 640 * 480; @@ -45,7 +45,7 @@ static void _setup(void) { slice[p].mem = malloc(slice[p].len); fread((void *) slice[p].mem, slice[p].len, 1, f); - efl_gfx_buffer_managed_set(o, &slice[p], w, 480, stride, + efl_gfx_buffer_managed_set(o, &slice[p], EINA_SIZE2D(w, 480), stride, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p); stride = 320; } @@ -62,7 +62,7 @@ static void _cleanup(void) Evas_Object *o = o_images[i]; for (int p = 0; p < 3; p++) { - efl_gfx_buffer_managed_set(o, NULL, 640, 480, 0, + efl_gfx_buffer_managed_set(o, NULL, EINA_SIZE2D(640, 480), 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p); free((void *) slice[p].mem); } @@ -82,15 +82,15 @@ static void _loop(double t, int f) int stride; for (int p = 0; p < 3; p++) - efl_gfx_buffer_managed_get(o, &sl[p], p); + sl[p] = efl_gfx_buffer_managed_get(o, p); w = 640; h = 480; x = (win_w / 2) - (w / 2); y = (win_h / 2) - (h / 2); - efl_gfx_position_set(o, x, y); - efl_gfx_size_set(o, w, h); - efl_gfx_fill_set(o, 0, 0, w, h); + efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(w, h)); + efl_gfx_fill_set(o, EINA_RECT(0, 0, w, h)); // logic here differs a bit from old expedite w = 320 - 16 + (f * 2) % 336; @@ -99,11 +99,11 @@ static void _loop(double t, int f) stride = 640; for (int p = 0; p < 3; p++) { - efl_gfx_buffer_managed_set(o, &sl[p], w, 480, stride, + efl_gfx_buffer_managed_set(o, &sl[p], EINA_SIZE2D(w, 480), stride, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p); stride = 320; } - efl_gfx_buffer_update_add(o, 0, 0, w, 480); + efl_gfx_buffer_update_add(o, &EINA_RECT(0, 0, w, 480)); } FPS_STD(NAME); } 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) c->side[i].o = o; snprintf(buf, sizeof(buf), "cube%i.png", i + 1); efl_file_set(o, build_path(buf), NULL); - efl_gfx_fill_set(o, 0, 0, 256, 256); - efl_gfx_size_set(o, 256, 256); - efl_image_smooth_scale_set(o, 0); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256)); + efl_gfx_image_smooth_scale_set(o, 0); + efl_gfx_entity_visible_set(o, EINA_TRUE); } POINT(0, 0, -w, -h, -d, 0, 0); POINT(0, 1, w, -h, -d, 256, 0); @@ -132,11 +132,11 @@ _cube_pos(Cube *c, { evas_object_map_enable_set(c->side[i].o, 1); evas_object_map_set(c->side[i].o, m); - efl_gfx_visible_set(c->side[i].o, EINA_TRUE); + efl_gfx_entity_visible_set(c->side[i].o, EINA_TRUE); } else { - efl_gfx_visible_set(c->side[i].o, EINA_FALSE); + efl_gfx_entity_visible_set(c->side[i].o, EINA_FALSE); } 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) c->side[i].o = o; snprintf(buf, sizeof(buf), "cube%i.png", i + 1); efl_file_set(o, build_path(buf), NULL); - efl_gfx_fill_set(o, 0, 0, 256, 256); - efl_gfx_size_set(o, 256, 256); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } POINT(0, 0, -w, -h, -d, 0, 0); POINT(0, 1, w, -h, -d, 256, 0); @@ -130,11 +130,11 @@ _cube_pos(Cube *c, { evas_object_map_enable_set(c->side[i].o, 1); evas_object_map_set(c->side[i].o, m); - efl_gfx_visible_set(c->side[i].o, EINA_TRUE); + efl_gfx_entity_visible_set(c->side[i].o, EINA_TRUE); } else { - efl_gfx_visible_set(c->side[i].o, EINA_FALSE); + efl_gfx_entity_visible_set(c->side[i].o, EINA_FALSE); } 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) c->side[i].o = o; snprintf(buf, sizeof(buf), "cube%i.png", i + 1); efl_file_set(o, build_path(buf), NULL); - efl_gfx_fill_set(o, 0, 0, 256, 256); - efl_gfx_size_set(o, 256, 256); - efl_image_smooth_scale_set(o, 0); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256)); + efl_gfx_image_smooth_scale_set(o, 0); + efl_gfx_entity_visible_set(o, EINA_TRUE); } POINT(0, 0, -w, -h, -d, 0, 0); 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) c->side[i].o = o; snprintf(buf, sizeof(buf), "cube%i.png", i + 1); efl_file_set(o, build_path(buf), NULL); - efl_gfx_fill_set(o, 0, 0, 256, 256); - efl_gfx_size_set(o, 256, 256); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } POINT(0, 0, -w, -h, -d, 0, 0); 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) c->side[i].o = o; snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1); efl_file_set(o, build_path(buf), NULL); - efl_gfx_fill_set(o, 0, 0, 720, 420); - efl_gfx_size_set(o, 720, 420); - efl_image_smooth_scale_set(o, 0); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420)); + efl_gfx_image_smooth_scale_set(o, 0); + efl_gfx_entity_visible_set(o, EINA_TRUE); } POINT(0, 0, -w, -h, -d, 0, 0); POINT(0, 1, w, -h, -d, 720, 0); @@ -132,11 +132,11 @@ _cube_pos(Cube *c, { evas_object_map_enable_set(c->side[i].o, 1); evas_object_map_set(c->side[i].o, m); - efl_gfx_visible_set(c->side[i].o, EINA_TRUE); + efl_gfx_entity_visible_set(c->side[i].o, EINA_TRUE); } else { - efl_gfx_visible_set(c->side[i].o, EINA_FALSE); + efl_gfx_entity_visible_set(c->side[i].o, EINA_FALSE); } 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) c->side[i].o = o; snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1); efl_file_set(o, build_path(buf), NULL); - efl_gfx_fill_set(o, 0, 0, 720, 420); - efl_gfx_size_set(o, 720, 420); - efl_image_smooth_scale_set(o, 0); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420)); + efl_gfx_image_smooth_scale_set(o, 0); + efl_gfx_entity_visible_set(o, EINA_TRUE); } POINT(0, 0, -w, -h, -d, 0, 0); POINT(0, 1, w, -h, -d, 720, 0); @@ -129,11 +129,11 @@ _cube_pos(Cube *c, { evas_object_map_enable_set(c->side[i].o, 1); evas_object_map_set(c->side[i].o, m); - efl_gfx_visible_set(c->side[i].o, EINA_TRUE); + efl_gfx_entity_visible_set(c->side[i].o, EINA_TRUE); } else { - efl_gfx_visible_set(c->side[i].o, EINA_FALSE); + efl_gfx_entity_visible_set(c->side[i].o, EINA_FALSE); } 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) o_images[i] = o; snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); efl_file_set(o, build_path(buf), NULL); - efl_gfx_fill_set(o, 0, 0, 256, 256); - efl_gfx_size_set(o, 256, 256); - efl_image_smooth_scale_set(o, 0); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256)); + efl_gfx_image_smooth_scale_set(o, 0); + efl_gfx_entity_visible_set(o, EINA_TRUE); o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_reflec[i] = o; snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); efl_file_set(o, build_path(buf), NULL); - efl_gfx_fill_set(o, 0, 0, 256, 256); - efl_gfx_size_set(o, 256, 256); - efl_image_smooth_scale_set(o, 0); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256)); + efl_gfx_image_smooth_scale_set(o, 0); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_image_smooth_scale_set(o, 0); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_image_smooth_scale_set(o, 0); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_image_smooth_scale_set(o, 0); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_image_smooth_scale_set(o, 0); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_image_smooth_scale_set(o, 0); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_image_smooth_scale_set(o, 0); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_image_smooth_scale_set(o, 0); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_image_smooth_scale_set(o, 0); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_image_smooth_scale_set(o, 0); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_image_smooth_scale_set(o, 0); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_image_smooth_scale_set(o, 0); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_image_smooth_scale_set(o, 0); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i + 1] = o; efl_file_set(o, build_path("e-logo.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); evas_object_clip_set(o_images[i], o); } @@ -62,8 +62,8 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_position_set(o_images[i + 1], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_position_set(o_images[i + 1], EINA_POSITION2D(x, y)); } FPS_STD(NAME); } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_mask = o; efl_file_set(o, build_path("e-logo-mask.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 720, 420); - efl_gfx_size_set(o, 720, 420); - efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420)); + efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2)); + efl_gfx_entity_visible_set(o, EINA_TRUE); for (i = 0; i < 1; i++) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("texture.png"), NULL); - efl_gfx_fill_set(o, 0, 0, win_w * 4, win_h * 4); - efl_gfx_size_set(o, win_w * 4, win_h * 4); + efl_gfx_fill_set(o, EINA_RECT(0, 0, win_w * 4, win_h * 4)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w * 4, win_h * 4)); evas_object_clip_set(o, o_mask); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_mask = o; efl_file_set(o, build_path("e-logo-mask.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 720, 420); - efl_gfx_size_set(o, 720, 420); - efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420)); + efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2)); + efl_gfx_entity_visible_set(o, EINA_TRUE); for (i = 0; i < OBNUM; i++) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); evas_object_clip_set(o, o_mask); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -66,7 +66,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } if (!m) m = evas_map_new(4); 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_mask = o; efl_file_set(o, build_path("e-logo-mask.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 720, 420); - efl_gfx_size_set(o, 720, 420); - efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420)); + efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2)); + efl_gfx_entity_visible_set(o, EINA_TRUE); for (i = 0; i < OBNUM; i++) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_image_smooth_scale_set(o, 1); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_image_smooth_scale_set(o, 1); evas_object_clip_set(o, o_mask); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -69,9 +69,9 @@ static void _loop(double t, int f) y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_size_set(o_images[i], w, h); - efl_gfx_fill_set(o_images[i], 0, 0, w, h); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h)); + efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h)); } FPS_STD(NAME); } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_mask = o; efl_file_set(o, build_path("e-logo-mask.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 720, 420); - efl_gfx_size_set(o, 720, 420); - efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420)); + efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2)); + efl_gfx_entity_visible_set(o, EINA_TRUE); for (i = 0; i < OBNUM; i++) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_image_smooth_scale_set(o, 0); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_image_smooth_scale_set(o, 0); evas_object_clip_set(o, o_mask); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -69,9 +69,9 @@ static void _loop(double t, int f) y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_size_set(o_images[i], w, h); - efl_gfx_fill_set(o_images[i], 0, 0, w, h); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h)); + efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h)); } FPS_STD(NAME); } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i + 1] = o; efl_file_set(o, build_path("e-logo-2.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); evas_object_clip_set(o_images[i], o); } @@ -62,8 +62,8 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_position_set(o_images[i + 1], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_position_set(o_images[i + 1], EINA_POSITION2D(x, y)); } FPS_STD(NAME); } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("e-logo-2.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i + 1] = o; efl_file_set(o, build_path("logo.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); evas_object_clip_set(o_images[i], o); } @@ -62,8 +62,8 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_position_set(o_images[i + 1], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_position_set(o_images[i + 1], EINA_POSITION2D(x, y)); } FPS_STD(NAME); } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_mask = o; efl_file_set(o, build_path("e-logo-mask.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 720, 420); - efl_gfx_size_set(o, 720, 420); - efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420)); + efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2)); + efl_gfx_entity_visible_set(o, EINA_TRUE); for (i = 0; i < OBNUM; i++) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); evas_object_clip_set(o, o_mask); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -65,7 +65,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } FPS_STD(NAME); } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_mask = o; efl_file_set(o, build_path("e-logo-2.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_position_set(o, (win_w - 120) / 2, (win_h - 160) / 2); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 120) / 2, (win_h - 160) / 2)); + efl_gfx_entity_visible_set(o, EINA_TRUE); for (i = 0; i < OBNUM; i++) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); evas_object_clip_set(o, o_mask); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -65,7 +65,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } FPS_STD(NAME); } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_mask = o; efl_file_set(o, build_path("e-logo-mask.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 720, 420); - efl_gfx_size_set(o, 720, 420); - efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420)); + efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2)); + efl_gfx_entity_visible_set(o, EINA_TRUE); for (i = 0; i < OBNUM; i++) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120 / 2, 160 / 2); - efl_gfx_size_set(o, 120 / 2, 160 / 2); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120 / 2, 160 / 2)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120 / 2, 160 / 2)); evas_object_clip_set(o, o_mask); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -65,7 +65,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } FPS_STD(NAME); } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_mask = o; efl_file_set(o, build_path("e-logo-2.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_position_set(o, (win_w - 120) / 2, (win_h - 160) / 2); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 120) / 2, (win_h - 160) / 2)); + efl_gfx_entity_visible_set(o, EINA_TRUE); for (i = 0; i < OBNUM; i++) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); evas_object_clip_set(o, o_mask); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -65,13 +65,13 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } w = 10 + (110 + (110 * sin((double)(f) / (14.3 * SLOW)))); h = 10 + (150 + (150 * sin((double)(f) / (21.7 * SLOW)))); - efl_gfx_fill_set(o_mask, 0, 0, w, h); - efl_gfx_size_set(o_mask, w, h); - efl_gfx_position_set(o_mask, (win_w - w) / 2, (win_h - h) / 2); + efl_gfx_fill_set(o_mask, EINA_RECT(0, 0, w, h)); + efl_gfx_entity_size_set(o_mask, EINA_SIZE2D(w, h)); + efl_gfx_entity_position_set(o_mask, EINA_POSITION2D((win_w - w) / 2, (win_h - h) / 2)); FPS_STD(NAME); } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_mask = o; efl_file_set(o, build_path("e-logo-mask.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 720, 420); - efl_gfx_size_set(o, 720, 420); - efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420)); + efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2)); + efl_gfx_entity_visible_set(o, EINA_TRUE); for (i = 0; i < 1; i++) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("texture.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 500, 444); - efl_gfx_size_set(o, win_w * 4, win_h * 4); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 500, 444)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w * 4, win_h * 4)); evas_object_clip_set(o, o_mask); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -65,7 +65,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (500 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (444 / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } FPS_STD(NAME); } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_mask = o; efl_file_set(o, build_path("e-logo-mask.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 720, 420); - efl_gfx_size_set(o, 720, 420); - efl_gfx_position_set(o, (win_w - 720) / 2, (win_h - 420) / 2); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420)); + efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2)); + efl_gfx_entity_visible_set(o, EINA_TRUE); for (i = 0; i < 1; i++) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("texture.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 500, 444); - efl_gfx_size_set(o, win_w * 4, win_h * 4); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 500, 444)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w * 4, win_h * 4)); evas_object_clip_set(o, o_mask); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -66,7 +66,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (500 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (444 / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } if (!m) m = evas_map_new(4); 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("tp.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 640, 480); - efl_gfx_size_set(o, 640, 480); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 640, 480)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(640, 480)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -54,9 +54,9 @@ static void _loop(double t, int f) h *= (f / 100.0) * 4.0; x = (win_w / 2) - (w / 2); y = (win_h / 2) - (h / 2); - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_size_set(o_images[i], w, h); - efl_gfx_fill_set(o_images[i], 0, 0, w, h); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h)); + efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h)); } FPS_STD(NAME); } 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) b = ((rnd()&0xff) * a) / 255; efl_gfx_color_set(o, r, g, b, a); 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)); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } 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) return EINA_TRUE; } +void +exp_size_get(Eo *obj, int *w, int *h) +{ + Eina_Size2D size = efl_gfx_entity_size_get(obj); + if (w) *w = size.w; + if (h) *h = size.h; +} + +void +exp_pos_get(Eo *obj, int *x, int *y) +{ + Eina_Position2D position = efl_gfx_entity_position_get(obj); + if (x) *x = position.x; + if (y) *y = position.y; +} + +void +exp_input_pointer_pos_get(Eo *obj, int *x, int *y) +{ + Eina_Position2D position = efl_input_pointer_position_get(obj); + if (x) *x = position.x; + if (y) *y = position.y; +} + static Ecore_Job *_job = NULL; static 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); void engine_loop(void); int engine_abort(void); +void exp_size_get(Eo *obj, int *w, int *h); +void exp_pos_get(Eo *obj, int *x, int *y); +void exp_input_pointer_pos_get(Eo *obj, int *x, int *y); + #ifdef __cplusplus } #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) switch (type % 4) { case 0: /* triangle */ - efl_canvas_polygon_point_add(o, x + 50, y + 0); - efl_canvas_polygon_point_add(o, x + 100, y + 100); - efl_canvas_polygon_point_add(o, x + 0, y + 100); + efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 50, y + 0)); + efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 100, y + 100)); + efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 0, y + 100)); break; case 1: /* square */ - efl_canvas_polygon_point_add(o, x + 0, y + 0); - efl_canvas_polygon_point_add(o, x + 100, y + 0); - efl_canvas_polygon_point_add(o, x + 100, y + 100); - efl_canvas_polygon_point_add(o, x + 0, y + 100); + efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 0, y + 0)); + efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 100, y + 0)); + efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 100, y + 100)); + efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 0, y + 100)); break; case 2: /* hex */ - efl_canvas_polygon_point_add(o, x + 50, y + 0); - efl_canvas_polygon_point_add(o, x + 100, y + 30); - efl_canvas_polygon_point_add(o, x + 100, y + 70); - efl_canvas_polygon_point_add(o, x + 50, y + 100); - efl_canvas_polygon_point_add(o, x + 0, y + 70); - efl_canvas_polygon_point_add(o, x + 0, y + 30); + efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 50, y + 0)); + efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 100, y + 30)); + efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 100, y + 70)); + efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 50, y + 100)); + efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 0, y + 70)); + efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 0, y + 30)); break; case 3: /* star */ - efl_canvas_polygon_point_add(o, x + 50, y + 0); - efl_canvas_polygon_point_add(o, x + 60, y + 40); - efl_canvas_polygon_point_add(o, x + 90, y + 30); - efl_canvas_polygon_point_add(o, x + 70, y + 60); - efl_canvas_polygon_point_add(o, x + 90, y + 100); - efl_canvas_polygon_point_add(o, x + 50, y + 70); - efl_canvas_polygon_point_add(o, x + 10, y + 100); - efl_canvas_polygon_point_add(o, x + 30, y + 60); - efl_canvas_polygon_point_add(o, x + 10, y + 30); - efl_canvas_polygon_point_add(o, x + 40, y + 40); + efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 50, y + 0)); + efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 60, y + 40)); + efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 90, y + 30)); + efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 70, y + 60)); + efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 90, y + 100)); + efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 50, y + 70)); + efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 10, y + 100)); + efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 30, y + 60)); + efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 10, y + 30)); + efl_canvas_polygon_point_add(o, EINA_POSITION2D(x + 40, y + 40)); break; default: break; @@ -75,7 +75,7 @@ static void _setup(void) g = ((rnd()&0xff) * a) / 255; b = ((rnd()&0xff) * a) / 255; efl_gfx_color_set(o, r, g, b, a); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); poly(o, i, 0, 0); } done = 0; @@ -99,13 +99,13 @@ static void _loop(double t, int f) { o = o_images[i]; if (o) - efl_gfx_size_get(o, &w, &h); + exp_size_get(o, &w, &h); x = (win_w / 2) - (w / 2); x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 4); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 4); if (o) - efl_gfx_position_set(o, x, y); + efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); } FPS_STD(NAME); } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); efl_file_set(o, build_path("logo.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); src = o; o_images[0] = src; @@ -35,9 +35,9 @@ static void _setup(void) o = efl_add(EFL_CANVAS_PROXY_CLASS, evas); o_images[i] = o; efl_canvas_proxy_source_set(o, src); - efl_gfx_size_set(o, 120, 160); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -62,7 +62,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } FPS_STD(NAME); } 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) o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); efl_file_set(o, build_path("logo.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); - efl_gfx_position_set(o, -400, -300); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_entity_position_set(o, EINA_POSITION2D(-400, -300)); src = o; for (i = 0; i < OBNUM / 2; i++) @@ -38,9 +38,9 @@ static void _setup(void) o = eo_add(EFL_CANVAS_PROXY_CLASS, evas); o_images[i] = o; efl_canvas_proxy_source_set(o, src, NULL); - efl_gfx_size_set(o, 120, 160); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -65,7 +65,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); - efl_gfx_position_set(o_images[i], x, y); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); } FPS_STD(NAME); } 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) { o = evas_object_text_add(evas); o_texts[i] = o; - efl_text_properties_font_set(o, "Vera-Bold", 20); + efl_text_font_set(o, "Vera-Bold", 20); efl_text_set(o, "This is a test string"); evas_object_text_style_set(o, st); efl_gfx_color_set(o, 255, 255, 255, 255); @@ -37,7 +37,7 @@ static void _setup(void) evas_object_text_glow_color_set(o, 100, 80, 40, 100); evas_object_text_glow2_color_set(o, 50, 10, 5, 50); evas_object_text_outline_color_set(o, 0, 0, 0, 255); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); st++; } st = i; @@ -49,10 +49,10 @@ static void _setup(void) o_texts[i] = o; efl_canvas_proxy_source_set(o, s); /* FIXME s == NULL*/ - efl_gfx_size_get(s, &w, &h); - efl_gfx_size_set(o, w, h); - efl_gfx_fill_set(o, 0, 0, w, h); - efl_gfx_visible_set(o, EINA_TRUE); + exp_size_get(s, &w, &h); + efl_gfx_entity_size_set(o, EINA_SIZE2D(w, h)); + efl_gfx_fill_set(o, EINA_RECT(0, 0, w, h)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; @@ -72,12 +72,12 @@ static void _loop(double t, int f) Evas_Coord x, y, w, h; for (i = 0; i < OBNUM; i++) { - efl_gfx_size_get(o_texts[i], &w, &h); + exp_size_get(o_texts[i], &w, &h); x = (win_w / 2) - (w / 2); x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2); - efl_gfx_position_set(o_texts[i], x, y); + efl_gfx_entity_position_set(o_texts[i], EINA_POSITION2D(x, y)); } FPS_STD(NAME); } 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) strs[rnd() % (sizeof(strs) / sizeof(char *))], strs[rnd() % (sizeof(strs) / sizeof(char *))]); - efl_text_properties_font_set(o, "Vera-Bold", 20); + efl_text_font_set(o, "Vera-Bold", 20); efl_text_set(o, buf); efl_gfx_color_set(o, 0, 0, 0, 255); - efl_gfx_size_get(o, &w, &h); + exp_size_get(o, &w, &h); x = (win_w / 2) - (w / 2); x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2); - efl_gfx_position_set(o, x, y); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); + efl_gfx_entity_visible_set(o, EINA_TRUE); for (i = 1 ; i < OBNUM ; i ++) { o = efl_add(EFL_CANVAS_PROXY_CLASS, evas); o_texts[i] = o; efl_canvas_proxy_source_set(o, o_texts[0]); - efl_gfx_size_get(o_texts[0], &w, &h); - efl_gfx_size_set(o, w, h); - efl_gfx_fill_set(o, 0, 0, w, h); + exp_size_get(o_texts[0], &w, &h); + efl_gfx_entity_size_set(o, EINA_SIZE2D(w, h)); + efl_gfx_fill_set(o, EINA_RECT(0, 0, w, h)); x = (win_w / 2) - (w / 2); x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2); - efl_gfx_position_set(o, x, y); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; @@ -90,11 +90,11 @@ static void _loop(double t, int f) strs[rnd() % (sizeof(strs) / sizeof(char *))], strs[rnd() % (sizeof(strs) / sizeof(char *))]); efl_text_set(o_texts[0], buf); - efl_gfx_size_get(o_texts[0], &w, &h); + exp_size_get(o_texts[0], &w, &h); for (i = 1; i < OBNUM; i++) { - efl_gfx_size_set(o_texts[i], w, h); - efl_gfx_fill_set(o_texts[i], 0, 0, w, h); + efl_gfx_entity_size_set(o_texts[i], EINA_SIZE2D(w, h)); + efl_gfx_fill_set(o_texts[i], EINA_RECT(0, 0, w, h)); } FPS_STD(NAME); } 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) g = ((rnd()&0xff) * a) / 255; b = ((rnd()&0xff) * a) / 255; efl_gfx_color_set(o, r, g, b, a); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -60,8 +60,8 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_size_set(o_images[i], w, h); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h)); } FPS_STD(NAME); } 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) g = ((rnd()&0xff) * a) / 255; b = ((rnd()&0xff) * a) / 255; efl_gfx_color_set(o, r, g, b, a); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -63,8 +63,8 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2); - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_size_set(o_images[i], w, h); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h)); } FPS_STD(NAME); } 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) g = ((rnd()&0xff) * a) / 255; b = ((rnd()&0xff) * a) / 255; efl_gfx_color_set(o, r, g, b, a); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -61,8 +61,8 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_size_set(o_images[i], w, h); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h)); } FPS_STD(NAME); } 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) g = ((rnd()&0xff) * a) / 255; b = ((rnd()&0xff) * a) / 255; efl_gfx_color_set(o, r, g, b, a); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -64,8 +64,8 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2); - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_size_set(o_images[i], w, h); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h)); } FPS_STD(NAME); } 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) g = ((rnd()&0xff) * a) / 255; b = ((rnd()&0xff) * a) / 255; efl_gfx_color_set(o, r, g, b, a); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -60,8 +60,8 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_size_set(o_images[i], w, h); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h)); } FPS_STD(NAME); } 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) g = ((rnd()&0xff) * a) / 255; b = ((rnd()&0xff) * a) / 255; efl_gfx_color_set(o, r, g, b, a); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -63,8 +63,8 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2); - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_size_set(o_images[i], w, h); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h)); } FPS_STD(NAME); } 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) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path(icons[i % 13]), NULL); - efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE); - efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE); - efl_gfx_position_set(o, x + 8, y); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE)); + efl_gfx_entity_position_set(o, EINA_POSITION2D(x + 8, y)); + efl_gfx_entity_visible_set(o, EINA_TRUE); o = evas_object_text_add(evas); o_texts[i] = o; - efl_text_properties_font_set(o, "Vera-Bold", 10); + efl_text_font_set(o, "Vera-Bold", 10); efl_text_set(o, icons[i % 13]); evas_object_text_style_set(o, EVAS_TEXT_STYLE_FAR_SOFT_SHADOW); efl_gfx_color_set(o, 255, 255, 255, 255); evas_object_text_shadow_color_set(o, 0, 0, 0, 24); - efl_gfx_visible_set(o, EINA_TRUE); - efl_gfx_size_get(o, &tw, &th); + efl_gfx_entity_visible_set(o, EINA_TRUE); + exp_size_get(o, &tw, &th); cent = ICON_SIZE + 16 - tw / 2; - efl_gfx_position_set(o, x + cent, y + ICON_SIZE + 4); + efl_gfx_entity_position_set(o, EINA_POSITION2D(x + cent, y + ICON_SIZE + 4)); x += ICON_SIZE + 16; if (x > win_w) { @@ -87,10 +87,10 @@ static void _setup(void) o = efl_add(EFL_CANVAS_SNAPSHOT_CLASS, evas); o_snap = o; - efl_gfx_visible_set(o, EINA_TRUE); - efl_gfx_position_set(o, 50, 50); - efl_gfx_size_set(o, 200, 200); - efl_gfx_fill_set(o, 0, 0, 200, 200); + efl_gfx_entity_visible_set(o, EINA_TRUE); + efl_gfx_entity_position_set(o, EINA_POSITION2D(50, 50)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(200, 200)); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 200, 200)); efl_gfx_filter_program_set(o, filter, "test"); done = 0; @@ -120,10 +120,10 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - efl_gfx_position_set(o_images[i], x + 8, y); - efl_gfx_size_get(o_texts[i], &tw, &th); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x + 8, y)); + exp_size_get(o_texts[i], &tw, &th); cent = (ICON_SIZE + 16 - tw) / 2; - efl_gfx_position_set(o_texts[i], x + cent, y + ICON_SIZE + 4); + efl_gfx_entity_position_set(o_texts[i], EINA_POSITION2D(x + cent, y + ICON_SIZE + 4)); x += ICON_SIZE + 16; if (x > win_w) { 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) { o = evas_object_text_add(evas); o_texts[i] = o; - efl_text_properties_font_set(o, "Vera-Bold", 20); + efl_text_font_set(o, "Vera-Bold", 20); efl_text_set(o, "This is a test string"); efl_gfx_color_set(o, 0, 0, 0, 255); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -49,12 +49,12 @@ static void _loop(double t, int f) Evas_Coord x, y, w, h; for (i = 0; i < OBNUM; i++) { - efl_gfx_size_get(o_texts[i], &w, &h); + exp_size_get(o_texts[i], &w, &h); x = (win_w / 2) - (w / 2); x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2); - efl_gfx_position_set(o_texts[i], x, y); + efl_gfx_entity_position_set(o_texts[i], EINA_POSITION2D(x, y)); } FPS_STD(NAME); } 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) { o = evas_object_text_add(evas); o_texts[i] = o; - efl_text_properties_font_set(o, "Vera-Bold", 20); + efl_text_font_set(o, "Vera-Bold", 20); snprintf(buf, sizeof(buf), "%s %s %s %s.", strs[rnd() % (sizeof(strs) / sizeof(char *))], strs[rnd() % (sizeof(strs) / sizeof(char *))], @@ -42,13 +42,13 @@ static void _setup(void) strs[rnd() % (sizeof(strs) / sizeof(char *))]); efl_text_set(o, buf); efl_gfx_color_set(o, 0, 0, 0, 255); - efl_gfx_size_get(o, &w, &h); + exp_size_get(o, &w, &h); x = (win_w / 2) - (w / 2); x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2); - efl_gfx_position_set(o, x, y); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } 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) { o = evas_object_text_add(evas); o_texts[i] = o; - efl_text_properties_font_set(o, "Vera-Bold", 20); + efl_text_font_set(o, "Vera-Bold", 20); efl_text_set(o, "This is a test string"); evas_object_text_style_set(o, st); efl_gfx_color_set(o, 255, 255, 255, 255); @@ -37,7 +37,7 @@ static void _setup(void) evas_object_text_glow_color_set(o, 100, 80, 40, 100); evas_object_text_glow2_color_set(o, 50, 10, 5, 50); evas_object_text_outline_color_set(o, 0, 0, 0, 255); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); st++; if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW; } @@ -58,12 +58,12 @@ static void _loop(double t, int f) Evas_Coord x, y, w, h; for (i = 0; i < OBNUM; i++) { - efl_gfx_size_get(o_texts[i], &w, &h); + exp_size_get(o_texts[i], &w, &h); x = (win_w / 2) - (w / 2); x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2); - efl_gfx_position_set(o_texts[i], x, y); + efl_gfx_entity_position_set(o_texts[i], EINA_POSITION2D(x, y)); } FPS_STD(NAME); } 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) { o = evas_object_text_add(evas); o_texts[i] = o; - efl_text_properties_font_set(o, "Vera-Bold", 20); + efl_text_font_set(o, "Vera-Bold", 20); snprintf(buf, sizeof(buf), "%s %s %s %s.", strs[rnd() % (sizeof(strs) / sizeof(char *))], strs[rnd() % (sizeof(strs) / sizeof(char *))], @@ -49,7 +49,7 @@ static void _setup(void) evas_object_text_glow_color_set(o, 100, 80, 40, 100); evas_object_text_glow2_color_set(o, 50, 10, 5, 50); evas_object_text_outline_color_set(o, 0, 0, 0, 255); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); st++; if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW; } @@ -70,12 +70,12 @@ static void _loop(double t, int f) Evas_Coord x, y, w, h; for (i = 0; i < OBNUM; i++) { - efl_gfx_size_get(o_texts[i], &w, &h); + exp_size_get(o_texts[i], &w, &h); x = (win_w / 2) - (w / 2); x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2); - efl_gfx_position_set(o_texts[i], x, y); + efl_gfx_entity_position_set(o_texts[i], EINA_POSITION2D(x, y)); } FPS_STD(NAME); } diff --git a/src/bin/textblock_auto_align.c b/src/bin/textblock_auto_align.c index 400adeb..b3b5b49 100644 --- a/src/bin/textblock_auto_align.c +++ b/src/bin/textblock_auto_align.c @@ -49,7 +49,7 @@ static void _setup(void) "words should appear in the following order: 'דוגמה' first, 'of' second,
" "‎'טקסט' third, 'english' fourth and 'in' fifth, counting from right to left" "דוגמה of טקסט in english."); \ - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); evas_textblock_style_free(st); done = 0; @@ -73,8 +73,8 @@ static void _loop(double t, int f) w += fabs(sin((double)(f + (i * 13)) / (31.1 * SLOW))) * (w0); x = (win_w / 2) - (w / 2); y = (win_h / 2) - (h0 / 2); - efl_gfx_position_set(o_text, x, y); - efl_gfx_size_set(o_text, w, h); + efl_gfx_entity_position_set(o_text, EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o_text, EINA_SIZE2D(w, h)); FPS_STD(NAME); } diff --git a/src/bin/textblock_basic.c b/src/bin/textblock_basic.c index 6a4b8ad..8426f22 100644 --- a/src/bin/textblock_basic.c +++ b/src/bin/textblock_basic.c @@ -109,7 +109,7 @@ static void _setup(void) "Heizölrückstoßabdämpfung fløde pingüino kilómetros cœur déçu l'âme " "plutôt naïve Louÿs rêva crapaüter Íosa Úrmhac Óighe pór Éava Ádhaim" ""); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); evas_textblock_style_free(st); @@ -136,8 +136,8 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (86.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (93.8 * SLOW)) * (h0 / 2); - efl_gfx_position_set(o_text, x, y); - efl_gfx_size_set(o_text, w, 5000); + efl_gfx_entity_position_set(o_text, EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o_text, EINA_SIZE2D(w, 5000)); FPS_STD(NAME); } diff --git a/src/bin/textblock_intl.c b/src/bin/textblock_intl.c index 398754c..73443d8 100644 --- a/src/bin/textblock_intl.c +++ b/src/bin/textblock_intl.c @@ -80,7 +80,7 @@ static void _setup(void) "Thai: 'ยูนืโคด'
" "Tibetan: 'ཨུ་ནི་ཀོཌྲ།'
" "Yiddish: 'יוניקאָד'
"); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); evas_textblock_style_free(st); @@ -106,8 +106,8 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (31.1 * SLOW)) * (w0 / (2 * 2)); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (19.6 * SLOW)) * (h0 / (2 * 2)); - efl_gfx_position_set(o_text, x, y); - efl_gfx_size_set(o_text, w, h); + efl_gfx_entity_position_set(o_text, EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o_text, EINA_SIZE2D(w, h)); FPS_STD(NAME); } diff --git a/src/bin/textblock_text_append.c b/src/bin/textblock_text_append.c index 7ab9d19..3a4ede8 100644 --- a/src/bin/textblock_text_append.c +++ b/src/bin/textblock_text_append.c @@ -90,9 +90,9 @@ static void _setup(void) "Graphics" "" "Enlightenment is built by designers and programmers who want others to be able to do more with less. Some of Enlightenment's libraries do not do anything with graphics at all, but it is the ones that do that are the shining stars of the Enlightenment world.Evas is the canvas layer. It is not a drawing library. It is not like OpenGL, Cairo, XRender, GDI, DirectFB etc. It is a scene graph library that retains state of all objects in it. They are created then manipulated until they are no longer needed, at which point they are deleted. This allows the programmer to work in terms that a designer thinks of. It is direct mapping, as opposed to having to convert the concepts into drawing commands in the right order, calculate minimum drawing calls needed to get the job done etc.Evas also handles abstracting the rendering mechanism. With zero changes the same application can move from software to OpenGL rendering, as they all use an abstracted scene graph to describe the world (canvas) to Evas. Evas supports multiple targets, but the most useful are the high-speed software rendering engines and OpenGL (as well as OpenGL-ES 2.0).Evas not only does quality rendering and compositing, but also can scale, rotate and fully 3D transform objects, allowing for sought-after 3D effects in your interfaces. It supplies these abilities in both software and OpenGL rendering, so you are never caught with unexpected loss of features. The software rendering is even fast enough to provide the 3D without any acceleration on devices for simple uses.Edje is a meta-object design library that is somewhere between Flash, PSD, SVG and HTML+CSS. It separates design out from code and into a dynamically loaded data file. This file is compressed and loaded very quickly, along with being cached and shared betweeen instances.This allows design to be provided at runtime by different design (EDJ) files, leaving the programmer to worry about overall application implementation and coarse grained UI as opposed to needing to worry about all the little details that the artists may vary even until the day before shipping the product.
"); \ - efl_gfx_position_set(o, 0, 0); \ - efl_gfx_size_set(o, win_w, win_h); \ - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_position_set(o, EINA_POSITION2D(0, 0)); \ + efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, win_h)); \ + efl_gfx_entity_visible_set(o, EINA_TRUE); evas_textblock_style_free(st); diff --git a/src/bin/ui.c b/src/bin/ui.c index 78e3db1..db68adf 100644 --- a/src/bin/ui.c +++ b/src/bin/ui.c @@ -220,15 +220,15 @@ static int test_item = -1; static void _ui_menu_show(Eina_Bool visibility) { - efl_gfx_visible_set(o_menu_logo, visibility); - efl_gfx_visible_set(o_menu_title, visibility); - efl_gfx_visible_set(o_menu_icon, visibility); - efl_gfx_visible_set(o_menu_icon_sel, visibility); + efl_gfx_entity_visible_set(o_menu_logo, visibility); + efl_gfx_entity_visible_set(o_menu_title, visibility); + efl_gfx_entity_visible_set(o_menu_icon, visibility); + efl_gfx_entity_visible_set(o_menu_icon_sel, visibility); /* FIXME: ask if it's ok o_menu_icon_sel2 == NULL */ - efl_gfx_visible_set(o_menu_icon_sel2, visibility); - efl_gfx_visible_set(o_menu_text_sel, visibility); - efl_gfx_visible_set(o_title, visibility); - efl_gfx_visible_set(o_byline, visibility); + efl_gfx_entity_visible_set(o_menu_icon_sel2, visibility); + efl_gfx_entity_visible_set(o_menu_text_sel, visibility); + efl_gfx_entity_visible_set(o_title, visibility); + efl_gfx_entity_visible_set(o_byline, visibility); } static void @@ -244,12 +244,12 @@ _ui_select(void) Menu_Item *mi; mi = l->data; - efl_gfx_visible_set(mi->o_icon, EINA_FALSE); + efl_gfx_entity_visible_set(mi->o_icon, EINA_FALSE); if (i == menu_sel) func = mi->func; } - efl_gfx_visible_set(o_title, EINA_FALSE); - efl_gfx_visible_set(o_byline, EINA_FALSE); + efl_gfx_entity_visible_set(o_title, EINA_FALSE); + efl_gfx_entity_visible_set(o_byline, EINA_FALSE); menu_active = 0; if (func) func(); @@ -294,7 +294,7 @@ _ui_key(void *data EINA_UNUSED, const Efl_Event *event) } } -static Evas_Coord down_x, down_y; +static Eina_Position2D down; static int down_menu_sel = 0; static void @@ -305,7 +305,7 @@ _ui_mouse_down(void *data EINA_UNUSED, const Efl_Event *event) if (efl_input_pointer_button_get(ev) != 1) return; if (menu_active) { - efl_input_pointer_position_get(ev, &down_x, &down_y); + down = efl_input_pointer_position_get(ev); down_menu_sel = menu_sel; } } @@ -320,9 +320,9 @@ _ui_mouse_up(void *data EINA_UNUSED, const Efl_Event *event) { Evas_Coord dx, dy, x, y; - efl_input_pointer_position_get(ev, &x, &y); - dx = x - down_x; - dy = y - down_y; + exp_input_pointer_pos_get(ev, &x, &y); + dx = x - down.x; + dy = y - down.y; if ((((dx * dx) + (dy * dy)) < (20 * 20)) && (menu_sel == down_menu_sel)) _ui_select(); @@ -344,8 +344,8 @@ _ui_mouse_move(void *data EINA_UNUSED, const Efl_Event *event) { Evas_Coord x; - efl_input_pointer_position_get(ev, &x, NULL); - menu_sel = down_menu_sel + ((x - down_x) / 25); + exp_input_pointer_pos_get(ev, &x, NULL); + menu_sel = down_menu_sel + ((x - down.x) / 25); /* scroll */ if (menu_sel < 0) menu_sel = 0; else if ((unsigned int)menu_sel >= eina_list_count(menu)) @@ -364,8 +364,8 @@ _ui_menu_item_full_add(Eina_Bool test, mi = malloc(sizeof(Menu_Item)); mi->o_icon = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); efl_file_set(mi->o_icon, build_path(icon), NULL); - efl_gfx_size_set(mi->o_icon, 32, 32); - efl_gfx_fill_set(mi->o_icon, 0, 0, 32, 32); + efl_gfx_entity_size_set(mi->o_icon, EINA_SIZE2D(32, 32)); + efl_gfx_fill_set(mi->o_icon, EINA_RECT(0, 0, 32, 32)); mi->test = test; mi->icon = strdup(icon); mi->text = strdup(text); @@ -392,90 +392,90 @@ ui_setup(unsigned int ui_w, unsigned int ui_h) win_h = ui_h; o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); - efl_gfx_position_set(o, 0, 0); - efl_gfx_size_set(o, win_w, win_h); + efl_gfx_entity_position_set(o, EINA_POSITION2D(0, 0)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, win_h)); efl_gfx_color_set(o, 0, 0, 0, 0); efl_gfx_stack_layer_set(o, 1000); evas_object_focus_set(o, 1); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); efl_event_callback_array_add(o, ui_callbacks(), NULL); o_bg = o; o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); - efl_gfx_position_set(o, 0, 0); - efl_gfx_size_set(o, win_w, win_h); + efl_gfx_entity_position_set(o, EINA_POSITION2D(0, 0)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, win_h)); efl_gfx_color_set(o, 255, 255, 255, 255); efl_gfx_stack_layer_set(o, -99); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); o_wallpaper = o; o = evas_object_text_add(evas); - efl_text_properties_font_set(o, "Vera-Bold", 10); + efl_text_font_set(o, "Vera-Bold", 10); efl_text_set(o, "EXPEDITE"); efl_gfx_stack_layer_set(o, 100); efl_gfx_color_set(o, 0, 0, 0, 100); evas_object_pass_events_set(o, 1); - efl_gfx_size_get(o, &w, &h); + exp_size_get(o, &w, &h); x = (win_w - w) / 2; y = 0; - efl_gfx_position_set(o, x, y); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); + efl_gfx_entity_visible_set(o, EINA_TRUE); o_title = o; o = evas_object_text_add(evas); - efl_text_properties_font_set(o, "Vera", 9); + efl_text_font_set(o, "Vera", 9); efl_text_set(o, "LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."); efl_gfx_stack_layer_set(o, 100); efl_gfx_color_set(o, 0, 0, 0, 60); evas_object_pass_events_set(o, 1); - efl_gfx_size_get(o, &w, NULL); + exp_size_get(o, &w, NULL); x = (win_w - w) / 2; y = h + 2; - efl_gfx_position_set(o, x, y); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); + efl_gfx_entity_visible_set(o, EINA_TRUE); o_byline = o; o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); - efl_gfx_position_set(o, (win_w - 120) / 2, ((win_h - 160) / 2)); + efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 120) / 2, ((win_h - 160) / 2))); efl_file_set(o, build_path("e-logo.png"), NULL); - efl_gfx_fill_set(o, 0, 0, 120, 160); - efl_gfx_size_set(o, 120, 160); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); efl_gfx_stack_layer_set(o, -98); efl_gfx_color_set(o, 255, 255, 255, 255); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); o_menu_logo = o; o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); - efl_gfx_position_set(o, win_w - 128, - 128); - efl_gfx_fill_set(o, 0, 0, 256, 256); - efl_gfx_size_set(o, 256, 256); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_position_set(o, EINA_POSITION2D(win_w - 128, - 128)); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256)); + efl_gfx_entity_visible_set(o, EINA_TRUE); o_menu_icon = o; o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); - efl_gfx_position_set(o, 0, 0); + efl_gfx_entity_position_set(o, EINA_POSITION2D(0, 0)); efl_file_set(o, build_path("icon_sel.png"), NULL); - efl_gfx_size_set(o, 48, 48); - efl_gfx_fill_set(o, 0, 0, 48, 48); + efl_gfx_entity_size_set(o, EINA_SIZE2D(48, 48)); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 48, 48)); o_menu_icon_sel = o; o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); - efl_gfx_position_set(o, 0, 0); + efl_gfx_entity_position_set(o, EINA_POSITION2D(0, 0)); efl_file_set(o, build_path("text_sel.png"), NULL); - efl_gfx_size_set(o, 96, 32); - efl_gfx_fill_set(o, 0, 0, 96, 32); - efl_image_border_set(o, 7, 7, 7, 7); + efl_gfx_entity_size_set(o, EINA_SIZE2D(96, 32)); + efl_gfx_fill_set(o, EINA_RECT(0, 0, 96, 32)); + efl_gfx_image_border_set(o, 7, 7, 7, 7); o_menu_text_sel = o; o = evas_object_text_add(evas); - efl_text_properties_font_set(o, "Vera", 10); + efl_text_font_set(o, "Vera", 10); efl_text_set(o, ""); efl_gfx_color_set(o, 0, 0, 0, 100); evas_object_pass_events_set(o, 1); - efl_gfx_size_get(o, &w, &h); + exp_size_get(o, &w, &h); x = (win_w - w) / 2; y = (win_h - h) / 2; - efl_gfx_position_set(o, x, y); + efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); o_menu_title = o; _ui_menu_item_full_add(EINA_FALSE, "e.png", "About", about_start); @@ -518,8 +518,8 @@ ui_loop(void *data EINA_UNUSED) static double pt = 0.0; double t, t2; - efl_gfx_size_set(o_bg, win_w, win_h); - efl_gfx_size_set(o_wallpaper, win_w, win_h); + efl_gfx_entity_size_set(o_bg, EINA_SIZE2D(win_w, win_h)); + efl_gfx_entity_size_set(o_wallpaper, EINA_SIZE2D(win_w, win_h)); if (loop_func) { @@ -575,23 +575,23 @@ ui_loop(void *data EINA_UNUSED) Evas_Object *o; o = mi->o_icon; - efl_gfx_size_get(o_menu_logo, &w, &h); + exp_size_get(o_menu_logo, &w, &h); len = ((w * 3) + 10) / 4; - efl_gfx_size_get(o, &w, &h); + exp_size_get(o, &w, &h); x = (win_w / 2) + (sin((menu_anim - (double)i) * 0.33) * len) - (w / 2); y = (win_h / 2) + (cos((menu_anim - (double)i) * 0.33) * len) - (h / 2); - efl_gfx_position_set(o, x, y); + efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); a = menu_anim - (double)i; if (a < 0) a = -a; a = 255 - (30 * a); if (a < 0) a = 0; if (a > 255) a = 255; efl_gfx_color_set(o, a, a, a, a); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); if (i == menu_sel) { @@ -602,25 +602,25 @@ ui_loop(void *data EINA_UNUSED) if (a > 255) a = 255; o = o_menu_icon_sel; - efl_gfx_position_set(o, x - ((48 - w) / 2), y - ((48 - h) / 2)); + efl_gfx_entity_position_set(o, EINA_POSITION2D(x - ((48 - w) / 2), y - ((48 - h) / 2))); efl_gfx_color_set(o, a, a, a, a); o = o_menu_title; efl_gfx_color_set(o, a, a, a, a); efl_text_set(o, mi->text); - efl_gfx_size_get(o, &tw, &th); + exp_size_get(o, &tw, &th); x = (win_w - tw) / 2; y = (win_h / 2) + len + 48; - efl_gfx_position_set(o, x, y); + efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); o = o_menu_text_sel; w = tw + 24; h = 28; x = x - 12; y = y + ((th - h) / 2); - efl_gfx_position_set(o, x, y); - efl_gfx_size_set(o, w, h); - efl_gfx_fill_set(o, 0, 0, w, h); + efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(w, h)); + efl_gfx_fill_set(o, EINA_RECT(0, 0, w, h)); efl_gfx_color_set(o, a, a, a, a); o = o_menu_icon; @@ -630,8 +630,8 @@ ui_loop(void *data EINA_UNUSED) } i++; } - efl_gfx_position_set(o_menu_logo, (win_w - 120) / 2, ((win_h - 160) / 2)); - efl_gfx_visible_set(o_menu_logo, EINA_TRUE); + efl_gfx_entity_position_set(o_menu_logo, EINA_POSITION2D((win_w - 120) / 2, ((win_h - 160) / 2))); + efl_gfx_entity_visible_set(o_menu_logo, EINA_TRUE); _ui_menu_show(EINA_TRUE); } else @@ -644,8 +644,8 @@ ui_loop(void *data EINA_UNUSED) void ui_menu(void) { - efl_gfx_visible_set(o_title, EINA_TRUE); - efl_gfx_visible_set(o_byline, EINA_TRUE); + efl_gfx_entity_visible_set(o_title, EINA_TRUE); + efl_gfx_entity_visible_set(o_byline, EINA_TRUE); efl_text_set (o_byline, "LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."); menu_active = 1; diff --git a/src/bin/vg_basic_circle.c b/src/bin/vg_basic_circle.c index b4bc4f1..de7f26a 100644 --- a/src/bin/vg_basic_circle.c +++ b/src/bin/vg_basic_circle.c @@ -30,15 +30,15 @@ static void _setup(void) Eo *vector; double r = 35, stroke_w = 3; - vector = efl_add(EVAS_VG_CLASS, evas); + vector = efl_add(EFL_CANVAS_VG_OBJECT_CLASS, evas); o_shapes[i] = vector; - efl_gfx_size_set(vector, r * 2 + stroke_w * 2, r * 2 + stroke_w * 2); - efl_gfx_position_set(vector, 0, 0); - efl_gfx_visible_set(vector, EINA_TRUE); + efl_gfx_entity_size_set(vector, EINA_SIZE2D(r * 2 + stroke_w * 2, r * 2 + stroke_w * 2)); + efl_gfx_entity_position_set(vector, EINA_POSITION2D(0, 0)); + efl_gfx_entity_visible_set(vector, EINA_TRUE); root = evas_object_vg_root_node_get(vector); - circle = efl_add(EFL_VG_SHAPE_CLASS, root); + circle = efl_add(EFL_CANVAS_VG_SHAPE_CLASS, root); efl_gfx_path_append_circle(circle, r + stroke_w, r + stroke_w, r); efl_gfx_shape_stroke_width_set(circle, stroke_w); efl_gfx_shape_stroke_color_set(circle, 128, 0, 128, 128); @@ -66,7 +66,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2); - efl_gfx_position_set(o_shapes[i], x, y); + efl_gfx_entity_position_set(o_shapes[i], EINA_POSITION2D(x, y)); } FPS_STD(NAME); } diff --git a/src/bin/vg_basic_gradient.c b/src/bin/vg_basic_gradient.c index bae4ec7..f0188e4 100644 --- a/src/bin/vg_basic_gradient.c +++ b/src/bin/vg_basic_gradient.c @@ -36,23 +36,23 @@ static void _setup(void) Eo *vector; double w = 70, h = 70, stroke_w = 3; - vector = efl_add(EVAS_VG_CLASS, evas); + vector = efl_add(EFL_CANVAS_VG_OBJECT_CLASS, evas); o_shapes[i] = vector; - efl_gfx_size_set(vector, w + stroke_w * 2, h + stroke_w * 2); - efl_gfx_position_set(vector, 0, 0); - efl_gfx_visible_set(vector, EINA_TRUE); + efl_gfx_entity_size_set(vector, EINA_SIZE2D(w + stroke_w * 2, h + stroke_w * 2)); + efl_gfx_entity_position_set(vector, EINA_POSITION2D(0, 0)); + efl_gfx_entity_visible_set(vector, EINA_TRUE); root = evas_object_vg_root_node_get(vector); - gradient = efl_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL); + gradient = efl_add(EFL_CANVAS_VG_GRADIENT_LINEAR_CLASS, NULL); efl_gfx_gradient_stop_set(gradient, stops, 3); efl_gfx_gradient_spread_set(gradient, EFL_GFX_GRADIENT_SPREAD_REFLECT); efl_gfx_gradient_linear_start_set(gradient, 10, 10); efl_gfx_gradient_linear_end_set(gradient, 50, 50); - rect = efl_add(EFL_VG_SHAPE_CLASS, root); + rect = efl_add(EFL_CANVAS_VG_SHAPE_CLASS, root); efl_gfx_path_append_rect(rect, 0 + stroke_w, 0 + stroke_w, w, h, 10, 10); - efl_vg_shape_fill_set(rect, gradient); + efl_canvas_vg_shape_fill_set(rect, gradient); efl_gfx_shape_stroke_width_set(rect, stroke_w); efl_gfx_shape_stroke_color_set(rect, 128, 0, 128, 128); efl_gfx_shape_stroke_join_set(rect, EFL_GFX_JOIN_ROUND); @@ -79,7 +79,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2); - efl_gfx_position_set(o_shapes[i], x, y); + efl_gfx_entity_position_set(o_shapes[i], EINA_POSITION2D(x, y)); } FPS_STD(NAME); } diff --git a/src/bin/vg_basic_rect.c b/src/bin/vg_basic_rect.c index 56ba9a0..bc502b8 100644 --- a/src/bin/vg_basic_rect.c +++ b/src/bin/vg_basic_rect.c @@ -30,15 +30,15 @@ static void _setup(void) Eo *vector; double w = 70, h = 70, stroke_w = 3; - vector = efl_add(EVAS_VG_CLASS, evas); + vector = efl_add(EFL_CANVAS_VG_OBJECT_CLASS, evas); o_shapes[i] = vector; - efl_gfx_size_set(vector, w + stroke_w * 2, h + stroke_w * 2); - efl_gfx_position_set(vector, 0, 0); - efl_gfx_visible_set(vector, EINA_TRUE); + efl_gfx_entity_size_set(vector, EINA_SIZE2D(w + stroke_w * 2, h + stroke_w * 2)); + efl_gfx_entity_position_set(vector, EINA_POSITION2D(0, 0)); + efl_gfx_entity_visible_set(vector, EINA_TRUE); root = evas_object_vg_root_node_get(vector); - rect = efl_add(EFL_VG_SHAPE_CLASS, root); + rect = efl_add(EFL_CANVAS_VG_SHAPE_CLASS, root); efl_gfx_path_append_rect(rect, 0 + stroke_w, 0 + stroke_w, w, h, 10, 10); efl_gfx_shape_stroke_width_set(rect, stroke_w); efl_gfx_shape_stroke_color_set(rect, 128, 0, 128, 128); @@ -66,7 +66,7 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2); - efl_gfx_position_set(o_shapes[i], x, y); + efl_gfx_entity_position_set(o_shapes[i], EINA_POSITION2D(x, y)); } FPS_STD(NAME); } diff --git a/src/bin/vg_scaled.c b/src/bin/vg_scaled.c index bd1447c..9b30b9a 100644 --- a/src/bin/vg_scaled.c +++ b/src/bin/vg_scaled.c @@ -36,23 +36,23 @@ static void _setup(void) Eo *vector; double w = 70, h = 70, stroke_w = 3; - vector = efl_add(EVAS_VG_CLASS, evas); + vector = efl_add(EFL_CANVAS_VG_OBJECT_CLASS, evas); o_objects[i] = vector; - efl_gfx_size_set(vector, w + stroke_w * 2, h + stroke_w * 2); - efl_gfx_position_set(vector, 0, 0); - efl_gfx_visible_set(vector, EINA_TRUE); + efl_gfx_entity_size_set(vector, EINA_SIZE2D(w + stroke_w * 2, h + stroke_w * 2)); + efl_gfx_entity_position_set(vector, EINA_POSITION2D(0, 0)); + efl_gfx_entity_visible_set(vector, EINA_TRUE); root = evas_object_vg_root_node_get(vector); - o_gradient[i] = gradient = efl_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL); + o_gradient[i] = gradient = efl_add(EFL_CANVAS_VG_GRADIENT_LINEAR_CLASS, NULL); efl_gfx_gradient_stop_set(gradient, stops, 3); efl_gfx_gradient_spread_set(gradient, EFL_GFX_GRADIENT_SPREAD_REFLECT); efl_gfx_gradient_linear_start_set(gradient, 10, 10); efl_gfx_gradient_linear_end_set(gradient, 50, 50); - o_shapes[i] = rect = efl_add(EFL_VG_SHAPE_CLASS, root); + o_shapes[i] = rect = efl_add(EFL_CANVAS_VG_SHAPE_CLASS, root); efl_gfx_path_append_rect(rect, 0 + stroke_w, 0 + stroke_w, w, h, 10, 10); - efl_vg_shape_fill_set(rect, gradient); + efl_canvas_vg_shape_fill_set(rect, gradient); efl_gfx_shape_stroke_width_set(rect, stroke_w); efl_gfx_shape_stroke_color_set(rect, 128, 0, 128, 128); efl_gfx_shape_stroke_join_set(rect, EFL_GFX_JOIN_ROUND); @@ -86,12 +86,12 @@ static void _loop(double t, int f) x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); - efl_gfx_position_set(o_objects[i], x, y); - efl_gfx_size_set(o_objects[i], w + stroke_w * 2, h + stroke_w * 2); - efl_gfx_fill_set(o_objects[i], 0, 0, w, h); + efl_gfx_entity_position_set(o_objects[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_size_set(o_objects[i], EINA_SIZE2D(w + stroke_w * 2, h + stroke_w * 2)); + efl_gfx_fill_set(o_objects[i], EINA_RECT(0, 0, w, h)); efl_gfx_path_reset(o_shapes[i]); efl_gfx_path_append_rect(o_shapes[i], 0 + stroke_w, 0 + stroke_w, w, h, 10, 10); - efl_vg_shape_fill_set(o_shapes[i], o_gradient[i]); + efl_canvas_vg_shape_fill_set(o_shapes[i], o_gradient[i]); efl_gfx_shape_stroke_width_set(o_shapes[i], stroke_w); efl_gfx_shape_stroke_color_set(o_shapes[i], 128, 0, 128, 128); efl_gfx_shape_stroke_join_set(o_shapes[i], EFL_GFX_JOIN_ROUND); diff --git a/src/bin/widgets_file_icons.c b/src/bin/widgets_file_icons.c index 93633fb..3c6ca4d 100644 --- a/src/bin/widgets_file_icons.c +++ b/src/bin/widgets_file_icons.c @@ -49,18 +49,18 @@ static void _setup(void) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path(icons[i % 13]), NULL); - efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE); - efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE)); + efl_gfx_entity_visible_set(o, EINA_TRUE); o = evas_object_text_add(evas); o_texts[i] = o; - efl_text_properties_font_set(o, "Vera-Bold", 10); + efl_text_font_set(o, "Vera-Bold", 10); efl_text_set(o, icons[i % 13]); evas_object_text_style_set(o, EVAS_TEXT_STYLE_FAR_SOFT_SHADOW); efl_gfx_color_set(o, 255, 255, 255, 255); evas_object_text_shadow_color_set(o, 0, 0, 0, 24); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -85,10 +85,10 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - efl_gfx_position_set(o_images[i], x + 8, y); - efl_gfx_size_get(o_texts[i], &tw, &th); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x + 8, y)); + exp_size_get(o_texts[i], &tw, &th); cent = (ICON_SIZE + 16 - tw) / 2; - efl_gfx_position_set(o_texts[i], x + cent, y + ICON_SIZE + 4); + efl_gfx_entity_position_set(o_texts[i], EINA_POSITION2D(x + cent, y + ICON_SIZE + 4)); x += ICON_SIZE + 16; if (x > win_w) { diff --git a/src/bin/widgets_file_icons_2.c b/src/bin/widgets_file_icons_2.c index e66480f..d251407 100644 --- a/src/bin/widgets_file_icons_2.c +++ b/src/bin/widgets_file_icons_2.c @@ -49,16 +49,16 @@ static void _setup(void) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path(icons[i % 13]), NULL); - efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE); - efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE)); + efl_gfx_entity_visible_set(o, EINA_TRUE); o = evas_object_text_add(evas); o_texts[i] = o; - efl_text_properties_font_set(o, "Vera-Bold", 10); + efl_text_font_set(o, "Vera-Bold", 10); efl_text_set(o, icons[i % 13]); efl_gfx_color_set(o, 0, 0, 0, 255); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -83,10 +83,10 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - efl_gfx_position_set(o_images[i], x + 8, y); - efl_gfx_size_get(o_texts[i], &tw, &th); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x + 8, y)); + exp_size_get(o_texts[i], &tw, &th); cent = (ICON_SIZE + 16 - tw) / 2; - efl_gfx_position_set(o_texts[i], x + cent, y + ICON_SIZE + 4); + efl_gfx_entity_position_set(o_texts[i], EINA_POSITION2D(x + cent, y + ICON_SIZE + 4)); x += ICON_SIZE + 16; if (x > win_w) { diff --git a/src/bin/widgets_file_icons_2_grouped.c b/src/bin/widgets_file_icons_2_grouped.c index 724e7f5..5ed5a4a 100644 --- a/src/bin/widgets_file_icons_2_grouped.c +++ b/src/bin/widgets_file_icons_2_grouped.c @@ -49,16 +49,16 @@ static void _setup(void) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path(icons[i % 13]), NULL); - efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE); - efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE)); + efl_gfx_entity_visible_set(o, EINA_TRUE); o = evas_object_text_add(evas); o_texts[i] = o; - efl_text_properties_font_set(o, "Vera-Bold", 10); + efl_text_font_set(o, "Vera-Bold", 10); efl_text_set(o, icons[i % 13]); efl_gfx_color_set(o, 0, 0, 0, 255); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } for (i = 0; i < NUM; i++) { @@ -92,10 +92,10 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - efl_gfx_position_set(o_images[i], x + 8, y); - efl_gfx_size_get(o_texts[i], &tw, &th); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x + 8, y)); + exp_size_get(o_texts[i], &tw, &th); cent = (ICON_SIZE + 16 - tw) / 2; - efl_gfx_position_set(o_texts[i], x + cent, y + ICON_SIZE + 4); + efl_gfx_entity_position_set(o_texts[i], EINA_POSITION2D(x + cent, y + ICON_SIZE + 4)); x += ICON_SIZE + 16; if (x > win_w) { diff --git a/src/bin/widgets_file_icons_2_same.c b/src/bin/widgets_file_icons_2_same.c index 1a42604..afe4117 100644 --- a/src/bin/widgets_file_icons_2_same.c +++ b/src/bin/widgets_file_icons_2_same.c @@ -34,16 +34,16 @@ static void _setup(void) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path(icons[i % 1]), NULL); - efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE); - efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE)); + efl_gfx_entity_visible_set(o, EINA_TRUE); o = evas_object_text_add(evas); o_texts[i] = o; - efl_text_properties_font_set(o, "Vera-Bold", 10); + efl_text_font_set(o, "Vera-Bold", 10); efl_text_set(o, icons[i % 1]); efl_gfx_color_set(o, 0, 0, 0, 255); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -68,10 +68,10 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - efl_gfx_position_set(o_images[i], x + 8, y); - efl_gfx_size_get(o_texts[i], &tw, &th); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x + 8, y)); + exp_size_get(o_texts[i], &tw, &th); cent = (ICON_SIZE + 16 - tw) / 2; - efl_gfx_position_set(o_texts[i], x + cent, y + ICON_SIZE + 4); + efl_gfx_entity_position_set(o_texts[i], EINA_POSITION2D(x + cent, y + ICON_SIZE + 4)); x += ICON_SIZE + 16; if (x > win_w) { diff --git a/src/bin/widgets_file_icons_2_same_grouped.c b/src/bin/widgets_file_icons_2_same_grouped.c index 59af84c..37c607b 100644 --- a/src/bin/widgets_file_icons_2_same_grouped.c +++ b/src/bin/widgets_file_icons_2_same_grouped.c @@ -34,16 +34,16 @@ static void _setup(void) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path(icons[i % 1]), NULL); - efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE); - efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE)); + efl_gfx_entity_visible_set(o, EINA_TRUE); o = evas_object_text_add(evas); o_texts[i] = o; - efl_text_properties_font_set(o, "Vera-Bold", 10); + efl_text_font_set(o, "Vera-Bold", 10); efl_text_set(o, icons[i % 1]); efl_gfx_color_set(o, 0, 0, 0, 255); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } for (i = 0; i < NUM; i++) { @@ -72,10 +72,10 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - efl_gfx_position_set(o_images[i], x + 8, y); - efl_gfx_size_get(o_texts[i], &tw, &th); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x + 8, y)); + exp_size_get(o_texts[i], &tw, &th); cent = (ICON_SIZE + 16 - tw) / 2; - efl_gfx_position_set(o_texts[i], x + cent, y + ICON_SIZE + 4); + efl_gfx_entity_position_set(o_texts[i], EINA_POSITION2D(x + cent, y + ICON_SIZE + 4)); x += ICON_SIZE + 16; if (x > win_w) { diff --git a/src/bin/widgets_file_icons_3.c b/src/bin/widgets_file_icons_3.c index 8f06902..2fbe254 100644 --- a/src/bin/widgets_file_icons_3.c +++ b/src/bin/widgets_file_icons_3.c @@ -49,16 +49,16 @@ static void _setup(void) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path(icons[i % 13]), NULL); - efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE); - efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE)); + efl_gfx_entity_visible_set(o, EINA_TRUE); o = evas_object_text_add(evas); o_texts[i] = o; - efl_text_properties_font_set(o, "Vera-Bold", 10); + efl_text_font_set(o, "Vera-Bold", 10); efl_text_set(o, icons[i % 13]); efl_gfx_color_set(o, 0, 0, 0, 255); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -83,10 +83,10 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - efl_gfx_position_set(o_images[i], x + 8, y); - efl_gfx_size_get(o_texts[i], &tw, &th); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x + 8, y)); + exp_size_get(o_texts[i], &tw, &th); cent = (ICON_SIZE + 16 - tw) / 2; - efl_gfx_position_set(o_texts[i], x + cent, y + ICON_SIZE + 4); + efl_gfx_entity_position_set(o_texts[i], EINA_POSITION2D(x + cent, y + ICON_SIZE + 4)); x += ICON_SIZE + 16; if (x > win_w) { diff --git a/src/bin/widgets_file_icons_4.c b/src/bin/widgets_file_icons_4.c index 3fe43ed..c1b91cf 100644 --- a/src/bin/widgets_file_icons_4.c +++ b/src/bin/widgets_file_icons_4.c @@ -49,16 +49,16 @@ static void _setup(void) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path(icons[i % 13]), NULL); - efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE); - efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE)); + efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE)); + efl_gfx_entity_visible_set(o, EINA_TRUE); o = evas_object_text_add(evas); o_texts[i] = o; - efl_text_properties_font_set(o, "Vera-Bold", 10); + efl_text_font_set(o, "Vera-Bold", 10); efl_text_set(o, icons[i % 13]); efl_gfx_color_set(o, 0, 0, 0, 255); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -83,10 +83,10 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - efl_gfx_position_set(o_images[i], x + 8, y); - efl_gfx_size_get(o_texts[i], &tw, &th); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x + 8, y)); + exp_size_get(o_texts[i], &tw, &th); cent = (ICON_SIZE + 16 - tw) / 2; - efl_gfx_position_set(o_texts[i], x + cent, y + ICON_SIZE + 4); + efl_gfx_entity_position_set(o_texts[i], EINA_POSITION2D(x + cent, y + ICON_SIZE + 4)); x += ICON_SIZE + 16; if (x > win_w) { diff --git a/src/bin/widgets_list_1.c b/src/bin/widgets_list_1.c index a1377ef..8b73ffa 100644 --- a/src/bin/widgets_list_1.c +++ b/src/bin/widgets_list_1.c @@ -64,17 +64,17 @@ static void _setup(void) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; - efl_image_border_set(o, 2, 2, 2, 2); + efl_gfx_image_border_set(o, 2, 2, 2, 2); efl_file_set(o, build_path("pan.png"), NULL); - efl_gfx_size_set(o, win_w, ICON_SIZE); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); + efl_gfx_entity_visible_set(o, EINA_TRUE); o = evas_object_text_add(evas); o_texts[i] = o; - efl_text_properties_font_set(o, "Vera-Bold", 10); + efl_text_font_set(o, "Vera-Bold", 10); efl_text_set(o, labels[i % 26]); efl_gfx_color_set(o, 0, 0, 0, 255); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -99,10 +99,10 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_size_get(o_texts[i], &tw, &th); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + exp_size_get(o_texts[i], &tw, &th); cent = (ICON_SIZE - th) / 2; - efl_gfx_position_set(o_texts[i], x + 8, y + cent); + efl_gfx_entity_position_set(o_texts[i], EINA_POSITION2D(x + 8, y + cent)); y += ICON_SIZE; } FPS_STD(NAME); diff --git a/src/bin/widgets_list_1_grouped.c b/src/bin/widgets_list_1_grouped.c index 34e9ec7..bfef9b0 100644 --- a/src/bin/widgets_list_1_grouped.c +++ b/src/bin/widgets_list_1_grouped.c @@ -64,17 +64,17 @@ static void _setup(void) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; - efl_image_border_set(o, 2, 2, 2, 2); + efl_gfx_image_border_set(o, 2, 2, 2, 2); efl_file_set(o, build_path("pan.png"), NULL); - efl_gfx_size_set(o, win_w, ICON_SIZE); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); + efl_gfx_entity_visible_set(o, EINA_TRUE); o = evas_object_text_add(evas); o_texts[i] = o; - efl_text_properties_font_set(o, "Vera-Bold", 10); + efl_text_font_set(o, "Vera-Bold", 10); efl_text_set(o, labels[i % 26]); efl_gfx_color_set(o, 0, 0, 0, 255); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } for (i = 0; i < NUM; i++) { @@ -107,10 +107,10 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_size_get(o_texts[i], &tw, &th); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + exp_size_get(o_texts[i], &tw, &th); cent = (ICON_SIZE - th) / 2; - efl_gfx_position_set(o_texts[i], x + 8, y + cent); + efl_gfx_entity_position_set(o_texts[i], EINA_POSITION2D(x + 8, y + cent)); y += ICON_SIZE; } FPS_STD(NAME); diff --git a/src/bin/widgets_list_2.c b/src/bin/widgets_list_2.c index 4338d06..dd37807 100644 --- a/src/bin/widgets_list_2.c +++ b/src/bin/widgets_list_2.c @@ -64,17 +64,17 @@ static void _setup(void) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; - efl_image_border_set(o, 2, 2, 2, 2); + efl_gfx_image_border_set(o, 2, 2, 2, 2); efl_file_set(o, build_path("pan.png"), NULL); - efl_gfx_size_set(o, win_w, ICON_SIZE); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); + efl_gfx_entity_visible_set(o, EINA_TRUE); o = evas_object_text_add(evas); o_texts[i] = o; - efl_text_properties_font_set(o, "Vera-Bold", 10); + efl_text_font_set(o, "Vera-Bold", 10); efl_text_set(o, labels[i % 26]); efl_gfx_color_set(o, 0, 0, 0, 255); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -99,10 +99,10 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_size_get(o_texts[i], &tw, &th); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + exp_size_get(o_texts[i], &tw, &th); cent = (ICON_SIZE - th) / 2; - efl_gfx_position_set(o_texts[i], x + 8, y + cent); + efl_gfx_entity_position_set(o_texts[i], EINA_POSITION2D(x + 8, y + cent)); y += ICON_SIZE; } FPS_STD(NAME); diff --git a/src/bin/widgets_list_2_grouped.c b/src/bin/widgets_list_2_grouped.c index 151172b..fb3bfd7 100644 --- a/src/bin/widgets_list_2_grouped.c +++ b/src/bin/widgets_list_2_grouped.c @@ -64,17 +64,17 @@ static void _setup(void) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; - efl_image_border_set(o, 2, 2, 2, 2); + efl_gfx_image_border_set(o, 2, 2, 2, 2); efl_file_set(o, build_path("pan.png"), NULL); - efl_gfx_size_set(o, win_w, ICON_SIZE); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); + efl_gfx_entity_visible_set(o, EINA_TRUE); o = evas_object_text_add(evas); o_texts[i] = o; - efl_text_properties_font_set(o, "Vera-Bold", 10); + efl_text_font_set(o, "Vera-Bold", 10); efl_text_set(o, labels[i % 26]); efl_gfx_color_set(o, 0, 0, 0, 255); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } for (i = 0; i < NUM; i++) { @@ -107,10 +107,10 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_size_get(o_texts[i], &tw, &th); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + exp_size_get(o_texts[i], &tw, &th); cent = (ICON_SIZE - th) / 2; - efl_gfx_position_set(o_texts[i], x + 8, y + cent); + efl_gfx_entity_position_set(o_texts[i], EINA_POSITION2D(x + 8, y + cent)); y += ICON_SIZE; } FPS_STD(NAME); diff --git a/src/bin/widgets_list_3.c b/src/bin/widgets_list_3.c index 61075c7..d906324 100644 --- a/src/bin/widgets_list_3.c +++ b/src/bin/widgets_list_3.c @@ -85,24 +85,24 @@ static void _setup(void) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; - efl_image_border_set(o, 2, 2, 2, 2); + efl_gfx_image_border_set(o, 2, 2, 2, 2); efl_file_set(o, build_path("pan.png"), NULL); - efl_gfx_size_set(o, win_w, ICON_SIZE); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); + efl_gfx_entity_visible_set(o, EINA_TRUE); o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_icons[i] = o; - efl_image_border_set(o, 2, 2, 2, 2); + efl_gfx_image_border_set(o, 2, 2, 2, 2); efl_file_set(o, build_path(icons[i % 13]), NULL); - efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE - 8, ICON_SIZE - 8)); + efl_gfx_entity_visible_set(o, EINA_TRUE); o = evas_object_text_add(evas); o_texts[i] = o; - efl_text_properties_font_set(o, "Vera-Bold", 10); + efl_text_font_set(o, "Vera-Bold", 10); efl_text_set(o, labels[i % 26]); efl_gfx_color_set(o, 0, 0, 0, 255); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -128,11 +128,11 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_position_set(o_icons[i], x + 4, y + 4); - efl_gfx_size_get(o_texts[i], &tw, &th); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_position_set(o_icons[i], EINA_POSITION2D(x + 4, y + 4)); + exp_size_get(o_texts[i], &tw, &th); cent = (ICON_SIZE - th) / 2; - efl_gfx_position_set(o_texts[i], x + 8 + ICON_SIZE + 8, y + cent); + efl_gfx_entity_position_set(o_texts[i], EINA_POSITION2D(x + 8 + ICON_SIZE + 8, y + cent)); y += ICON_SIZE; } FPS_STD(NAME); diff --git a/src/bin/widgets_list_3_grouped.c b/src/bin/widgets_list_3_grouped.c index 734ba5f..32cf5da 100644 --- a/src/bin/widgets_list_3_grouped.c +++ b/src/bin/widgets_list_3_grouped.c @@ -85,24 +85,24 @@ static void _setup(void) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; - efl_image_border_set(o, 2, 2, 2, 2); + efl_gfx_image_border_set(o, 2, 2, 2, 2); efl_file_set(o, build_path("pan.png"), NULL); - efl_gfx_size_set(o, win_w, ICON_SIZE); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); + efl_gfx_entity_visible_set(o, EINA_TRUE); o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_icons[i] = o; - efl_image_border_set(o, 2, 2, 2, 2); + efl_gfx_image_border_set(o, 2, 2, 2, 2); efl_file_set(o, build_path(icons[i % 13]), NULL); - efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE - 8, ICON_SIZE - 8)); + efl_gfx_entity_visible_set(o, EINA_TRUE); o = evas_object_text_add(evas); o_texts[i] = o; - efl_text_properties_font_set(o, "Vera-Bold", 10); + efl_text_font_set(o, "Vera-Bold", 10); efl_text_set(o, labels[i % 26]); efl_gfx_color_set(o, 0, 0, 0, 255); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } for (i = 0; i < NUM; i++) { @@ -145,11 +145,11 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_position_set(o_icons[i], x + 4, y + 4); - efl_gfx_size_get(o_texts[i], &tw, &th); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_position_set(o_icons[i], EINA_POSITION2D(x + 4, y + 4)); + exp_size_get(o_texts[i], &tw, &th); cent = (ICON_SIZE - th) / 2; - efl_gfx_position_set(o_texts[i], x + 8 + ICON_SIZE + 8, y + cent); + efl_gfx_entity_position_set(o_texts[i], EINA_POSITION2D(x + 8 + ICON_SIZE + 8, y + cent)); y += ICON_SIZE; } FPS_STD(NAME); diff --git a/src/bin/widgets_list_4.c b/src/bin/widgets_list_4.c index ef26f69..4992dbc 100644 --- a/src/bin/widgets_list_4.c +++ b/src/bin/widgets_list_4.c @@ -85,24 +85,24 @@ static void _setup(void) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; - efl_image_border_set(o, 2, 2, 2, 2); + efl_gfx_image_border_set(o, 2, 2, 2, 2); efl_file_set(o, build_path("pan.png"), NULL); - efl_gfx_size_set(o, win_w, ICON_SIZE); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); + efl_gfx_entity_visible_set(o, EINA_TRUE); o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_icons[i] = o; - efl_image_border_set(o, 2, 2, 2, 2); + efl_gfx_image_border_set(o, 2, 2, 2, 2); efl_file_set(o, build_path(icons[i % 13]), NULL); - efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE - 8, ICON_SIZE - 8)); + efl_gfx_entity_visible_set(o, EINA_TRUE); o = evas_object_text_add(evas); o_texts[i] = o; - efl_text_properties_font_set(o, "Vera-Bold", 10); + efl_text_font_set(o, "Vera-Bold", 10); efl_text_set(o, labels[i % 26]); efl_gfx_color_set(o, 0, 0, 0, 255); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; } @@ -125,11 +125,11 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_position_set(o_icons[i], x + 4, y + 4); - efl_gfx_size_get(o_texts[i], &tw, &th); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_position_set(o_icons[i], EINA_POSITION2D(x + 4, y + 4)); + exp_size_get(o_texts[i], &tw, &th); cent = (ICON_SIZE - th) / 2; - efl_gfx_position_set(o_texts[i], x + 8 + ICON_SIZE + 8, y + cent); + efl_gfx_entity_position_set(o_texts[i], EINA_POSITION2D(x + 8 + ICON_SIZE + 8, y + cent)); y += ICON_SIZE; } FPS_STD(NAME); diff --git a/src/bin/widgets_list_4_grouped.c b/src/bin/widgets_list_4_grouped.c index 7afa4ee..20b6164 100644 --- a/src/bin/widgets_list_4_grouped.c +++ b/src/bin/widgets_list_4_grouped.c @@ -85,24 +85,24 @@ static void _setup(void) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; - efl_image_border_set(o, 2, 2, 2, 2); + efl_gfx_image_border_set(o, 2, 2, 2, 2); efl_file_set(o, build_path("pan.png"), NULL); - efl_gfx_size_set(o, win_w, ICON_SIZE); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); + efl_gfx_entity_visible_set(o, EINA_TRUE); o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_icons[i] = o; - efl_image_border_set(o, 2, 2, 2, 2); + efl_gfx_image_border_set(o, 2, 2, 2, 2); efl_file_set(o, build_path(icons[i % 13]), NULL); - efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE - 8, ICON_SIZE - 8)); + efl_gfx_entity_visible_set(o, EINA_TRUE); o = evas_object_text_add(evas); o_texts[i] = o; - efl_text_properties_font_set(o, "Vera-Bold", 10); + efl_text_font_set(o, "Vera-Bold", 10); efl_text_set(o, labels[i % 26]); efl_gfx_color_set(o, 0, 0, 0, 255); - efl_gfx_visible_set(o, EINA_TRUE); + efl_gfx_entity_visible_set(o, EINA_TRUE); } for (i = 0; i < NUM; i++) { @@ -144,11 +144,11 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - efl_gfx_position_set(o_images[i], x, y); - efl_gfx_position_set(o_icons[i], x + 4, y + 4); - efl_gfx_size_get(o_texts[i], &tw, &th); + efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y)); + efl_gfx_entity_position_set(o_icons[i], EINA_POSITION2D(x + 4, y + 4)); + exp_size_get(o_texts[i], &tw, &th); cent = (ICON_SIZE - th) / 2; - efl_gfx_position_set(o_texts[i], x + 8 + ICON_SIZE + 8, y + cent); + efl_gfx_entity_position_set(o_texts[i], EINA_POSITION2D(x + 8 + ICON_SIZE + 8, y + cent)); y += ICON_SIZE; } FPS_STD(NAME);