Remove EFL, since it's been released now.

37 files changed, 0 insertions, 36830 deletions

diff --git a/libraries/evas/src/lib/canvas/Makefile.am b/libraries/evas/src/lib/canvas/Makefile.am
deleted file mode 100644
index e302668..0000000
--- a/libraries/evas/src/lib/canvas/Makefile.am
+++ /dev/null
@@ -1,67 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--I$(top_srcdir)/src/lib/cserve \
--DPACKAGE_BIN_DIR=\"$(bindir)\" \
--DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-@FREETYPE_CFLAGS@ \
-@EET_CFLAGS@ \
-@FONTCONFIG_CFLAGS@ \
-@EVAS_CFLAGS@ \
-@EINA_CFLAGS@ \
-@EVIL_CFLAGS@ \
-@PIXMAN_CFLAGS@
-
-noinst_LTLIBRARIES   = libevas_canvas.la
-libevas_canvas_la_SOURCES  = \
-evas_callbacks.c \
-evas_clip.c \
-evas_data.c \
-evas_events.c \
-evas_filter.c \
-evas_focus.c \
-evas_key.c \
-evas_key_grab.c \
-evas_layer.c \
-evas_main.c \
-evas_name.c \
-evas_object_image.c \
-evas_object_main.c \
-evas_object_inform.c \
-evas_object_intercept.c \
-evas_object_line.c \
-evas_object_polygon.c \
-evas_object_rectangle.c \
-evas_object_smart.c \
-evas_object_smart_clipped.c \
-evas_object_box.c \
-evas_object_table.c \
-evas_object_text.c \
-evas_object_textblock.c \
-evas_object_grid.c \
-evas_font_dir.c \
-evas_rectangle.c \
-evas_render.c \
-evas_smart.c \
-evas_stack.c \
-evas_async_events.c \
-evas_stats.c \
-evas_touch_point.c \
-evas_map.c \
-evas_gl.c
-
-#evas_object_textgrid.c
-
-libevas_canvas_la_LIBADD = @EVAS_LIBS@ @EVIL_LIBS@
-
-if EVAS_USE_LINEBREAK
-AM_CPPFLAGS += @LINEBREAK_CFLAGS@
-libevas_canvas_la_LIBADD += @LINEBREAK_LIBS@
-endif
-
-clean-local:
-        rm -rf *.gcno
diff --git a/libraries/evas/src/lib/canvas/Makefile.in b/libraries/evas/src/lib/canvas/Makefile.in
deleted file mode 100644
index c7e48bc..0000000
--- a/libraries/evas/src/lib/canvas/Makefile.in
+++ /dev/null
@@ -1,763 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-@EVAS_USE_LINEBREAK_TRUE@am__append_1 = @LINEBREAK_CFLAGS@
-@EVAS_USE_LINEBREAK_TRUE@am__append_2 = @LINEBREAK_LIBS@
-subdir = src/lib/canvas
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \
-        $(top_srcdir)/m4/efl_coverage.m4 \
-        $(top_srcdir)/m4/efl_doxygen.m4 \
-        $(top_srcdir)/m4/efl_fnmatch.m4 \
-        $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \
-        $(top_srcdir)/m4/evas_check_engine.m4 \
-        $(top_srcdir)/m4/evas_check_loader.m4 \
-        $(top_srcdir)/m4/evas_converter.m4 \
-        $(top_srcdir)/m4/evas_dither.m4 \
-        $(top_srcdir)/m4/evas_scaler.m4 $(top_srcdir)/m4/libtool.m4 \
-        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-        $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-        $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-libevas_canvas_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libevas_canvas_la_OBJECTS = evas_callbacks.lo evas_clip.lo \
-        evas_data.lo evas_events.lo evas_filter.lo evas_focus.lo \
-        evas_key.lo evas_key_grab.lo evas_layer.lo evas_main.lo \
-        evas_name.lo evas_object_image.lo evas_object_main.lo \
-        evas_object_inform.lo evas_object_intercept.lo \
-        evas_object_line.lo evas_object_polygon.lo \
-        evas_object_rectangle.lo evas_object_smart.lo \
-        evas_object_smart_clipped.lo evas_object_box.lo \
-        evas_object_table.lo evas_object_text.lo \
-        evas_object_textblock.lo evas_object_grid.lo evas_font_dir.lo \
-        evas_rectangle.lo evas_render.lo evas_smart.lo evas_stack.lo \
-        evas_async_events.lo evas_stats.lo evas_touch_point.lo \
-        evas_map.lo evas_gl.lo
-libevas_canvas_la_OBJECTS = $(am_libevas_canvas_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-        $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libevas_canvas_la_SOURCES)
-DIST_SOURCES = $(libevas_canvas_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHECK_CFLAGS = @CHECK_CFLAGS@
-CHECK_LIBS = @CHECK_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
-DIRECTFB_LIBS = @DIRECTFB_LIBS@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ECORE_EVAS_CFLAGS = @ECORE_EVAS_CFLAGS@
-ECORE_EVAS_LIBS = @ECORE_EVAS_LIBS@
-EDB_CFLAGS = @EDB_CFLAGS@
-EDB_LIBS = @EDB_LIBS@
-EDJE_CFLAGS = @EDJE_CFLAGS@
-EDJE_LIBS = @EDJE_LIBS@
-EET_CFLAGS = @EET_CFLAGS@
-EET_LIBS = @EET_LIBS@
-EFL_COVERAGE_CFLAGS = @EFL_COVERAGE_CFLAGS@
-EFL_COVERAGE_LIBS = @EFL_COVERAGE_LIBS@
-EFL_FNMATCH_LIBS = @EFL_FNMATCH_LIBS@
-EGREP = @EGREP@
-EINA_CFLAGS = @EINA_CFLAGS@
-EINA_LIBS = @EINA_LIBS@
-EVAS_CFLAGS = @EVAS_CFLAGS@
-EVAS_LIBS = @EVAS_LIBS@
-EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@
-EVIL_CFLAGS = @EVIL_CFLAGS@
-EVIL_LIBS = @EVIL_LIBS@
-EXEEXT = @EXEEXT@
-EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
-EXOTIC_LIBS = @EXOTIC_LIBS@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-FRIBIDI_CFLAGS = @FRIBIDI_CFLAGS@
-FRIBIDI_LIBS = @FRIBIDI_LIBS@
-GL_EET_CFLAGS = @GL_EET_CFLAGS@
-GL_EET_LIBS = @GL_EET_LIBS@
-GREP = @GREP@
-HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
-HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINEBREAK_CFLAGS = @LINEBREAK_CFLAGS@
-LINEBREAK_LIBS = @LINEBREAK_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MODULE_ARCH = @MODULE_ARCH@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
-PIXMAN_LIBS = @PIXMAN_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PNG_CFLAGS = @PNG_CFLAGS@
-PNG_LIBS = @PNG_LIBS@
-RANLIB = @RANLIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_LIBS = @SDL_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHM_OPEN_LINK = @SHM_OPEN_LINK@
-STRIP = @STRIP@
-SVG_CFLAGS = @SVG_CFLAGS@
-SVG_LIBS = @SVG_LIBS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VERSION = @VERSION@
-VMAJ = @VMAJ@
-WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
-WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-XCB_CFLAGS = @XCB_CFLAGS@
-XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
-XCB_GL_LIBS = @XCB_GL_LIBS@
-XCB_LIBS = @XCB_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_OBJC = @ac_ct_OBJC@
-altivec_cflags = @altivec_cflags@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dlopen_libs = @dlopen_libs@
-docdir = @docdir@
-dvidir = @dvidir@
-edje_cc = @edje_cc@
-efl_doxygen = @efl_doxygen@
-efl_have_doxygen = @efl_have_doxygen@
-evas_engine_buffer_cflags = @evas_engine_buffer_cflags@
-evas_engine_buffer_libs = @evas_engine_buffer_libs@
-evas_engine_direct3d_cflags = @evas_engine_direct3d_cflags@
-evas_engine_direct3d_libs = @evas_engine_direct3d_libs@
-evas_engine_directfb_cflags = @evas_engine_directfb_cflags@
-evas_engine_directfb_libs = @evas_engine_directfb_libs@
-evas_engine_fb_cflags = @evas_engine_fb_cflags@
-evas_engine_fb_libs = @evas_engine_fb_libs@
-evas_engine_gl_cocoa_cflags = @evas_engine_gl_cocoa_cflags@
-evas_engine_gl_cocoa_libs = @evas_engine_gl_cocoa_libs@
-evas_engine_gl_common_libs = @evas_engine_gl_common_libs@
-evas_engine_gl_sdl_cflags = @evas_engine_gl_sdl_cflags@
-evas_engine_gl_sdl_libs = @evas_engine_gl_sdl_libs@
-evas_engine_gl_xcb_cflags = @evas_engine_gl_xcb_cflags@
-evas_engine_gl_xcb_libs = @evas_engine_gl_xcb_libs@
-evas_engine_gl_xlib_cflags = @evas_engine_gl_xlib_cflags@
-evas_engine_gl_xlib_libs = @evas_engine_gl_xlib_libs@
-evas_engine_psl1ght_cflags = @evas_engine_psl1ght_cflags@
-evas_engine_psl1ght_libs = @evas_engine_psl1ght_libs@
-evas_engine_software_16_ddraw_cflags = @evas_engine_software_16_ddraw_cflags@
-evas_engine_software_16_ddraw_libs = @evas_engine_software_16_ddraw_libs@
-evas_engine_software_16_sdl_cflags = @evas_engine_software_16_sdl_cflags@
-evas_engine_software_16_sdl_libs = @evas_engine_software_16_sdl_libs@
-evas_engine_software_16_wince_cflags = @evas_engine_software_16_wince_cflags@
-evas_engine_software_16_wince_libs = @evas_engine_software_16_wince_libs@
-evas_engine_software_16_x11_cflags = @evas_engine_software_16_x11_cflags@
-evas_engine_software_16_x11_libs = @evas_engine_software_16_x11_libs@
-evas_engine_software_8_x11_cflags = @evas_engine_software_8_x11_cflags@
-evas_engine_software_8_x11_libs = @evas_engine_software_8_x11_libs@
-evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
-evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
-evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
-evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
-evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
-evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
-evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
-evas_engine_software_xlib_libs = @evas_engine_software_xlib_libs@
-evas_engine_wayland_egl_cflags = @evas_engine_wayland_egl_cflags@
-evas_engine_wayland_egl_libs = @evas_engine_wayland_egl_libs@
-evas_engine_wayland_shm_cflags = @evas_engine_wayland_shm_cflags@
-evas_engine_wayland_shm_libs = @evas_engine_wayland_shm_libs@
-evas_image_loader_bmp_cflags = @evas_image_loader_bmp_cflags@
-evas_image_loader_bmp_libs = @evas_image_loader_bmp_libs@
-evas_image_loader_edb_cflags = @evas_image_loader_edb_cflags@
-evas_image_loader_edb_libs = @evas_image_loader_edb_libs@
-evas_image_loader_eet_cflags = @evas_image_loader_eet_cflags@
-evas_image_loader_eet_libs = @evas_image_loader_eet_libs@
-evas_image_loader_generic_cflags = @evas_image_loader_generic_cflags@
-evas_image_loader_generic_libs = @evas_image_loader_generic_libs@
-evas_image_loader_gif_cflags = @evas_image_loader_gif_cflags@
-evas_image_loader_gif_libs = @evas_image_loader_gif_libs@
-evas_image_loader_ico_cflags = @evas_image_loader_ico_cflags@
-evas_image_loader_ico_libs = @evas_image_loader_ico_libs@
-evas_image_loader_jpeg_cflags = @evas_image_loader_jpeg_cflags@
-evas_image_loader_jpeg_libs = @evas_image_loader_jpeg_libs@
-evas_image_loader_pmaps_cflags = @evas_image_loader_pmaps_cflags@
-evas_image_loader_pmaps_libs = @evas_image_loader_pmaps_libs@
-evas_image_loader_png_cflags = @evas_image_loader_png_cflags@
-evas_image_loader_png_libs = @evas_image_loader_png_libs@
-evas_image_loader_psd_cflags = @evas_image_loader_psd_cflags@
-evas_image_loader_psd_libs = @evas_image_loader_psd_libs@
-evas_image_loader_svg_cflags = @evas_image_loader_svg_cflags@
-evas_image_loader_svg_libs = @evas_image_loader_svg_libs@
-evas_image_loader_tga_cflags = @evas_image_loader_tga_cflags@
-evas_image_loader_tga_libs = @evas_image_loader_tga_libs@
-evas_image_loader_tiff_cflags = @evas_image_loader_tiff_cflags@
-evas_image_loader_tiff_libs = @evas_image_loader_tiff_libs@
-evas_image_loader_wbmp_cflags = @evas_image_loader_wbmp_cflags@
-evas_image_loader_wbmp_libs = @evas_image_loader_wbmp_libs@
-evas_image_loader_xpm_cflags = @evas_image_loader_xpm_cflags@
-evas_image_loader_xpm_libs = @evas_image_loader_xpm_libs@
-exec_prefix = @exec_prefix@
-have_evas_engine_gl_x11 = @have_evas_engine_gl_x11@
-have_evas_engine_gl_xcb = @have_evas_engine_gl_xcb@
-have_evas_engine_gl_xlib = @have_evas_engine_gl_xlib@
-have_evas_engine_software_x11 = @have_evas_engine_software_x11@
-have_evas_engine_software_xcb = @have_evas_engine_software_xcb@
-have_evas_engine_software_xlib = @have_evas_engine_software_xlib@
-have_lcov = @have_lcov@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-lt_enable_auto_import = @lt_enable_auto_import@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfig_requires_private = @pkgconfig_requires_private@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pthread_cflags = @pthread_cflags@
-pthread_libs = @pthread_libs@
-release_info = @release_info@
-requirement_evas = @requirement_evas@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-version_info = @version_info@
-MAINTAINERCLEANFILES = Makefile.in
-AM_CPPFLAGS = -I. -I$(top_srcdir)/src/lib \
-        -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/lib/cserve \
-        -DPACKAGE_BIN_DIR=\"$(bindir)\" \
-        -DPACKAGE_LIB_DIR=\"$(libdir)\" \
-        -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" @FREETYPE_CFLAGS@ \
-        @EET_CFLAGS@ @FONTCONFIG_CFLAGS@ @EVAS_CFLAGS@ @EINA_CFLAGS@ \
-        @EVIL_CFLAGS@ @PIXMAN_CFLAGS@ $(am__append_1)
-noinst_LTLIBRARIES = libevas_canvas.la
-libevas_canvas_la_SOURCES = \
-evas_callbacks.c \
-evas_clip.c \
-evas_data.c \
-evas_events.c \
-evas_filter.c \
-evas_focus.c \
-evas_key.c \
-evas_key_grab.c \
-evas_layer.c \
-evas_main.c \
-evas_name.c \
-evas_object_image.c \
-evas_object_main.c \
-evas_object_inform.c \
-evas_object_intercept.c \
-evas_object_line.c \
-evas_object_polygon.c \
-evas_object_rectangle.c \
-evas_object_smart.c \
-evas_object_smart_clipped.c \
-evas_object_box.c \
-evas_object_table.c \
-evas_object_text.c \
-evas_object_textblock.c \
-evas_object_grid.c \
-evas_font_dir.c \
-evas_rectangle.c \
-evas_render.c \
-evas_smart.c \
-evas_stack.c \
-evas_async_events.c \
-evas_stats.c \
-evas_touch_point.c \
-evas_map.c \
-evas_gl.c
-
-
-#evas_object_textgrid.c
-libevas_canvas_la_LIBADD = @EVAS_LIBS@ @EVIL_LIBS@ $(am__append_2)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-        @for dep in $?; do \
-          case '$(am__configure_deps)' in \
-            *$$dep*) \
-              ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-                && { if test -f $@; then exit 0; else break; fi; }; \
-              exit 1;; \
-          esac; \
-        done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/canvas/Makefile'; \
-        $(am__cd) $(top_srcdir) && \
-          $(AUTOMAKE) --gnu src/lib/canvas/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-        @case '$?' in \
-          *config.status*) \
-            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-          *) \
-            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-        esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-          test "$$dir" != "$$p" || dir=.; \
-          echo "rm -f \"$${dir}/so_locations\""; \
-          rm -f "$${dir}/so_locations"; \
-        done
-libevas_canvas.la: $(libevas_canvas_la_OBJECTS) $(libevas_canvas_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(LINK)  $(libevas_canvas_la_OBJECTS) $(libevas_canvas_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-        -rm -f *.$(OBJEXT)
-
-distclean-compile:
-        -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_async_events.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_callbacks.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_clip.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_data.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_events.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_filter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_focus.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_font_dir.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_gl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_key.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_key_grab.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_layer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_main.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_map.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_name.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_object_box.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_object_grid.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_object_image.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_object_inform.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_object_intercept.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_object_line.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_object_main.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_object_polygon.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_object_rectangle.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_object_smart.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_object_smart_clipped.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_object_table.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_object_text.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_object_textblock.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_rectangle.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_render.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_smart.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_stack.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_stats.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_touch_point.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@    $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@   $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-        -rm -f *.lo
-
-clean-libtool:
-        -rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        set x; \
-        here=`pwd`; \
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        shift; \
-        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          if test $$# -gt 0; then \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              "$$@" $$unique; \
-          else \
-            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-              $$unique; \
-          fi; \
-        fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-                $(TAGS_FILES) $(LISP)
-        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-        unique=`for i in $$list; do \
-            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-          done | \
-          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-              END { if (nonempty) { for (i in files) print i; }; }'`; \
-        test -z "$(CTAGS_ARGS)$$unique" \
-          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-             $$unique
-
-GTAGS:
-        here=`$(am__cd) $(top_builddir) && pwd` \
-          && $(am__cd) $(top_srcdir) \
-          && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-        list='$(DISTFILES)'; \
-          dist_files=`for file in $$list; do echo $$file; done | \
-          sed -e "s|^$$srcdirstrip/||;t" \
-              -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-        case $$dist_files in \
-          */*) $(MKDIR_P) `echo "$$dist_files" | \
-                           sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                           sort -u` ;; \
-        esac; \
-        for file in $$dist_files; do \
-          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-          if test -d $$d/$$file; then \
-            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-            if test -d "$(distdir)/$$file"; then \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-              cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-              find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-            fi; \
-            cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-          else \
-            test -f "$(distdir)/$$file" \
-            || cp -p $$d/$$file "$(distdir)/$$file" \
-            || exit 1; \
-          fi; \
-        done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-          `test -z '$(STRIP)' || \
-            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-        @echo "This command is intended for maintainers to use"
-        @echo "it deletes files that may require special tools to rebuild."
-        -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-local \
-        clean-noinstLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-        distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR)
-        -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-        mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-        clean-libtool clean-local clean-noinstLTLIBRARIES ctags \
-        distclean distclean-compile distclean-generic \
-        distclean-libtool distclean-tags distdir dvi dvi-am html \
-        html-am info info-am install install-am install-data \
-        install-data-am install-dvi install-dvi-am install-exec \
-        install-exec-am install-html install-html-am install-info \
-        install-info-am install-man install-pdf install-pdf-am \
-        install-ps install-ps-am install-strip installcheck \
-        installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-        tags uninstall uninstall-am
-
-
-clean-local:
-        rm -rf *.gcno
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/libraries/evas/src/lib/canvas/evas_async_events.c b/libraries/evas/src/lib/canvas/evas_async_events.c
deleted file mode 100644
index bd2e3a8..0000000
--- a/libraries/evas/src/lib/canvas/evas_async_events.c
+++ /dev/null
@@ -1,173 +0,0 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef BUILD_ASYNC_EVENTS
-
-# ifndef _MSC_VER
-#  include <unistd.h>
-# endif
-# include <fcntl.h>
-# include <errno.h>
-
-#endif
-
-#include "evas_common.h"
-#include "evas_private.h"
-
-#ifdef BUILD_ASYNC_EVENTS
-
-static int _fd_write = -1;
-static int _fd_read = -1;
-
-static int _init_evas_event = 0;
-
-typedef struct _Evas_Event_Async        Evas_Event_Async;
-
-struct _Evas_Event_Async
-{
-   const void               *target;
-   void                     *event_info;
-   Evas_Async_Events_Put_Cb  func;
-   Evas_Callback_Type        type;
-};
-
-int
-evas_async_events_init(void)
-{
-   int filedes[2];
-
-   _init_evas_event++;
-   if (_init_evas_event > 1) return _init_evas_event;
-
-   if (pipe(filedes) == -1)
-     {
-        _init_evas_event = 0;
-        return 0;
-     }
-
-   _fd_read = filedes[0];
-   _fd_write = filedes[1];
-
-   fcntl(_fd_read, F_SETFL, O_NONBLOCK);
-
-   return _init_evas_event;
-}
-
-int
-evas_async_events_shutdown(void)
-{
-   _init_evas_event--;
-   if (_init_evas_event > 0) return _init_evas_event;
-
-   close(_fd_read);
-   close(_fd_write);
-   _fd_read = -1;
-   _fd_write = -1;
-
-   return _init_evas_event;
-}
-
-#endif
-
-EAPI int
-evas_async_events_fd_get(void)
-{
-#ifdef BUILD_ASYNC_EVENTS
-   return _fd_read;
-#else
-   return -1;
-#endif
-}
-
-EAPI int
-evas_async_events_process(void)
-{
-#ifdef BUILD_ASYNC_EVENTS
-   Evas_Event_Async *ev;
-   int check;
-   int count = 0;
-
-   if (_fd_read == -1) return 0;
-
-   do
-     {
-        check = read(_fd_read, &ev, sizeof (Evas_Event_Async *));
-
-        if (check == sizeof (Evas_Event_Async *))
-          {
-             if (ev->func) ev->func((void *)ev->target, ev->type, ev->event_info);
-             free(ev);
-             count++;
-          }
-     }
-   while (check > 0);
-
-   evas_cache_image_wakeup();
-
-   if (check < 0)
-     {
-        switch (errno)
-          {
-           case EBADF:
-           case EINVAL:
-           case EIO:
-           case EISDIR:
-             _fd_read = -1;
-          }
-     }
-
-   return count;
-#else
-   return 0;
-#endif
-}
-
-EAPI Eina_Bool
-evas_async_events_put(const void *target, Evas_Callback_Type type, void *event_info, Evas_Async_Events_Put_Cb func)
-{
-#ifdef BUILD_ASYNC_EVENTS
-   Evas_Event_Async *ev;
-   ssize_t check;
-   Eina_Bool result = EINA_FALSE;
-
-   if (!func) return 0;
-   if (_fd_write == -1) return 0;
-
-   ev = calloc(1, sizeof (Evas_Event_Async));
-   if (!ev) return 0;
-
-   ev->func = func;
-   ev->target = target;
-   ev->type = type;
-   ev->event_info = event_info;
-
-   do
-     {
-        check = write(_fd_write, &ev, sizeof (Evas_Event_Async*));
-     }
-   while ((check != sizeof (Evas_Event_Async*)) &&
-          ((errno == EINTR) || (errno == EAGAIN)));
-
-   evas_cache_image_wakeup();
-
-   if (check == sizeof (Evas_Event_Async*))
-     result = EINA_TRUE;
-   else
-     {
-        switch (errno)
-          {
-           case EBADF:
-           case EINVAL:
-           case EIO:
-           case EPIPE:
-             _fd_write = -1;
-          }
-     }
-
-   return result;
-#else
-   func((void*) target, type, event_info);
-   return EINA_TRUE;
-#endif
-}
diff --git a/libraries/evas/src/lib/canvas/evas_callbacks.c b/libraries/evas/src/lib/canvas/evas_callbacks.c
deleted file mode 100644
index 47cfb0c..0000000
--- a/libraries/evas/src/lib/canvas/evas_callbacks.c
+++ /dev/null
@@ -1,543 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-
-static void evas_object_event_callback_clear(Evas_Object *obj);
-static void evas_event_callback_clear(Evas *e);
-int _evas_event_counter = 0;
-
-EVAS_MEMPOOL(_mp_fn);
-EVAS_MEMPOOL(_mp_cb);
-EVAS_MEMPOOL(_mp_pc);
-
-void
-_evas_post_event_callback_call(Evas *e)
-{
-   Evas_Post_Callback *pc;
-   int skip = 0;
-
-   if (e->delete_me) return;
-   _evas_walk(e);
-   EINA_LIST_FREE(e->post_events, pc)
-     {
-        if ((!skip) && (!e->delete_me) && (!pc->delete_me))
-          {
-             if (!pc->func((void*)pc->data, e)) skip = 1;
-          }
-        EVAS_MEMPOOL_FREE(_mp_pc, pc);
-     }
-   _evas_unwalk(e);
-}
-
-void
-_evas_post_event_callback_free(Evas *e)
-{
-   Evas_Post_Callback *pc;
-
-   EINA_LIST_FREE(e->post_events, pc)
-     {
-        EVAS_MEMPOOL_FREE(_mp_pc, pc);
-     }
-   _evas_unwalk(e);
-}
-
-void
-evas_event_callback_list_post_free(Eina_Inlist **list)
-{
-   Eina_Inlist *l;
-
-   /* MEM OK */
-   for (l = *list; l;)
-     {
-        Evas_Func_Node *fn;
-
-        fn = (Evas_Func_Node *)l;
-        l = l->next;
-        if (fn->delete_me)
-          {
-             *list = eina_inlist_remove(*list, EINA_INLIST_GET(fn));
-             EVAS_MEMPOOL_FREE(_mp_fn, fn);
-          }
-     }
-}
-
-static void
-evas_object_event_callback_clear(Evas_Object *obj)
-{
-   if (!obj->callbacks) return;
-   if (!obj->callbacks->deletions_waiting) return;
-   obj->callbacks->deletions_waiting = 0;
-   evas_event_callback_list_post_free(&obj->callbacks->callbacks);
-   if (!obj->callbacks->callbacks)
-     {
-        EVAS_MEMPOOL_FREE(_mp_cb, obj->callbacks);
-        obj->callbacks = NULL;
-     }
-}
-
-static void
-evas_event_callback_clear(Evas *e)
-{
-   if (!e->callbacks) return;
-   if (!e->callbacks->deletions_waiting) return;
-   e->callbacks->deletions_waiting = 0;
-   evas_event_callback_list_post_free(&e->callbacks->callbacks);
-   if (!e->callbacks->callbacks)
-     {
-        EVAS_MEMPOOL_FREE(_mp_cb, e->callbacks);
-        e->callbacks = NULL;
-     }
-}
-
-void
-evas_object_event_callback_all_del(Evas_Object *obj)
-{
-   Evas_Func_Node *fn;
-
-   if (!obj->callbacks) return;
-   EINA_INLIST_FOREACH(obj->callbacks->callbacks, fn)
-      fn->delete_me = 1;
-}
-
-void
-evas_object_event_callback_cleanup(Evas_Object *obj)
-{
-   /* MEM OK */
-   if (!obj->callbacks) return;
-   evas_event_callback_list_post_free(&obj->callbacks->callbacks);
-   EVAS_MEMPOOL_FREE(_mp_cb, obj->callbacks);
-   obj->callbacks = NULL;
-}
-
-void
-evas_event_callback_all_del(Evas *e)
-{
-   Evas_Func_Node *fn;
-
-   if (!e->callbacks) return;
-   EINA_INLIST_FOREACH(e->callbacks->callbacks, fn)
-      fn->delete_me = 1;
-}
-
-void
-evas_event_callback_cleanup(Evas *e)
-{
-   /* MEM OK */
-   if (!e->callbacks) return;
-   evas_event_callback_list_post_free(&e->callbacks->callbacks);
-   EVAS_MEMPOOL_FREE(_mp_cb, e->callbacks);
-   e->callbacks = NULL;
-}
-
-void
-evas_event_callback_call(Evas *e, Evas_Callback_Type type, void *event_info)
-{
-   Eina_Inlist **l_mod = NULL, *l;
-
-   _evas_walk(e);
-   if (e->callbacks)
-     {
-        l_mod = &e->callbacks->callbacks;
-        e->callbacks->walking_list++;
-        for (l = *l_mod; l; l = l->next)
-          {
-             Evas_Func_Node *fn;
-
-             fn = (Evas_Func_Node *)l;
-             if ((fn->type == type) && (!fn->delete_me))
-               {
-                  Evas_Event_Cb func = fn->func;
-                  if (func)
-                    func(fn->data, e, event_info);
-               }
-             if (e->delete_me) break;
-          }
-        e->callbacks->walking_list--;
-        if (!e->callbacks->walking_list)
-          {
-             evas_event_callback_clear(e);
-             l_mod = NULL;
-          }
-     }
-   _evas_unwalk(e);
-}
-
-void
-evas_object_event_callback_call(Evas_Object *obj, Evas_Callback_Type type, void *event_info, int event_id)
-{
-   /* MEM OK */
-   Eina_Inlist **l_mod = NULL, *l;
-   Evas_Button_Flags flags = EVAS_BUTTON_NONE;
-   Evas *e;
-
-   if ((obj->delete_me) || (!obj->layer)) return;
-   if ((obj->last_event == event_id) &&
-       (obj->last_event_type == type)) return;
-   if (obj->last_event > event_id)
-     {
-        if ((obj->last_event_type == EVAS_CALLBACK_MOUSE_OUT) &&
-            ((type >= EVAS_CALLBACK_MOUSE_DOWN) &&
-             (type <= EVAS_CALLBACK_MULTI_MOVE)))
-          {
-             return;
-          }
-     }
-   obj->last_event = event_id;
-   obj->last_event_type = type;
-   if (!(e = obj->layer->evas)) return;
-
-   _evas_walk(e);
-   if (obj->callbacks)
-     {
-        l_mod = &obj->callbacks->callbacks;
-        switch (type)
-          {
-           case EVAS_CALLBACK_MOUSE_DOWN:
-                {
-                   Evas_Event_Mouse_Down *ev = event_info;
-
-                   flags = ev->flags;
-                   if (ev->flags & (EVAS_BUTTON_DOUBLE_CLICK | EVAS_BUTTON_TRIPLE_CLICK))
-                     {
-                        if (obj->last_mouse_down_counter < (e->last_mouse_down_counter - 1))
-                          ev->flags &= ~(EVAS_BUTTON_DOUBLE_CLICK | EVAS_BUTTON_TRIPLE_CLICK);
-                     }
-                   obj->last_mouse_down_counter = e->last_mouse_down_counter;
-                   break;
-                }
-           case EVAS_CALLBACK_MOUSE_UP:
-                {
-                   Evas_Event_Mouse_Up *ev = event_info;
-
-                   flags = ev->flags;
-                   if (ev->flags & (EVAS_BUTTON_DOUBLE_CLICK | EVAS_BUTTON_TRIPLE_CLICK))
-                     {
-                        if (obj->last_mouse_up_counter < (e->last_mouse_up_counter - 1))
-                          ev->flags &= ~(EVAS_BUTTON_DOUBLE_CLICK | EVAS_BUTTON_TRIPLE_CLICK);
-                     }
-                   obj->last_mouse_up_counter = e->last_mouse_up_counter;
-                   break;
-                }
-           default:
-              break;
-          }
-        obj->callbacks->walking_list++;
-        for (l = *l_mod; l; l = l->next)
-          {
-             Evas_Func_Node *fn;
-
-             fn = (Evas_Func_Node *)l;
-             if ((fn->type == type) && (!fn->delete_me))
-               {
-                  Evas_Object_Event_Cb func = fn->func;
-                  if (func)
-                    func(fn->data, obj->layer->evas, obj, event_info);
-               }
-             if (obj->delete_me) break;
-          }
-        obj->callbacks->walking_list--;
-        if (!obj->callbacks->walking_list)
-          {
-             evas_object_event_callback_clear(obj);
-             l_mod = NULL;
-          }
-
-        if (type == EVAS_CALLBACK_MOUSE_DOWN)
-          {
-             Evas_Event_Mouse_Down *ev = event_info;
-             ev->flags = flags;
-          }
-        else if (type == EVAS_CALLBACK_MOUSE_UP)
-          {
-             Evas_Event_Mouse_Up *ev = event_info;
-             ev->flags = flags;
-          }
-     }
-
-   if (!((obj->no_propagate) && (l_mod) && (*l_mod)))
-     {
-        if (!obj->no_propagate)
-          {
-             if ((obj->smart.parent) && (type != EVAS_CALLBACK_FREE) &&
-                 (type <= EVAS_CALLBACK_KEY_UP))
-               evas_object_event_callback_call(obj->smart.parent, type, event_info, event_id);
-          }
-     }
-   _evas_unwalk(e);
-}
-
-static int
-_callback_priority_cmp(const void *_a, const void *_b)
-{
-   const Evas_Func_Node *a, *b;
-   a = EINA_INLIST_CONTAINER_GET(_a, Evas_Func_Node);
-   b = EINA_INLIST_CONTAINER_GET(_b, Evas_Func_Node);
-   if (a->priority < b->priority)
-     return -1;
-   else
-     return 1;
-}
-
-EAPI void
-evas_object_event_callback_add(Evas_Object *obj, Evas_Callback_Type type, Evas_Object_Event_Cb func, const void *data)
-{
-   evas_object_event_callback_priority_add(obj, type,
-                                           EVAS_CALLBACK_PRIORITY_DEFAULT, func, data);
-}
-
-EAPI void
-evas_object_event_callback_priority_add(Evas_Object *obj, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Object_Event_Cb func, const void *data)
-{
-   /* MEM OK */
-   Evas_Func_Node *fn;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-
-   if (!func) return;
-
-   if (!obj->callbacks)
-     {
-        EVAS_MEMPOOL_INIT(_mp_cb, "evas_callbacks", Evas_Callbacks, 512, );
-        obj->callbacks = EVAS_MEMPOOL_ALLOC(_mp_cb, Evas_Callbacks);
-        if (!obj->callbacks) return;
-        EVAS_MEMPOOL_PREP(_mp_cb, obj->callbacks, Evas_Callbacks);
-     }
-
-   EVAS_MEMPOOL_INIT(_mp_fn, "evas_func_node", Evas_Func_Node, 2048, );
-   fn = EVAS_MEMPOOL_ALLOC(_mp_fn, Evas_Func_Node);
-   if (!fn) return;
-   EVAS_MEMPOOL_PREP(_mp_fn, fn, Evas_Func_Node);
-   fn->func = func;
-   fn->data = (void *)data;
-   fn->type = type;
-   fn->priority = priority;
-
-   obj->callbacks->callbacks =
-      eina_inlist_sorted_insert(obj->callbacks->callbacks, EINA_INLIST_GET(fn),
-                                _callback_priority_cmp);
-}
-
-EAPI void *
-evas_object_event_callback_del(Evas_Object *obj, Evas_Callback_Type type, Evas_Object_Event_Cb func)
-{
-   /* MEM OK */
-   Evas_Func_Node *fn;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-
-   if (!func) return NULL;
-
-   if (!obj->callbacks) return NULL;
-
-   EINA_INLIST_FOREACH(obj->callbacks->callbacks, fn)
-     {
-        if ((fn->func == func) && (fn->type == type) && (!fn->delete_me))
-          {
-             void *tmp;
-
-             tmp = fn->data;
-             fn->delete_me = 1;
-             obj->callbacks->deletions_waiting = 1;
-             if (!obj->callbacks->walking_list)
-               evas_object_event_callback_clear(obj);
-             return tmp;
-          }
-     }
-   return NULL;
-}
-
-EAPI void *
-evas_object_event_callback_del_full(Evas_Object *obj, Evas_Callback_Type type, Evas_Object_Event_Cb func, const void *data)
-{
-   /* MEM OK */
-   Evas_Func_Node *fn;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-
-   if (!func) return NULL;
-
-   if (!obj->callbacks) return NULL;
-
-   EINA_INLIST_FOREACH(obj->callbacks->callbacks, fn)
-     {
-        if ((fn->func == func) && (fn->type == type) && (fn->data == data) && (!fn->delete_me))
-          {
-             void *tmp;
-
-             tmp = fn->data;
-             fn->delete_me = 1;
-             obj->callbacks->deletions_waiting = 1;
-             if (!obj->callbacks->walking_list)
-               evas_object_event_callback_clear(obj);
-             return tmp;
-          }
-     }
-   return NULL;
-}
-
-EAPI void
-evas_event_callback_add(Evas *e, Evas_Callback_Type type, Evas_Event_Cb func, const void *data)
-{
-   evas_event_callback_priority_add(e, type, EVAS_CALLBACK_PRIORITY_DEFAULT,
-                                    func, data);
-}
-
-EAPI void
-evas_event_callback_priority_add(Evas *e, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Event_Cb func, const void *data)
-{
-   /* MEM OK */
-   Evas_Func_Node *fn;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   if (!func) return;
-
-   if (!e->callbacks)
-     {
-        EVAS_MEMPOOL_INIT(_mp_cb, "evas_callbacks", Evas_Callbacks, 512, );
-        e->callbacks = EVAS_MEMPOOL_ALLOC(_mp_cb, Evas_Callbacks);
-        if (!e->callbacks) return;
-        EVAS_MEMPOOL_PREP(_mp_cb, e->callbacks, Evas_Callbacks);
-     }
-
-   EVAS_MEMPOOL_INIT(_mp_fn, "evas_func_node", Evas_Func_Node, 2048, );
-   fn = EVAS_MEMPOOL_ALLOC(_mp_fn, Evas_Func_Node);
-   if (!fn) return;
-   EVAS_MEMPOOL_PREP(_mp_fn, fn, Evas_Func_Node);
-   fn->func = func;
-   fn->data = (void *)data;
-   fn->type = type;
-   fn->priority = priority;
-
-   e->callbacks->callbacks = eina_inlist_sorted_insert(e->callbacks->callbacks,
-                                                       EINA_INLIST_GET(fn), _callback_priority_cmp);
-}
-
-EAPI void *
-evas_event_callback_del(Evas *e, Evas_Callback_Type type, Evas_Event_Cb func)
-{
-   /* MEM OK */
-   Evas_Func_Node *fn;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return NULL;
-   MAGIC_CHECK_END();
-
-   if (!func) return NULL;
-
-   if (!e->callbacks) return NULL;
-
-   EINA_INLIST_FOREACH(e->callbacks->callbacks, fn)
-     {
-        if ((fn->func == func) && (fn->type == type) && (!fn->delete_me))
-          {
-             void *data;
-
-             data = fn->data;
-             fn->delete_me = 1;
-             e->callbacks->deletions_waiting = 1;
-             if (!e->callbacks->walking_list)
-               evas_event_callback_clear(e);
-             return data;
-          }
-     }
-   return NULL;
-}
-
-EAPI void *
-evas_event_callback_del_full(Evas *e, Evas_Callback_Type type, Evas_Event_Cb func, const void *data)
-{
-   /* MEM OK */
-   Evas_Func_Node *fn;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return NULL;
-   MAGIC_CHECK_END();
-
-   if (!func) return NULL;
-
-   if (!e->callbacks) return NULL;
-
-   EINA_INLIST_FOREACH(e->callbacks->callbacks, fn)
-     {
-        if ((fn->func == func) && (fn->type == type) && (fn->data == data) && (!fn->delete_me))
-          {
-             void *tmp;
-
-             tmp = fn->data;
-             fn->delete_me = 1;
-             e->callbacks->deletions_waiting = 1;
-             if (!e->callbacks->walking_list)
-               evas_event_callback_clear(e);
-             return tmp;
-          }
-     }
-   return NULL;
-}
-
-EAPI void
-evas_post_event_callback_push(Evas *e, Evas_Object_Event_Post_Cb func, const void *data)
-{
-   Evas_Post_Callback *pc;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   EVAS_MEMPOOL_INIT(_mp_pc, "evas_post_callback", Evas_Post_Callback, 64, );
-   pc = EVAS_MEMPOOL_ALLOC(_mp_pc, Evas_Post_Callback);
-   if (!pc) return;
-   EVAS_MEMPOOL_PREP(_mp_pc, pc, Evas_Post_Callback);
-   if (e->delete_me) return;
-
-   pc->func = func;
-   pc->data = data;
-   e->post_events = eina_list_prepend(e->post_events, pc);
-}
-
-EAPI void
-evas_post_event_callback_remove(Evas *e, Evas_Object_Event_Post_Cb func)
-{
-   Evas_Post_Callback *pc;
-   Eina_List *l;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   EINA_LIST_FOREACH(e->post_events, l, pc)
-     {
-        if (pc->func == func)
-          {
-             pc->delete_me = 1;
-             return;
-          }
-     }
-}
-
-EAPI void
-evas_post_event_callback_remove_full(Evas *e, Evas_Object_Event_Post_Cb func, const void *data)
-{
-   Evas_Post_Callback *pc;
-   Eina_List *l;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   EINA_LIST_FOREACH(e->post_events, l, pc)
-     {
-        if ((pc->func == func) && (pc->data == data))
-          {
-             pc->delete_me = 1;
-             return;
-          }
-     }
-}
diff --git a/libraries/evas/src/lib/canvas/evas_clip.c b/libraries/evas/src/lib/canvas/evas_clip.c
deleted file mode 100644
index 1ae2f73..0000000
--- a/libraries/evas/src/lib/canvas/evas_clip.c
+++ /dev/null
@@ -1,321 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-
-void
-evas_object_clip_dirty(Evas_Object *obj)
-{
-   Eina_List *l;
-   Evas_Object *data;
-
-   if (obj->cur.cache.clip.dirty) return ;
-
-   obj->cur.cache.clip.dirty = 1;
-   EINA_LIST_FOREACH(obj->clip.clipees, l, data)
-     evas_object_clip_dirty(data);
-}
-
-void
-evas_object_recalc_clippees(Evas_Object *obj)
-{
-   Eina_List *l;
-   Evas_Object *data;
-
-   if (obj->cur.cache.clip.dirty)
-     {
-        evas_object_clip_recalc(obj);
-        EINA_LIST_FOREACH(obj->clip.clipees, l, data)
-          evas_object_recalc_clippees(data);
-     }
-}
-
-int
-evas_object_clippers_was_visible(Evas_Object *obj)
-{
-   if (obj->prev.visible)
-     {
-        if (obj->prev.clipper)
-          return evas_object_clippers_is_visible(obj->prev.clipper);
-        return 1;
-     }
-   return 0;
-}
-
-/* aaaaargh (pirate voice) ... notes!
- * 
- * we have a big problem until now that's gone undetected... until yesterday.
- * that problem involves clips and maps and smart objects. hooray! 3 of the
- * more complex bits of evas - and maps and smart objects  being one of the
- * nastiest ones.
- * 
- * what is the problem? when a clip crosses a map boundary. that is to say
- * that when the clipper and clippee are not within the child tree of the
- * mapped object. in this case "bad stuff" happens. basically as clips are
- * then used to render objects, but they no longer apply as you'd expect as
- * the map transfomr the objects to-be-clipped separately from the objects
- * that clip them and this whole relationship is broken by maps. it somehow
- * managed to not break with the advent of smart objects. lucky me... but
- * maps killed it. now... what do we do? that is a good question. detect
- * such a broken link and "turn off clipping" in that event - sure. but this
- * isn't going to be cheap as ANY addition or deletion of a map to an object
- * or any change in clipper of an object or any change in smart object
- * membership needs to walk the obj tree both up and down from the changed
- * object and probably walk entire object trees to find these and mark them.
- * thats silly-expensive and i was about to fix it that way but it has since
- * dawned on me that that is just going to kill performance in some critical
- * areas like during object setup and manipulation, as well as teardown.
- * 
- * aaaaagh! best for now is to document this as a "don't do it damnit!" thing
- * and have the apps avoid it. but even then - how to do this? this is not
- * easy. everywhere i turn so far i come up to either expensive operations,
- * breaks in logic, or nasty re-work of apps or4 the whole concept of clipping,
- * smart objects and maps... and that will have to wait for evas 2.0
- * 
- * the below does clip fixups etc. in the even a clip spans a map boundary.
- * not pretty, but necessary.
- */
-
-#define MAP_ACROSS 1
-static void
-evas_object_child_map_across_mark(Evas_Object *obj, Evas_Object *map_obj, Eina_Bool force)
-{
-#ifdef MAP_ACROSS
-   if ((obj->cur.map_parent != map_obj) || force)
-     {
-        obj->cur.map_parent = map_obj;
-        obj->cur.cache.clip.dirty = 1;
-        evas_object_clip_recalc(obj);
-        if (obj->smart.smart)
-          {
-             Evas_Object *obj2;
-             
-             EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(obj), obj2)
-               {
-                  // if obj has its own map - skip it. already done
-                  if ((obj2->cur.map) && (obj2->cur.usemap)) continue;
-                  evas_object_child_map_across_mark(obj2, map_obj, force);
-               }
-          }
-        else if (obj->clip.clipees)
-          {
-             Eina_List *l;
-             Evas_Object *obj2;
-             
-             EINA_LIST_FOREACH(obj->clip.clipees, l, obj2)
-                evas_object_child_map_across_mark(obj2, map_obj, force);
-          }
-     }
-#endif   
-}
-
-void
-evas_object_clip_across_check(Evas_Object *obj)
-{
-#ifdef MAP_ACROSS
-   if (!obj->cur.clipper) return;
-   if (obj->cur.clipper->cur.map_parent != obj->cur.map_parent)
-      evas_object_child_map_across_mark(obj, obj->cur.map_parent, 1);
-#endif   
-}
-
-void
-evas_object_clip_across_clippees_check(Evas_Object *obj)
-{
-#ifdef MAP_ACROSS
-   Eina_List *l;
-   Evas_Object *obj2;
-
-   if (!obj->clip.clipees) return;
-// schloooooooooooow:
-//   evas_object_child_map_across_mark(obj, obj->cur.map_parent, 1);
-// buggy:
-   evas_object_child_map_across_mark(obj, obj->cur.map_parent, 0);
-   if (obj->cur.cache.clip.dirty)
-     {
-        EINA_LIST_FOREACH(obj->clip.clipees, l, obj2)
-           evas_object_clip_across_clippees_check(obj2);
-     }
-#endif   
-}
-
-// this function is called on an object when map is enabled or disabled on it
-// thus creating a "map boundary" at that point.
-// 
-// FIXME: flip2 test broken in elm - might be show/hide of clips
-void
-evas_object_mapped_clip_across_mark(Evas_Object *obj)
-{
-#ifdef MAP_ACROSS
-   if ((obj->cur.map) && (obj->cur.usemap))
-      evas_object_child_map_across_mark(obj, obj, 0);
-   else
-     {
-        if (obj->smart.parent)
-           evas_object_child_map_across_mark
-           (obj, obj->smart.parent->cur.map_parent, 0);
-        else
-           evas_object_child_map_across_mark(obj, NULL, 0);
-    }
-#endif
-}
-
-/* public functions */
-extern const char *o_rect_type;
-
-EAPI void
-evas_object_clip_set(Evas_Object *obj, Evas_Object *clip)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (!clip)
-     {
-        evas_object_clip_unset(obj);
-        return;
-     }
-   MAGIC_CHECK(clip, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (obj->cur.clipper == clip) return;
-   if (obj == clip) return;
-   if (evas_object_intercept_call_clip_set(obj, clip)) return;
-   // illegal to set anything but a rect as a clip
-   if (clip->type != o_rect_type)
-     {
-        ERR("For now a clip on other object than a rectangle is disabled");
-        return;
-     }
-   if (obj->smart.smart)
-     {
-       if (obj->smart.smart->smart_class->clip_set)
-          obj->smart.smart->smart_class->clip_set(obj, clip);
-     }
-   if (obj->cur.clipper)
-     {
-        /* unclip */
-        obj->cur.clipper->clip.clipees = eina_list_remove(obj->cur.clipper->clip.clipees, obj);
-        if (!obj->cur.clipper->clip.clipees)
-          {
-             obj->cur.clipper->cur.have_clipees = 0;
-             if (obj->cur.clipper->cur.visible)
-               evas_damage_rectangle_add(obj->cur.clipper->layer->evas,
-                                         obj->cur.clipper->cur.geometry.x,
-                                         obj->cur.clipper->cur.geometry.y,
-                                         obj->cur.clipper->cur.geometry.w,
-                                         obj->cur.clipper->cur.geometry.h);
-          }
-        evas_object_change(obj->cur.clipper);
-        evas_object_change(obj);
-        obj->cur.clipper = NULL;
-     }
-   /* clip me */
-   if ((!clip->clip.clipees) && (clip->cur.visible))
-     {
-        /* Basically it just went invisible */
-        clip->changed = 1;
-        clip->layer->evas->changed = 1;
-        evas_damage_rectangle_add(clip->layer->evas,
-                                  clip->cur.geometry.x, clip->cur.geometry.y,
-                                  clip->cur.geometry.w, clip->cur.geometry.h);
-     }
-   obj->cur.clipper = clip;
-   clip->clip.clipees = eina_list_append(clip->clip.clipees, obj);
-   if (clip->clip.clipees) clip->cur.have_clipees = 1;
-
-   /* If it's NOT a rectangle set the mask bits too */
-   /* FIXME: Optmz ths chck */
-   if (strcmp(evas_object_type_get(clip),"rectangle") == 0)
-      obj->cur.mask = NULL;
-   else
-     {
-        void *engdata;
-        obj->cur.mask = clip;
-        engdata = clip->func->engine_data_get(clip);
-        /* FIXME: Images only */
-        clip->layer->evas->engine.func->image_mask_create(
-                                      clip->layer->evas->engine.data.output,
-                                      engdata);
-     }
-   evas_object_change(clip);
-   evas_object_change(obj);
-   evas_object_clip_dirty(obj);
-   evas_object_recalc_clippees(obj);
-   if ((!obj->smart.smart) && 
-       (!((obj->cur.map) && (obj->cur.usemap))))
-     {
-        if (evas_object_is_in_output_rect(obj,
-                                          obj->layer->evas->pointer.x,
-                                          obj->layer->evas->pointer.y, 1, 1))
-          evas_event_feed_mouse_move(obj->layer->evas,
-                                     obj->layer->evas->pointer.x,
-                                     obj->layer->evas->pointer.y,
-                                     obj->layer->evas->last_timestamp,
-                                     NULL);
-     }
-   evas_object_clip_across_check(obj);
-}
-
-EAPI Evas_Object *
-evas_object_clip_get(const Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   return obj->cur.clipper;
-}
-
-EAPI void
-evas_object_clip_unset(Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (!obj->cur.clipper) return;
-   /* unclip */
-   if (evas_object_intercept_call_clip_unset(obj)) return;
-   if (obj->smart.smart)
-     {
-       if (obj->smart.smart->smart_class->clip_unset)
-          obj->smart.smart->smart_class->clip_unset(obj);
-     }
-   if (obj->cur.clipper)
-     {
-        obj->cur.clipper->clip.clipees = eina_list_remove(obj->cur.clipper->clip.clipees, obj);
-        if (!obj->cur.clipper->clip.clipees)
-          {
-             obj->cur.clipper->cur.have_clipees = 0;
-             if (obj->cur.clipper->cur.visible)
-               evas_damage_rectangle_add(obj->cur.clipper->layer->evas,
-                                         obj->cur.clipper->cur.geometry.x,
-                                         obj->cur.clipper->cur.geometry.y,
-                                         obj->cur.clipper->cur.geometry.w,
-                                         obj->cur.clipper->cur.geometry.h);
-          }
-        evas_object_change(obj->cur.clipper);
-     }
-   obj->cur.clipper = NULL;
-   evas_object_change(obj);
-   evas_object_clip_dirty(obj);
-   evas_object_recalc_clippees(obj);
-   if ((!obj->smart.smart) && 
-       (!((obj->cur.map) && (obj->cur.usemap))))
-     {
-        if (evas_object_is_in_output_rect(obj,
-                                          obj->layer->evas->pointer.x,
-                                          obj->layer->evas->pointer.y, 1, 1))
-          evas_event_feed_mouse_move(obj->layer->evas,
-                                     obj->layer->evas->pointer.x,
-                                     obj->layer->evas->pointer.y,
-                                     obj->layer->evas->last_timestamp,
-                                     NULL);
-     }
-   evas_object_clip_across_check(obj);
-}
-
-EAPI const Eina_List *
-evas_object_clipees_get(const Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   return obj->clip.clipees;
-}
diff --git a/libraries/evas/src/lib/canvas/evas_data.c b/libraries/evas/src/lib/canvas/evas_data.c
deleted file mode 100644
index 3ac9d63..0000000
--- a/libraries/evas/src/lib/canvas/evas_data.c
+++ /dev/null
@@ -1,72 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-
-
-EAPI void
-evas_object_data_set(Evas_Object *obj, const char *key, const void *data)
-{
-   Evas_Data_Node *node;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (!key) return;
-
-   evas_object_data_del(obj, key);
-   if (!data) return;
-   node = malloc(sizeof(Evas_Data_Node) + strlen(key) + 1);
-   node->key = (char *)node + sizeof(Evas_Data_Node);
-   strcpy(node->key, key);
-   node->data = (void *)data;
-   obj->data.elements = eina_list_prepend(obj->data.elements, node);
-}
-
-EAPI void *
-evas_object_data_get(const Evas_Object *obj, const char *key)
-{
-   Eina_List *l;
-   Evas_Data_Node *node;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   if (!key) return NULL;
-
-   EINA_LIST_FOREACH(obj->data.elements, l, node)
-     {
-        if (!strcmp(node->key, key))
-          {
-             Eina_List *lst;
-             lst = obj->data.elements;
-             lst = eina_list_promote_list(lst, l);
-             ((Evas_Object *)obj)->data.elements = lst;
-             return node->data;
-          }
-     }
-   return NULL;
-}
-
-EAPI void *
-evas_object_data_del(Evas_Object *obj, const char *key)
-{
-   Eina_List *l;
-   Evas_Data_Node *node;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   if (!key) return NULL;
-   EINA_LIST_FOREACH(obj->data.elements, l, node)
-     {
-        if (!strcmp(node->key, key))
-          {
-             void *data;
-
-             data = node->data;
-             obj->data.elements = eina_list_remove_list(obj->data.elements, l);
-             free(node);
-             return data;
-          }
-     }
-   return NULL;
-}
diff --git a/libraries/evas/src/lib/canvas/evas_events.c b/libraries/evas/src/lib/canvas/evas_events.c
deleted file mode 100644
index 1ee8388..0000000
--- a/libraries/evas/src/lib/canvas/evas_events.c
+++ /dev/null
@@ -1,1867 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-
-static Eina_List *
-_evas_event_object_list_in_get(Evas *e, Eina_List *in,
-                               const Eina_Inlist *list, Evas_Object *stop,
-                               int x, int y, int *no_rep);
-
-static void
-_evas_event_havemap_adjust(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Eina_Bool mouse_grabbed)
-{
-   if (obj->smart.parent)
-      _evas_event_havemap_adjust(obj->smart.parent, x, y, mouse_grabbed);
-
-   if ((!obj->cur.usemap) || (!obj->cur.map) || (!obj->cur.map->count == 4))
-      return;
-
-   evas_map_coords_get(obj->cur.map, *x, *y, x, y, mouse_grabbed);
-   *x += obj->cur.geometry.x;
-   *y += obj->cur.geometry.y;
-}
-
-static Eina_List *
-_evas_event_object_list_raw_in_get(Evas *e, Eina_List *in,
-                                   const Eina_Inlist *list, Evas_Object *stop,
-                                   int x, int y, int *no_rep)
-{
-   Evas_Object *obj;
-   int inside;
-
-   if (!list) return in;
-   for (obj = _EINA_INLIST_CONTAINER(obj, list); 
-        obj; 
-        obj = _EINA_INLIST_CONTAINER(obj, EINA_INLIST_GET(obj)->prev))
-     {
-        if (obj == stop)
-          {
-             *no_rep = 1;
-             return in;
-          }
-        if (evas_event_passes_through(obj)) continue;
-        if ((obj->cur.visible) && (obj->delete_me == 0) &&
-            (!obj->clip.clipees) &&
-            (evas_object_clippers_is_visible(obj)))
-          {
-             if (obj->smart.smart)
-               {
-                  int norep = 0;
-
-                  if ((obj->cur.usemap) && (obj->cur.map) &&
-                      (obj->cur.map->count == 4))
-                    {
-                       inside = evas_object_is_in_output_rect(obj, x, y, 1, 1);
-                       if (inside)
-                         {
-                            if (!evas_map_coords_get(obj->cur.map, x, y,
-                                                     &(obj->cur.map->mx),
-                                                     &(obj->cur.map->my), 0))
-                              {
-                                 inside = 0;
-                              }
-                            else
-                              {
-                                 in = _evas_event_object_list_in_get
-                                    (e, in,
-                                     evas_object_smart_members_get_direct(obj),
-                                     stop,
-                                     obj->cur.geometry.x + obj->cur.map->mx,
-                                     obj->cur.geometry.y + obj->cur.map->my,
-                                     &norep);
-                              }
-                         }
-                    }
-                  else
-                    {
-                       in = _evas_event_object_list_in_get
-                          (e, in, evas_object_smart_members_get_direct(obj),
-                           stop, x, y, &norep);
-                    }
-                  if (norep)
-                    {
-                       if (!obj->repeat_events)
-                         {
-                            *no_rep = 1;
-                            return in;
-                         }
-                    }
-               }
-             else
-               {
-                  inside = evas_object_is_in_output_rect(obj, x, y, 1, 1);
-
-                  if ((obj->cur.usemap) && (obj->cur.map) &&
-                      (obj->cur.map->count == 4))
-                    {
-                       if ((inside) &&
-                           (!evas_map_coords_get(obj->cur.map, x, y,
-                                                 &(obj->cur.map->mx),
-                                                 &(obj->cur.map->my), 0)))
-                         {
-                            inside = 0;
-                         }
-                    }
-
-                  if (inside && ((!obj->precise_is_inside) ||
-                                 (evas_object_is_inside(obj, x, y))))
-                    {
-                       if (!evas_event_freezes_through(obj))
-                         in = eina_list_append(in, obj);
-                       if (!obj->repeat_events)
-                         {
-                            *no_rep = 1;
-                            return in;
-                         }
-                    }
-               }
-          }
-     }
-   *no_rep = 0;
-   return in;
-}
-
-static Eina_List *
-_evas_event_object_list_in_get(Evas *e, Eina_List *in,
-                               const Eina_Inlist *list, Evas_Object *stop,
-                               int x, int y, int *no_rep)
-{
-   if (!list) return NULL;
-   return _evas_event_object_list_raw_in_get(e, in, list->last, stop,
-                                             x, y, no_rep);
-}
-
-Eina_List *
-evas_event_objects_event_list(Evas *e, Evas_Object *stop, int x, int y)
-{
-   Evas_Layer *lay;
-   Eina_List *in = NULL;
-
-   if ((!e->layers) || (e->events_frozen > 0)) return NULL;
-   EINA_INLIST_REVERSE_FOREACH((EINA_INLIST_GET(e->layers)), lay)
-     {
-        int norep = 0;
-        in = _evas_event_object_list_in_get(e, in,
-                                            EINA_INLIST_GET(lay->objects),
-                                            stop, x, y, &norep);
-        if (norep) return in;
-     }
-   return in;
-}
-
-static Eina_List *
-evas_event_list_copy(Eina_List *list)
-{
-   Eina_List *l, *new_l = NULL;
-   const void *data;
-
-   EINA_LIST_FOREACH(list, l, data)
-     new_l = eina_list_append(new_l, data);
-   return new_l;
-}
-/* public functions */
-
-EAPI void
-evas_event_default_flags_set(Evas *e, Evas_Event_Flags flags)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-   e->default_event_flags = flags;
-}
-
-EAPI Evas_Event_Flags
-evas_event_default_flags_get(const Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return EVAS_EVENT_FLAG_ON_HOLD;
-   MAGIC_CHECK_END();
-   return e->default_event_flags;
-}
-
-EAPI void
-evas_event_freeze(Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-   e->events_frozen++;
-}
-
-EAPI void
-evas_event_thaw(Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-   e->events_frozen--;
-   if (e->events_frozen == 0)
-     {
-        Evas_Layer *lay;
-
-        EINA_INLIST_FOREACH((EINA_INLIST_GET(e->layers)), lay)
-          {
-             Evas_Object *obj;
-
-             EINA_INLIST_FOREACH(lay->objects, obj)
-               {
-                  evas_object_clip_recalc(obj);
-                  evas_object_recalc_clippees(obj);
-               }
-          }
-     }
-   if (e->events_frozen < 0)
-     evas_debug_generic("  Thaw of events when already thawed!!!\n");
-}
-
-EAPI int
-evas_event_freeze_get(const Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return 0;
-   MAGIC_CHECK_END();
-   return e->events_frozen;
-}
-
-EAPI void
-evas_event_thaw_eval(Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-   if (e->events_frozen != 0) return;
-
-   evas_event_feed_mouse_move(e, e->pointer.x, e->pointer.y,
-                              e->last_timestamp, NULL);
-}
-
-EAPI void
-evas_event_feed_mouse_down(Evas *e, int b, Evas_Button_Flags flags, unsigned int timestamp, const void *data)
-{
-   Eina_List *l, *copy;
-   Evas_Event_Mouse_Down ev;
-   Evas_Object *obj;
-   int addgrab = 0;
-   int event_id = 0;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   if ((b < 1) || (b > 32)) return;
-
-   e->pointer.button |= (1 << (b - 1));
-   e->pointer.downs++;
-
-   if (e->events_frozen > 0) return;
-   e->last_timestamp = timestamp;
-
-   _evas_object_event_new();
-
-   event_id = _evas_event_counter;
-   ev.button = b;
-   ev.output.x = e->pointer.x;
-   ev.output.y = e->pointer.y;
-   ev.canvas.x = e->pointer.x;
-   ev.canvas.y = e->pointer.y;
-   ev.data = (void *)data;
-   ev.modifiers = &(e->modifiers);
-   ev.locks = &(e->locks);
-   ev.flags = flags;
-   ev.timestamp = timestamp;
-   ev.event_flags = e->default_event_flags;
-
-   _evas_walk(e);
-   /* append new touch point to the touch point list */
-   _evas_touch_point_append(e, 0, e->pointer.x, e->pointer.y);
-   /* If this is the first finger down, i.e no other fingers pressed,
-    * get a new event list, otherwise, keep the current grabbed list. */
-   if (e->pointer.mouse_grabbed == 0)
-     {
-        Eina_List *ins = evas_event_objects_event_list(e,
-                                                       NULL,
-                                                       e->pointer.x,
-                                                       e->pointer.y);
-        /* free our old list of ins */
-        e->pointer.object.in = eina_list_free(e->pointer.object.in);
-        /* and set up the new one */
-        e->pointer.object.in = ins;
-        /* adjust grabbed count by the nuymber of currently held down
-         * fingers/buttons */
-        if (e->pointer.downs > 1) addgrab = e->pointer.downs - 1;
-     }
-   copy = evas_event_list_copy(e->pointer.object.in);
-   EINA_LIST_FOREACH(copy, l, obj)
-     {
-        if ((obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) ||
-            (obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN))
-          {
-             obj->mouse_grabbed += addgrab + 1;
-             e->pointer.mouse_grabbed += addgrab + 1;
-             if (obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)
-               {
-                  e->pointer.nogrep++;
-                  break;
-               }
-          }
-     }
-   EINA_LIST_FOREACH(copy, l, obj)
-     {
-        if (obj->delete_me) continue;
-        ev.canvas.x = e->pointer.x;
-        ev.canvas.y = e->pointer.y;
-        _evas_event_havemap_adjust(obj, &ev.canvas.x, &ev.canvas.y, obj->mouse_grabbed);
-
-        if (e->events_frozen <= 0)
-          evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_DOWN, &ev, event_id);
-        if (e->delete_me) break;
-        if (obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)
-          break;
-     }
-   if (copy) eina_list_free(copy);
-   e->last_mouse_down_counter++;
-   _evas_post_event_callback_call(e);
-   /* update touch point's state to EVAS_TOUCH_POINT_STILL */
-   _evas_touch_point_update(e, 0, e->pointer.x, e->pointer.y, EVAS_TOUCH_POINT_STILL);
-   _evas_unwalk(e);
-}
-
-static int
-_post_up_handle(Evas *e, unsigned int timestamp, const void *data)
-{
-   Eina_List *l, *copy, *ins, *ll;
-   Evas_Event_Mouse_Out ev;
-   Evas_Object *obj;
-   int post_called = 0;
-   int event_id = 0;
-
-   _evas_object_event_new();
-
-   event_id = _evas_event_counter;
-   ev.buttons = e->pointer.button;
-   ev.output.x = e->pointer.x;
-   ev.output.y = e->pointer.y;
-   ev.canvas.x = e->pointer.x;
-   ev.canvas.y = e->pointer.y;
-   ev.data = (void *)data;
-   ev.modifiers = &(e->modifiers);
-   ev.locks = &(e->locks);
-   ev.timestamp = timestamp;
-   ev.event_flags = e->default_event_flags;
-
-   /* get new list of ins */
-   ins = evas_event_objects_event_list(e, NULL, e->pointer.x, e->pointer.y);
-   /* go thru old list of in objects */
-   copy = evas_event_list_copy(e->pointer.object.in);
-   EINA_LIST_FOREACH(copy, ll, obj)
-     {
-        ev.canvas.x = e->pointer.x;
-        ev.canvas.y = e->pointer.y;
-        _evas_event_havemap_adjust(obj, &ev.canvas.x, &ev.canvas.y, obj->mouse_grabbed);
-        if ((!eina_list_data_find(ins, obj)) ||
-            (!e->pointer.inside))
-          {
-             if (obj->mouse_in)
-               {
-                  obj->mouse_in = 0;
-                  if (e->events_frozen <= 0)
-                     evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev, event_id);
-               }
-          }
-        if (e->delete_me) break;
-     }
-   _evas_post_event_callback_call(e);
-
-   if (copy) copy = eina_list_free(copy);
-   if (e->pointer.inside)
-     {
-        Evas_Event_Mouse_In ev_in;
-        Evas_Object *obj_itr;
-
-        _evas_object_event_new();
-
-        event_id = _evas_event_counter;
-        ev_in.buttons = e->pointer.button;
-        ev_in.output.x = e->pointer.x;
-        ev_in.output.y = e->pointer.y;
-        ev_in.canvas.x = e->pointer.x;
-        ev_in.canvas.y = e->pointer.y;
-        ev_in.data = (void *)data;
-        ev_in.modifiers = &(e->modifiers);
-        ev_in.locks = &(e->locks);
-        ev_in.timestamp = timestamp;
-        ev_in.event_flags = e->default_event_flags;
-
-        EINA_LIST_FOREACH(ins, l, obj_itr)
-          {
-             ev_in.canvas.x = e->pointer.x;
-             ev_in.canvas.y = e->pointer.y;
-             _evas_event_havemap_adjust(obj_itr, &ev_in.canvas.x, &ev_in.canvas.y, obj_itr->mouse_grabbed);
-             if (!eina_list_data_find(e->pointer.object.in, obj_itr))
-               {
-                  if (!obj_itr->mouse_in)
-                    {
-                       obj_itr->mouse_in = 1;
-                       if (e->events_frozen <= 0)
-                          evas_object_event_callback_call(obj_itr, EVAS_CALLBACK_MOUSE_IN, &ev_in, event_id);
-                    }
-               }
-             if (e->delete_me) break;
-          }
-        post_called = 1;
-        _evas_post_event_callback_call(e);
-     }
-   else
-     {
-        ins = eina_list_free(ins);
-     }
-
-   if (e->pointer.mouse_grabbed == 0)
-     {
-        /* free our old list of ins */
-        eina_list_free(e->pointer.object.in);
-        /* and set up the new one */
-        e->pointer.object.in = ins;
-     }
-   else
-     {
-        /* free our cur ins */
-        eina_list_free(ins);
-     }
-   if (e->pointer.inside)
-      evas_event_feed_mouse_move(e, e->pointer.x, e->pointer.y, timestamp, data);
-   return post_called;
-}
-
-EAPI void
-evas_event_feed_mouse_up(Evas *e, int b, Evas_Button_Flags flags, unsigned int timestamp, const void *data)
-{
-   Eina_List *l, *copy;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   if ((b < 1) || (b > 32)) return;
-
-   e->pointer.button &= ~(1 << (b - 1));
-   e->pointer.downs--;
-
-   if (e->events_frozen > 0) return;
-   e->last_timestamp = timestamp;
-
-     {
-        Evas_Event_Mouse_Up ev;
-        Evas_Object *obj;
-        int event_id = 0;
-
-        _evas_object_event_new();
-
-        event_id = _evas_event_counter;
-        ev.button = b;
-        ev.output.x = e->pointer.x;
-        ev.output.y = e->pointer.y;
-        ev.canvas.x = e->pointer.x;
-        ev.canvas.y = e->pointer.y;
-        ev.data = (void *)data;
-        ev.modifiers = &(e->modifiers);
-        ev.locks = &(e->locks);
-        ev.flags = flags;
-        ev.timestamp = timestamp;
-        ev.event_flags = e->default_event_flags;
-
-        _evas_walk(e);
-        /* update released touch point */
-        _evas_touch_point_update(e, 0, e->pointer.x, e->pointer.y, EVAS_TOUCH_POINT_UP);
-        copy = evas_event_list_copy(e->pointer.object.in);
-        EINA_LIST_FOREACH(copy, l, obj)
-          {
-             ev.canvas.x = e->pointer.x;
-             ev.canvas.y = e->pointer.y;
-             _evas_event_havemap_adjust(obj, &ev.canvas.x, &ev.canvas.y, obj->mouse_grabbed);
-             if ((obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) &&
-                 (obj->mouse_grabbed > 0))
-               {
-                  obj->mouse_grabbed--;
-                  e->pointer.mouse_grabbed--;
-               }
-             if (!obj->delete_me)
-               {
-                  if ((e->events_frozen <= 0) &&
-                      (!evas_event_freezes_through(obj)))
-                      evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_UP, &ev, event_id);
-               }
-             if (e->delete_me) break;
-             if (obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)
-               {
-                  if (e->pointer.nogrep > 0) e->pointer.nogrep--;
-                  break;
-               }
-          }
-        if (copy) copy = eina_list_free(copy);
-        e->last_mouse_up_counter++;
-        _evas_post_event_callback_call(e);
-     }
-
-   if (e->pointer.mouse_grabbed == 0)
-     {
-        _post_up_handle(e, timestamp, data);
-     }
-
-   if (e->pointer.mouse_grabbed < 0)
-     {
-        ERR("BUG? e->pointer.mouse_grabbed (=%d) < 0!",
-            e->pointer.mouse_grabbed);
-     }
-   /* remove released touch point from the touch point list */
-   _evas_touch_point_remove(e, 0);
-   
-   _evas_unwalk(e);
-}
-
-EAPI void
-evas_event_feed_mouse_cancel(Evas *e, unsigned int timestamp, const void *data)
-{
-   int i;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   if (e->events_frozen > 0) return;
-
-   _evas_walk(e);
-   for (i = 0; i < 32; i++)
-     {
-        if ((e->pointer.button & (1 << i)))
-          evas_event_feed_mouse_up(e, i + 1, 0, timestamp, data);
-     }
-   // FIXME: multi cancel too?
-   _evas_unwalk(e);
-}
-
-EAPI void
-evas_event_feed_mouse_wheel(Evas *e, int direction, int z, unsigned int timestamp, const void *data)
-{
-   Eina_List *l, *copy;
-   Evas_Event_Mouse_Wheel ev;
-   Evas_Object *obj;
-   int event_id = 0;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   if (e->events_frozen > 0) return;
-   e->last_timestamp = timestamp;
-
-   _evas_object_event_new();
-
-   event_id = _evas_event_counter;
-   ev.direction = direction;
-   ev.z = z;
-   ev.output.x = e->pointer.x;
-   ev.output.y = e->pointer.y;
-   ev.canvas.x = e->pointer.x;
-   ev.canvas.y = e->pointer.y;
-   ev.data = (void *) data;
-   ev.modifiers = &(e->modifiers);
-   ev.locks = &(e->locks);
-   ev.timestamp = timestamp;
-   ev.event_flags = e->default_event_flags;
-
-   _evas_walk(e);
-   copy = evas_event_list_copy(e->pointer.object.in);
-
-   EINA_LIST_FOREACH(copy, l, obj)
-     {
-        ev.canvas.x = e->pointer.x;
-        ev.canvas.y = e->pointer.y;
-        _evas_event_havemap_adjust(obj, &ev.canvas.x, &ev.canvas.y, obj->mouse_grabbed);
-        if ((e->events_frozen <= 0) && !evas_event_freezes_through(obj))
-          evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_WHEEL, &ev, event_id);
-        if (e->delete_me) break;
-     }
-   if (copy) copy = eina_list_free(copy);
-   _evas_post_event_callback_call(e);
-
-   _evas_unwalk(e);
-}
-
-EAPI void
-evas_event_feed_mouse_move(Evas *e, int x, int y, unsigned int timestamp, const void *data)
-{
-   Evas_Object *nogrep_obj = NULL;
-   int px, py;
-////   Evas_Coord pcx, pcy;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   px = e->pointer.x;
-   py = e->pointer.y;
-////   pcx = e->pointer.canvas_x;
-////   pcy = e->pointer.canvas_y;
-
-   if (e->events_frozen > 0) return;
-   e->last_timestamp = timestamp;
-
-   e->pointer.x = x;
-   e->pointer.y = y;
-////   e->pointer.canvas_x = x;
-////   e->pointer.canvas_y = y;
-////   e->pointer.canvas_x = evas_coord_screen_x_to_world(e, x);
-////   e->pointer.canvas_y = evas_coord_screen_y_to_world(e, y);
-   if ((!e->pointer.inside) && (e->pointer.mouse_grabbed == 0)) return;
-   _evas_walk(e);
-   /* update moved touch point */
-   if ((px != x) || (py != y))
-     _evas_touch_point_update(e, 0, e->pointer.x, e->pointer.y, EVAS_TOUCH_POINT_MOVE);
-   /* if our mouse button is grabbed to any objects */
-   if (e->pointer.mouse_grabbed > 0)
-     {
-        /* go thru old list of in objects */
-        Eina_List *outs = NULL;
-        Eina_List *l, *copy;
-
-          {
-             Evas_Event_Mouse_Move ev;
-             Evas_Object *obj;
-             int event_id = 0;
-
-             _evas_object_event_new();
-
-             event_id = _evas_event_counter;
-             ev.buttons = e->pointer.button;
-             ev.cur.output.x = e->pointer.x;
-             ev.cur.output.y = e->pointer.y;
-             ev.cur.canvas.x = e->pointer.x;
-             ev.cur.canvas.y = e->pointer.y;
-             ev.prev.output.x = px;
-             ev.prev.output.y = py;
-             ev.prev.canvas.x = px;
-             ev.prev.canvas.y = py;
-             ev.data = (void *)data;
-             ev.modifiers = &(e->modifiers);
-             ev.locks = &(e->locks);
-             ev.timestamp = timestamp;
-             ev.event_flags = e->default_event_flags;
-             copy = evas_event_list_copy(e->pointer.object.in);
-             EINA_LIST_FOREACH(copy, l, obj)
-               {
-                  ev.cur.canvas.x = e->pointer.x;
-                  ev.cur.canvas.y = e->pointer.y;
-                  _evas_event_havemap_adjust(obj, &ev.cur.canvas.x,
-                                             &ev.cur.canvas.y,
-                                             obj->mouse_grabbed);
-                  if ((e->events_frozen <= 0) &&
-                      (evas_object_clippers_is_visible(obj) ||
-                       obj->mouse_grabbed) &&
-                      (!evas_event_passes_through(obj)) &&
-                      (!evas_event_freezes_through(obj)) &&
-                      (!obj->clip.clipees))
-                    {
-                       if ((px != x) || (py != y))
-                         evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_MOVE, &ev, event_id);
-                    }
-                  else
-                    outs = eina_list_append(outs, obj);
-                  if ((obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN) &&
-                      (e->pointer.nogrep > 0))
-                    {
-                       eina_list_free(copy);
-                       nogrep_obj = obj;
-                       goto nogrep;
-                    }
-                  if (e->delete_me) break;
-               }
-             _evas_post_event_callback_call(e);
-          }
-          {
-             Evas_Event_Mouse_Out ev;
-             int event_id = 0;
-
-             _evas_object_event_new();
-
-             event_id = _evas_event_counter;
-             ev.buttons = e->pointer.button;
-             ev.output.x = e->pointer.x;
-             ev.output.y = e->pointer.y;
-             ev.canvas.x = e->pointer.x;
-             ev.canvas.y = e->pointer.y;
-             ev.data = (void *)data;
-             ev.modifiers = &(e->modifiers);
-             ev.locks = &(e->locks);
-             ev.timestamp = timestamp;
-             ev.event_flags = e->default_event_flags;
-
-             if (copy) eina_list_free(copy);
-             while (outs)
-               {
-                  Evas_Object *obj;
-
-                  obj = outs->data;
-                  outs = eina_list_remove(outs, obj);
-                  if ((obj->mouse_grabbed == 0) && (!e->delete_me))
-                    {
-                       ev.canvas.x = e->pointer.x;
-                       ev.canvas.y = e->pointer.y;
-                       _evas_event_havemap_adjust(obj, &ev.canvas.x, &ev.canvas.y, obj->mouse_grabbed);
-                       e->pointer.object.in = eina_list_remove(e->pointer.object.in, obj);
-                       if (obj->mouse_in)
-                         {
-                            obj->mouse_in = 0;
-                            if (!obj->delete_me)
-                              {
-                                 if (e->events_frozen <= 0)
-                                    evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev, event_id);
-                              }
-                         }
-                    }
-               }
-             _evas_post_event_callback_call(e);
-          }
-     }
-   else
-     {
-        Eina_List *ins;
-        Eina_List *l, *copy;
-        Evas_Event_Mouse_Move ev;
-        Evas_Event_Mouse_Out ev2;
-        Evas_Event_Mouse_In ev3;
-        Evas_Object *obj;
-        int event_id = 0, event_id2 = 0;
-
-        _evas_object_event_new();
-
-        event_id = _evas_event_counter;
-        ev.buttons = e->pointer.button;
-        ev.cur.output.x = e->pointer.x;
-        ev.cur.output.y = e->pointer.y;
-        ev.cur.canvas.x = e->pointer.x;
-        ev.cur.canvas.y = e->pointer.y;
-        ev.prev.output.x = px;
-        ev.prev.output.y = py;
-        ev.prev.canvas.x = px;
-        ev.prev.canvas.y = py;
-        ev.data = (void *)data;
-        ev.modifiers = &(e->modifiers);
-        ev.locks = &(e->locks);
-        ev.timestamp = timestamp;
-        ev.event_flags = e->default_event_flags;
-
-        ev2.buttons = e->pointer.button;
-        ev2.output.x = e->pointer.x;
-        ev2.output.y = e->pointer.y;
-        ev2.canvas.x = e->pointer.x;
-        ev2.canvas.y = e->pointer.y;
-        ev2.data = (void *)data;
-        ev2.modifiers = &(e->modifiers);
-        ev2.locks = &(e->locks);
-        ev2.timestamp = timestamp;
-        ev2.event_flags = e->default_event_flags;
-
-        ev3.buttons = e->pointer.button;
-        ev3.output.x = e->pointer.x;
-        ev3.output.y = e->pointer.y;
-        ev3.canvas.x = e->pointer.x;
-        ev3.canvas.y = e->pointer.y;
-        ev3.data = (void *)data;
-        ev3.modifiers = &(e->modifiers);
-        ev3.locks = &(e->locks);
-        ev3.timestamp = timestamp;
-        ev3.event_flags = e->default_event_flags;
-
-        /* get all new in objects */
-        ins = evas_event_objects_event_list(e, NULL, x, y);
-        /* go thru old list of in objects */
-        copy = evas_event_list_copy(e->pointer.object.in);
-        EINA_LIST_FOREACH(copy, l, obj)
-          {
-             /* if its under the pointer and its visible and its in the new */
-             /* in list */
-             // FIXME: i don't think we need this
-             //      evas_object_clip_recalc(obj);
-             if ((e->events_frozen <= 0) &&
-                 evas_object_is_in_output_rect(obj, x, y, 1, 1) &&
-                 (evas_object_clippers_is_visible(obj) ||
-                  obj->mouse_grabbed) &&
-                 eina_list_data_find(ins, obj) &&
-                 (!evas_event_passes_through(obj)) &&
-                 (!evas_event_freezes_through(obj)) &&
-                 (!obj->clip.clipees) &&
-                 ((!obj->precise_is_inside) || evas_object_is_inside(obj, x, y))
-                )
-               {
-                  if ((px != x) || (py != y))
-                    {
-                       ev.cur.canvas.x = e->pointer.x;
-                       ev.cur.canvas.y = e->pointer.y;
-                       _evas_event_havemap_adjust(obj, &ev.cur.canvas.x, &ev.cur.canvas.y, obj->mouse_grabbed);
-                       evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_MOVE, &ev, event_id);
-                    }
-               }
-             /* otherwise it has left the object */
-             else
-               {
-                  if (obj->mouse_in)
-                    {
-                       obj->mouse_in = 0;
-                       ev2.canvas.x = e->pointer.x;
-                       ev2.canvas.y = e->pointer.y;
-                       _evas_event_havemap_adjust(obj, &ev2.canvas.x, &ev2.canvas.y, obj->mouse_grabbed);
-                       if (e->events_frozen <= 0)
-                          evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev2, event_id);
-                    }
-               }
-             if (e->delete_me) break;
-          }
-        _evas_post_event_callback_call(e);
-
-        _evas_object_event_new();
-
-        event_id2 = _evas_event_counter;
-        if (copy) copy = eina_list_free(copy);
-        /* go thru our current list of ins */
-        EINA_LIST_FOREACH(ins, l, obj)
-          {
-             ev3.canvas.x = e->pointer.x;
-             ev3.canvas.y = e->pointer.y;
-             _evas_event_havemap_adjust(obj, &ev3.canvas.x, &ev3.canvas.y, obj->mouse_grabbed);
-             /* if its not in the old list of ins send an enter event */
-             if (!eina_list_data_find(e->pointer.object.in, obj))
-               {
-                  if (!obj->mouse_in)
-                    {
-                       obj->mouse_in = 1;
-                       if (e->events_frozen <= 0)
-                         evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_IN, &ev3, event_id2);
-                    }
-               }
-             if (e->delete_me) break;
-          }
-        if (e->pointer.mouse_grabbed == 0)
-          {
-             /* free our old list of ins */
-             eina_list_free(e->pointer.object.in);
-             /* and set up the new one */
-             e->pointer.object.in = ins;
-          }
-        else
-          {
-             /* free our cur ins */
-             eina_list_free(ins);
-          }
-        _evas_post_event_callback_call(e);
-     }
-   _evas_unwalk(e); 
-   return;
-nogrep:
-     {
-        Eina_List *ins = NULL;
-        Eina_List *newin = NULL;
-        Eina_List *l, *copy, *lst = NULL;
-        Evas_Event_Mouse_Move ev;
-        Evas_Event_Mouse_Out ev2;
-        Evas_Event_Mouse_In ev3;
-        Evas_Object *obj, *below_obj;
-        int event_id = 0, event_id2 = 0;
-        int norep = 0, breaknext = 0;
-
-        _evas_object_event_new();
-
-        event_id = _evas_event_counter;
-        ev.buttons = e->pointer.button;
-        ev.cur.output.x = e->pointer.x;
-        ev.cur.output.y = e->pointer.y;
-        ev.cur.canvas.x = e->pointer.x;
-        ev.cur.canvas.y = e->pointer.y;
-        ev.prev.output.x = px;
-        ev.prev.output.y = py;
-        ev.prev.canvas.x = px;
-        ev.prev.canvas.y = py;
-        ev.data = (void *)data;
-        ev.modifiers = &(e->modifiers);
-        ev.locks = &(e->locks);
-        ev.timestamp = timestamp;
-        ev.event_flags = e->default_event_flags;
-
-        ev2.buttons = e->pointer.button;
-        ev2.output.x = e->pointer.x;
-        ev2.output.y = e->pointer.y;
-        ev2.canvas.x = e->pointer.x;
-        ev2.canvas.y = e->pointer.y;
-        ev2.data = (void *)data;
-        ev2.modifiers = &(e->modifiers);
-        ev2.locks = &(e->locks);
-        ev2.timestamp = timestamp;
-        ev2.event_flags = e->default_event_flags;
-
-        ev3.buttons = e->pointer.button;
-        ev3.output.x = e->pointer.x;
-        ev3.output.y = e->pointer.y;
-        ev3.canvas.x = e->pointer.x;
-        ev3.canvas.y = e->pointer.y;
-        ev3.data = (void *)data;
-        ev3.modifiers = &(e->modifiers);
-        ev3.locks = &(e->locks);
-        ev3.timestamp = timestamp;
-        ev3.event_flags = e->default_event_flags;
-
-        /* go thru old list of in objects */
-        copy = evas_event_list_copy(e->pointer.object.in);
-        EINA_LIST_FOREACH(copy, l, obj)
-          {
-             if (breaknext)
-               {
-                  lst = l;
-                  break;
-               }
-             if (obj == nogrep_obj) breaknext = 1;
-          }
-        
-        /* get all new in objects */
-        below_obj = evas_object_below_get(nogrep_obj);
-        if (below_obj)
-          ins = _evas_event_object_list_raw_in_get(e, NULL, 
-                                                   EINA_INLIST_GET(below_obj), NULL,
-                                                   e->pointer.x, e->pointer.y,
-                                                   &norep);
-        EINA_LIST_FOREACH(copy, l, obj)
-          {
-             newin = eina_list_append(newin, obj);
-             if (obj == nogrep_obj) break;
-          }
-        EINA_LIST_FOREACH(ins, l, obj)
-          {
-             newin = eina_list_append(newin, obj);
-          }
-
-        EINA_LIST_FOREACH(lst, l, obj)
-          {
-             /* if its under the pointer and its visible and its in the new */
-             /* in list */
-             // FIXME: i don't think we need this
-             //      evas_object_clip_recalc(obj);
-             if ((e->events_frozen <= 0) &&
-                 evas_object_is_in_output_rect(obj, x, y, 1, 1) &&
-                 (evas_object_clippers_is_visible(obj) ||
-                  obj->mouse_grabbed) &&
-                 eina_list_data_find(newin, obj) &&
-                 (!evas_event_passes_through(obj)) &&
-                 (!evas_event_freezes_through(obj)) &&
-                 (!obj->clip.clipees) &&
-                 ((!obj->precise_is_inside) || evas_object_is_inside(obj, x, y))
-                )
-               {
-                  if ((px != x) || (py != y))
-                    {
-                       ev.cur.canvas.x = e->pointer.x;
-                       ev.cur.canvas.y = e->pointer.y;
-                       _evas_event_havemap_adjust(obj, &ev.cur.canvas.x, &ev.cur.canvas.y, obj->mouse_grabbed);
-                       evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_MOVE, &ev, event_id);
-                    }
-               }
-             /* otherwise it has left the object */
-             else
-               {
-                  if (obj->mouse_in)
-                    {
-                       obj->mouse_in = 0;
-                       ev2.canvas.x = e->pointer.x;
-                       ev2.canvas.y = e->pointer.y;
-                       _evas_event_havemap_adjust(obj, &ev2.canvas.x, &ev2.canvas.y, obj->mouse_grabbed);
-                       if (e->events_frozen <= 0)
-                          evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev2, event_id);
-                    }
-               }
-             if (e->delete_me) break;
-          }
-        _evas_post_event_callback_call(e);
-
-        _evas_object_event_new();
-        
-        event_id2 = _evas_event_counter;
-        if (copy) copy = eina_list_free(copy);
-        /* go thru our current list of ins */
-        EINA_LIST_FOREACH(newin, l, obj)
-          {
-             ev3.canvas.x = e->pointer.x;
-             ev3.canvas.y = e->pointer.y;
-             _evas_event_havemap_adjust(obj, &ev3.canvas.x, &ev3.canvas.y, obj->mouse_grabbed);
-             /* if its not in the old list of ins send an enter event */
-             if (!eina_list_data_find(e->pointer.object.in, obj))
-               {
-                  if (!obj->mouse_in)
-                    {
-                       obj->mouse_in = 1;
-                       if (e->events_frozen <= 0)
-                         evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_IN, &ev3, event_id2);
-                    }
-               }
-             if (e->delete_me) break;
-          }
-        /* free our old list of ins */
-        eina_list_free(e->pointer.object.in);
-        /* and set up the new one */
-        e->pointer.object.in = newin;
-
-        _evas_post_event_callback_call(e);
-     }
-   _evas_unwalk(e);
-}
-
-EAPI void
-evas_event_feed_mouse_in(Evas *e, unsigned int timestamp, const void *data)
-{
-   Eina_List *ins;
-   Eina_List *l;
-   Evas_Event_Mouse_In ev;
-   Evas_Object *obj;
-   int event_id = 0;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-   e->pointer.inside = 1;
-
-   if (e->events_frozen > 0) return;
-   e->last_timestamp = timestamp;
-
-   if (e->pointer.mouse_grabbed != 0) return;
-
-   _evas_object_event_new();
-
-   event_id = _evas_event_counter;
-   ev.buttons = e->pointer.button;
-   ev.output.x = e->pointer.x;
-   ev.output.y = e->pointer.y;
-   ev.canvas.x = e->pointer.x;
-   ev.canvas.y = e->pointer.y;
-   ev.data = (void *)data;
-   ev.modifiers = &(e->modifiers);
-   ev.locks = &(e->locks);
-   ev.timestamp = timestamp;
-   ev.event_flags = e->default_event_flags;
-
-   _evas_walk(e);
-   /* get new list of ins */
-   ins = evas_event_objects_event_list(e, NULL, e->pointer.x, e->pointer.y);
-   EINA_LIST_FOREACH(ins, l, obj)
-     {
-        ev.canvas.x = e->pointer.x;
-        ev.canvas.y = e->pointer.y;
-        _evas_event_havemap_adjust(obj, &ev.canvas.x, &ev.canvas.y, obj->mouse_grabbed);
-        if (!eina_list_data_find(e->pointer.object.in, obj))
-          {
-             if (!obj->mouse_in)
-               {
-                  obj->mouse_in = 1;
-                  if (e->events_frozen <= 0)
-                     evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_IN, &ev, event_id);
-               }
-          }
-        if (e->delete_me) break;
-     }
-   /* free our old list of ins */
-   e->pointer.object.in = eina_list_free(e->pointer.object.in);
-   /* and set up the new one */
-   e->pointer.object.in = ins;
-   _evas_post_event_callback_call(e);
-   evas_event_feed_mouse_move(e, e->pointer.x, e->pointer.y, timestamp, data);
-   _evas_unwalk(e);
-}
-
-EAPI void
-evas_event_feed_mouse_out(Evas *e, unsigned int timestamp, const void *data)
-{
-   Evas_Event_Mouse_Out ev;
-   int event_id = 0;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-   e->pointer.inside = 0;
-
-   if (e->events_frozen > 0) return;
-   e->last_timestamp = timestamp;
-
-   _evas_object_event_new();
-
-   event_id = _evas_event_counter;
-   ev.buttons = e->pointer.button;
-   ev.output.x = e->pointer.x;
-   ev.output.y = e->pointer.y;
-   ev.canvas.x = e->pointer.x;
-   ev.canvas.y = e->pointer.y;
-   ev.data = (void *)data;
-   ev.modifiers = &(e->modifiers);
-   ev.locks = &(e->locks);
-   ev.timestamp = timestamp;
-   ev.event_flags = e->default_event_flags;
-
-   _evas_walk(e);
-   /* if our mouse button is inside any objects */
-     {
-        /* go thru old list of in objects */
-        Eina_List *l, *copy;
-        Evas_Object *obj;
-
-        copy = evas_event_list_copy(e->pointer.object.in);
-        EINA_LIST_FOREACH(copy, l, obj)
-          {
-             ev.canvas.x = e->pointer.x;
-             ev.canvas.y = e->pointer.y;
-             _evas_event_havemap_adjust(obj, &ev.canvas.x, &ev.canvas.y, obj->mouse_grabbed);
-             if (obj->mouse_in)
-               {
-                  obj->mouse_in = 0;
-                  if (!obj->delete_me)
-                    {
-                       if (e->events_frozen <= 0)
-                         evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev, event_id);
-                    }
-                  obj->mouse_grabbed = 0;
-               }
-             if (e->delete_me) break;
-          }
-        if (copy) copy = eina_list_free(copy);
-        /* free our old list of ins */
-        e->pointer.object.in =  eina_list_free(e->pointer.object.in);
-        e->pointer.mouse_grabbed = 0;
-        _evas_post_event_callback_call(e);
-     }
-   _evas_unwalk(e);
-}
-
-EAPI void
-evas_event_feed_multi_down(Evas *e,
-                           int d, int x, int y,
-                           double rad, double radx, double rady,
-                           double pres, double ang,
-                           double fx, double fy,
-                           Evas_Button_Flags flags, unsigned int timestamp,
-                           const void *data)
-{
-   Eina_List *l, *copy;
-   Evas_Event_Multi_Down ev;
-   Evas_Object *obj;
-   int addgrab = 0;
-   int event_id = 0;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   e->pointer.downs++;
-   if (e->events_frozen > 0) return;
-   e->last_timestamp = timestamp;
-
-   _evas_object_event_new();
-
-   event_id = _evas_event_counter;
-   ev.device = d;
-   ev.output.x = x;
-   ev.output.y = y;
-   ev.canvas.x = x;
-   ev.canvas.y = y;
-   ev.radius = rad;
-   ev.radius_x = radx;
-   ev.radius_y = rady;
-   ev.pressure = pres;
-   ev.angle = ang;
-   ev.canvas.xsub = fx;
-   ev.canvas.ysub = fy;
-   ev.data = (void *)data;
-   ev.modifiers = &(e->modifiers);
-   ev.locks = &(e->locks);
-   ev.flags = flags;
-   ev.timestamp = timestamp;
-   ev.event_flags = e->default_event_flags;
-
-   _evas_walk(e);
-   /* append new touch point to the touch point list */
-   _evas_touch_point_append(e, d, x, y);
-   if (e->pointer.mouse_grabbed == 0)
-     {
-        if (e->pointer.downs > 1) addgrab = e->pointer.downs - 1;
-     }
-   copy = evas_event_list_copy(e->pointer.object.in);
-   EINA_LIST_FOREACH(copy, l, obj)
-     {
-        if (obj->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB)
-          {
-             obj->mouse_grabbed += addgrab + 1;
-             e->pointer.mouse_grabbed += addgrab + 1;
-          }
-     }
-   EINA_LIST_FOREACH(copy, l, obj)
-     {
-        ev.canvas.x = x;
-        ev.canvas.y = y;
-        ev.canvas.xsub = fx;
-        ev.canvas.ysub = fy;
-        _evas_event_havemap_adjust(obj, &ev.canvas.x, &ev.canvas.y, obj->mouse_grabbed);
-        if (x != ev.canvas.x)
-          ev.canvas.xsub = ev.canvas.x; // fixme - lost precision
-        if (y != ev.canvas.y)
-          ev.canvas.ysub = ev.canvas.y; // fixme - lost precision
-        if (e->events_frozen <= 0)
-          evas_object_event_callback_call(obj, EVAS_CALLBACK_MULTI_DOWN, &ev, event_id);
-        if (e->delete_me) break;
-     }
-   if (copy) eina_list_free(copy);
-   _evas_post_event_callback_call(e);
-   /* update touch point's state to EVAS_TOUCH_POINT_STILL */
-   _evas_touch_point_update(e, d, x, y, EVAS_TOUCH_POINT_STILL);
-   _evas_unwalk(e);
-}
-
-EAPI void
-evas_event_feed_multi_up(Evas *e,
-                         int d, int x, int y,
-                         double rad, double radx, double rady,
-                         double pres, double ang,
-                         double fx, double fy,
-                         Evas_Button_Flags flags, unsigned int timestamp,
-                         const void *data)
-{
-   Eina_List *l, *copy;
-   Evas_Event_Multi_Up ev;
-   Evas_Object *obj;
-   int event_id = 0;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   e->pointer.downs--;
-   if (e->events_frozen > 0) return;
-   e->last_timestamp = timestamp;
-
-   _evas_object_event_new();
-
-   event_id = _evas_event_counter;
-   ev.device = d;
-   ev.output.x = x;
-   ev.output.y = y;
-   ev.canvas.x = x;
-   ev.canvas.y = y;
-   ev.radius = rad;
-   ev.radius_x = radx;
-   ev.radius_y = rady;
-   ev.pressure = pres;
-   ev.angle = ang;
-   ev.canvas.xsub = fx;
-   ev.canvas.ysub = fy;
-   ev.data = (void *)data;
-   ev.modifiers = &(e->modifiers);
-   ev.locks = &(e->locks);
-   ev.flags = flags;
-   ev.timestamp = timestamp;
-   ev.event_flags = e->default_event_flags;
-
-   _evas_walk(e);
-   /* update released touch point */
-   _evas_touch_point_update(e, d, x, y, EVAS_TOUCH_POINT_UP);
-   copy = evas_event_list_copy(e->pointer.object.in);
-   EINA_LIST_FOREACH(copy, l, obj)
-     {
-        ev.canvas.x = x;
-        ev.canvas.y = y;
-        ev.canvas.xsub = fx;
-        ev.canvas.ysub = fy;
-        _evas_event_havemap_adjust(obj, &ev.canvas.x, &ev.canvas.y, obj->mouse_grabbed);
-        if (x != ev.canvas.x)
-          ev.canvas.xsub = ev.canvas.x; // fixme - lost precision
-        if (y != ev.canvas.y)
-          ev.canvas.ysub = ev.canvas.y; // fixme - lost precision
-        if ((obj->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB) &&
-            (obj->mouse_grabbed > 0))
-          {
-             obj->mouse_grabbed--;
-             e->pointer.mouse_grabbed--;
-          }
-        if (e->events_frozen <= 0)
-          evas_object_event_callback_call(obj, EVAS_CALLBACK_MULTI_UP, &ev, event_id);
-        if (e->delete_me) break;
-     }
-   if (copy) copy = eina_list_free(copy);
-   if ((e->pointer.mouse_grabbed == 0) && !_post_up_handle(e, timestamp, data))
-      _evas_post_event_callback_call(e);
-   /* remove released touch point from the touch point list */
-   _evas_touch_point_remove(e, d);
-   _evas_unwalk(e);
-}
-
-EAPI void
-evas_event_feed_multi_move(Evas *e,
-                           int d, int x, int y,
-                           double rad, double radx, double rady,
-                           double pres, double ang,
-                           double fx, double fy,
-                           unsigned int timestamp, const void *data)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   if (e->events_frozen > 0) return;
-   e->last_timestamp = timestamp;
-
-   if ((!e->pointer.inside) && (e->pointer.mouse_grabbed == 0)) return;
-
-   _evas_walk(e);
-   /* update moved touch point */
-   _evas_touch_point_update(e, d, x, y, EVAS_TOUCH_POINT_MOVE);
-   /* if our mouse button is grabbed to any objects */
-   if (e->pointer.mouse_grabbed > 0)
-     {
-        /* go thru old list of in objects */
-        Eina_List *l, *copy;
-        Evas_Event_Multi_Move ev;
-        Evas_Object *obj;
-        int event_id = 0;
-
-        _evas_object_event_new();
-
-        event_id = _evas_event_counter;
-        ev.device = d;
-        ev.cur.output.x = x;
-        ev.cur.output.y = y;
-        ev.cur.canvas.x = x;
-        ev.cur.canvas.y = y;
-        ev.radius = rad;
-        ev.radius_x = radx;
-        ev.radius_y = rady;
-        ev.pressure = pres;
-        ev.angle = ang;
-        ev.cur.canvas.xsub = fx;
-        ev.cur.canvas.ysub = fy;
-        ev.data = (void *)data;
-        ev.modifiers = &(e->modifiers);
-        ev.locks = &(e->locks);
-        ev.timestamp = timestamp;
-        ev.event_flags = e->default_event_flags;
-
-        copy = evas_event_list_copy(e->pointer.object.in);
-        EINA_LIST_FOREACH(copy, l, obj)
-          {
-             if ((e->events_frozen <= 0) &&
-                 (evas_object_clippers_is_visible(obj) || obj->mouse_grabbed) &&
-                 (!evas_event_passes_through(obj)) &&
-                 (!evas_event_freezes_through(obj)) &&
-                 (!obj->clip.clipees))
-               {
-                  ev.cur.canvas.x = x;
-                  ev.cur.canvas.y = y;
-                  ev.cur.canvas.xsub = fx;
-                  ev.cur.canvas.ysub = fy;
-                  _evas_event_havemap_adjust(obj, &ev.cur.canvas.x, &ev.cur.canvas.y, obj->mouse_grabbed);
-                  if (x != ev.cur.canvas.x)
-                    ev.cur.canvas.xsub = ev.cur.canvas.x; // fixme - lost precision
-                  if (y != ev.cur.canvas.y)
-                    ev.cur.canvas.ysub = ev.cur.canvas.y; // fixme - lost precision
-                    evas_object_event_callback_call(obj, EVAS_CALLBACK_MULTI_MOVE, &ev, event_id);
-               }
-             if (e->delete_me) break;
-          }
-        _evas_post_event_callback_call(e);
-     }
-   else
-     {
-        Eina_List *ins;
-        Eina_List *l, *copy;
-        Evas_Event_Multi_Move ev;
-        Evas_Object *obj;
-        int event_id = 0;
-
-        _evas_object_event_new();
-
-        event_id = _evas_event_counter;
-        ev.device = d;
-        ev.cur.output.x = x;
-        ev.cur.output.y = y;
-        ev.cur.canvas.x = x;
-        ev.cur.canvas.y = y;
-        ev.radius = rad;
-        ev.radius_x = radx;
-        ev.radius_y = rady;
-        ev.pressure = pres;
-        ev.angle = ang;
-        ev.cur.canvas.xsub = fx;
-        ev.cur.canvas.ysub = fy;
-        ev.data = (void *)data;
-        ev.modifiers = &(e->modifiers);
-        ev.locks = &(e->locks);
-        ev.timestamp = timestamp;
-        ev.event_flags = e->default_event_flags;
-
-        /* get all new in objects */
-        ins = evas_event_objects_event_list(e, NULL, x, y);
-        /* go thru old list of in objects */
-        copy = evas_event_list_copy(e->pointer.object.in);
-        EINA_LIST_FOREACH(copy, l, obj)
-          {
-             /* if its under the pointer and its visible and its in the new */
-             /* in list */
-             // FIXME: i don't think we need this
-             //      evas_object_clip_recalc(obj);
-             if ((e->events_frozen <= 0) &&
-                 evas_object_is_in_output_rect(obj, x, y, 1, 1) &&
-                 (evas_object_clippers_is_visible(obj) ||
-                  obj->mouse_grabbed) &&
-                 eina_list_data_find(ins, obj) &&
-                 (!evas_event_passes_through(obj)) &&
-                 (!evas_event_freezes_through(obj)) &&
-                 (!obj->clip.clipees) &&
-                 ((!obj->precise_is_inside) || evas_object_is_inside(obj, x, y))
-                )
-               {
-                  ev.cur.canvas.x = x;
-                  ev.cur.canvas.y = y;
-                  ev.cur.canvas.xsub = fx;
-                  ev.cur.canvas.ysub = fy;
-                  _evas_event_havemap_adjust(obj, &ev.cur.canvas.x, &ev.cur.canvas.y, obj->mouse_grabbed);
-                  if (x != ev.cur.canvas.x)
-                    ev.cur.canvas.xsub = ev.cur.canvas.x; // fixme - lost precision
-                  if (y != ev.cur.canvas.y)
-                    ev.cur.canvas.ysub = ev.cur.canvas.y; // fixme - lost precision
-                    evas_object_event_callback_call(obj, EVAS_CALLBACK_MULTI_MOVE, &ev, event_id);
-               }
-             if (e->delete_me) break;
-          }
-        if (copy) copy = eina_list_free(copy);
-        if (e->pointer.mouse_grabbed == 0)
-          {
-             /* free our old list of ins */
-             eina_list_free(e->pointer.object.in);
-             /* and set up the new one */
-             e->pointer.object.in = ins;
-          }
-        else
-          {
-             /* free our cur ins */
-             eina_list_free(ins);
-          }
-        _evas_post_event_callback_call(e);
-     }
-   _evas_unwalk(e);
-}
-
-EAPI void
-evas_event_feed_key_down(Evas *e, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data)
-{
-   int event_id = 0;
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   if (!keyname) return;
-   if (e->events_frozen > 0) return;
-   e->last_timestamp = timestamp;
-   _evas_walk(e);
-
-   Evas_Event_Key_Down ev;
-   Eina_Bool exclusive;
-
-   _evas_object_event_new();
-
-   event_id = _evas_event_counter;
-   exclusive = EINA_FALSE;
-   ev.keyname = (char *)keyname;
-   ev.data = (void *)data;
-   ev.modifiers = &(e->modifiers);
-   ev.locks = &(e->locks);
-   ev.key = key;
-   ev.string = string;
-   ev.compose = compose;
-   ev.timestamp = timestamp;
-   ev.event_flags = e->default_event_flags;
-
-   if (e->grabs)
-     {
-        Eina_List *l;
-        Evas_Key_Grab *g;
-
-        e->walking_grabs++;
-        EINA_LIST_FOREACH(e->grabs, l, g)
-          {
-             if (g->just_added)
-               {
-                  g->just_added = EINA_FALSE;
-                  continue;
-               }
-             if (g->delete_me) continue;
-             if (((e->modifiers.mask & g->modifiers) ||
-                  (g->modifiers == e->modifiers.mask)) &&
-                 (!strcmp(keyname, g->keyname)))
-               {
-                  if (!(e->modifiers.mask & g->not_modifiers))
-                    {
-                       if (e->events_frozen <= 0 &&
-                           !evas_event_freezes_through(g->object))
-                         evas_object_event_callback_call(g->object,
-                                                         EVAS_CALLBACK_KEY_DOWN,
-                                                         &ev, event_id);
-                       if (g->exclusive) exclusive = EINA_TRUE;
-                    }
-               }
-             if (e->delete_me) break;
-          }
-        e->walking_grabs--;
-        if (e->walking_grabs <= 0)
-          {
-             while (e->delete_grabs > 0)
-               {
-                  e->delete_grabs--;
-                  for (l = e->grabs; l;)
-                    {
-                       g = eina_list_data_get(l);
-                       l = eina_list_next(l);
-                       if (g->delete_me)
-                         evas_key_grab_free(g->object, g->keyname, g->modifiers,
-                                            g->not_modifiers);
-                    }
-               }
-          }
-     }
-   if ((e->focused) && (!exclusive))
-     {
-        if (e->events_frozen <= 0 && !evas_event_freezes_through(e->focused))
-          evas_object_event_callback_call(e->focused, EVAS_CALLBACK_KEY_DOWN,
-                                          &ev, event_id);
-     }
-   _evas_post_event_callback_call(e);
-   _evas_unwalk(e);
-}
-
-EAPI void
-evas_event_feed_key_up(Evas *e, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data)
-{
-   int event_id = 0;
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-   if (!keyname) return;
-   if (e->events_frozen > 0) return;
-   e->last_timestamp = timestamp;
-   _evas_walk(e);
-
-   Evas_Event_Key_Up ev;
-   Eina_Bool exclusive;
-
-   _evas_object_event_new();
-
-   event_id = _evas_event_counter;
-   exclusive = EINA_FALSE;
-   ev.keyname = (char *)keyname;
-   ev.data = (void *)data;
-   ev.modifiers = &(e->modifiers);
-   ev.locks = &(e->locks);
-   ev.key = key;
-   ev.string = string;
-   ev.compose = compose;
-   ev.timestamp = timestamp;
-   ev.event_flags = e->default_event_flags;
-
-   if (e->grabs)
-     {
-        Eina_List *l;
-        Evas_Key_Grab *g;
-
-        e->walking_grabs++;
-        EINA_LIST_FOREACH(e->grabs, l, g)
-          {
-             if (g->just_added)
-               {
-                  g->just_added = EINA_FALSE;
-                  continue;
-               }
-             if (g->delete_me) continue;
-             if (((e->modifiers.mask & g->modifiers) ||
-                  (g->modifiers == e->modifiers.mask)) &&
-                 (!((e->modifiers.mask & g->not_modifiers) ||
-                    (g->not_modifiers == ~e->modifiers.mask))) &&
-                 (!strcmp(keyname, g->keyname)))
-               {
-                  if (e->events_frozen <= 0 &&
-                      !evas_event_freezes_through(g->object))
-                    evas_object_event_callback_call(g->object,
-                                                    EVAS_CALLBACK_KEY_UP, &ev, event_id);
-                  if (g->exclusive) exclusive = EINA_TRUE;
-               }
-             if (e->delete_me) break;
-          }
-        e->walking_grabs--;
-        if (e->walking_grabs <= 0)
-          {
-             while (e->delete_grabs > 0)
-               {
-                  Eina_List *ll, *l_next;
-                  Evas_Key_Grab *gr;
-
-                  e->delete_grabs--;
-                  EINA_LIST_FOREACH_SAFE(e->grabs, ll, l_next, gr)
-                    {
-                       if (gr->delete_me)
-                         evas_key_grab_free(gr->object, gr->keyname,
-                                            gr->modifiers, gr->not_modifiers);
-                    }
-               }
-          }
-     }
-   if ((e->focused) && (!exclusive))
-     {
-        if (e->events_frozen <= 0 && !evas_event_freezes_through(e->focused))
-          evas_object_event_callback_call(e->focused, EVAS_CALLBACK_KEY_UP,
-                                          &ev, event_id);
-     }
-   _evas_post_event_callback_call(e);
-   _evas_unwalk(e);
-}
-
-EAPI void
-evas_event_feed_hold(Evas *e, int hold, unsigned int timestamp, const void *data)
-{
-   Eina_List *l, *copy;
-   Evas_Event_Hold ev;
-   Evas_Object *obj;
-   int event_id = 0;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   if (e->events_frozen > 0) return;
-   e->last_timestamp = timestamp;
-
-   _evas_object_event_new();
-
-   event_id = _evas_event_counter;
-   ev.hold = hold;
-   ev.data = (void *)data;
-   ev.timestamp = timestamp;
-   ev.event_flags = e->default_event_flags;
-
-   _evas_walk(e);
-   copy = evas_event_list_copy(e->pointer.object.in);
-   EINA_LIST_FOREACH(copy, l, obj)
-     {
-        if ((e->events_frozen <= 0) && !evas_event_freezes_through(obj))
-          evas_object_event_callback_call(obj, EVAS_CALLBACK_HOLD, &ev, event_id);
-        if (e->delete_me) break;
-     }
-   if (copy) copy = eina_list_free(copy);
-   _evas_post_event_callback_call(e);
-   _evas_unwalk(e);
-   _evas_object_event_new();
-}
-
-EAPI void
-evas_object_freeze_events_set(Evas_Object *obj, Eina_Bool freeze)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-
-   freeze = !!freeze;
-   if (obj->freeze_events == freeze) return;
-   obj->freeze_events = freeze;
-   evas_object_smart_member_cache_invalidate(obj, EINA_FALSE, EINA_TRUE);
-}
-
-EAPI Eina_Bool
-evas_object_freeze_events_get(const Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-   return obj->freeze_events;
-}
-
-EAPI void
-evas_object_pass_events_set(Evas_Object *obj, Eina_Bool pass)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   pass = !!pass;
-   if (obj->pass_events == pass) return;
-   obj->pass_events = pass;
-   evas_object_smart_member_cache_invalidate(obj, EINA_TRUE, EINA_FALSE);
-   if (evas_object_is_in_output_rect(obj,
-                                     obj->layer->evas->pointer.x,
-                                     obj->layer->evas->pointer.y, 1, 1) &&
-       ((!obj->precise_is_inside) ||
-        (evas_object_is_inside(obj,
-                               obj->layer->evas->pointer.x,
-                               obj->layer->evas->pointer.y))))
-     evas_event_feed_mouse_move(obj->layer->evas,
-                                obj->layer->evas->pointer.x,
-                                obj->layer->evas->pointer.y,
-                                obj->layer->evas->last_timestamp,
-                                NULL);
-}
-
-EAPI Eina_Bool
-evas_object_pass_events_get(const Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-   return obj->pass_events;
-}
-
-EAPI void
-evas_object_repeat_events_set(Evas_Object *obj, Eina_Bool repeat)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   repeat = !!repeat;
-   if (obj->repeat_events == repeat) return;
-   obj->repeat_events = repeat;
-   if (evas_object_is_in_output_rect(obj,
-                                     obj->layer->evas->pointer.x,
-                                     obj->layer->evas->pointer.y, 1, 1) &&
-       ((!obj->precise_is_inside) ||
-        (evas_object_is_inside(obj,
-                               obj->layer->evas->pointer.x,
-                               obj->layer->evas->pointer.y))))
-     evas_event_feed_mouse_move(obj->layer->evas,
-                                obj->layer->evas->pointer.x,
-                                obj->layer->evas->pointer.y,
-                                obj->layer->evas->last_timestamp,
-                                NULL);
-}
-
-EAPI Eina_Bool
-evas_object_repeat_events_get(const Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-   return obj->repeat_events;
-}
-
-EAPI void
-evas_object_propagate_events_set(Evas_Object *obj, Eina_Bool prop)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   obj->no_propagate = !prop;
-}
-
-EAPI Eina_Bool
-evas_object_propagate_events_get(const Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-   return !(obj->no_propagate);
-}
-
-EAPI void
-evas_object_pointer_mode_set(Evas_Object *obj, Evas_Object_Pointer_Mode setting)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   obj->pointer_mode = setting;
-}
-
-EAPI Evas_Object_Pointer_Mode
-evas_object_pointer_mode_get(const Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EVAS_OBJECT_POINTER_MODE_AUTOGRAB;
-   MAGIC_CHECK_END();
-   return obj->pointer_mode;
-}
-
-EAPI void
-evas_event_refeed_event(Evas *e, void *event_copy, Evas_Callback_Type event_type)
-{
-   switch (event_type)
-     {
-      case EVAS_CALLBACK_MOUSE_IN:
-          {
-             Evas_Event_Mouse_In *ev = event_copy;
-             evas_event_feed_mouse_in(e, ev->timestamp, ev->data);
-             break;
-          }
-      case EVAS_CALLBACK_MOUSE_OUT:
-          {
-             Evas_Event_Mouse_Out *ev = event_copy;
-             evas_event_feed_mouse_out(e, ev->timestamp, ev->data);
-             break;
-          }
-      case EVAS_CALLBACK_MOUSE_DOWN:
-          {
-             Evas_Event_Mouse_Down *ev = event_copy;
-             evas_event_feed_mouse_down(e, ev->button, ev->flags, ev-> timestamp, ev->data);
-             break;
-          }
-      case EVAS_CALLBACK_MOUSE_UP:
-          {
-             Evas_Event_Mouse_Up *ev = event_copy;
-             evas_event_feed_mouse_up(e, ev->button, ev->flags, ev-> timestamp, ev->data);
-             break;
-          }
-      case EVAS_CALLBACK_MOUSE_MOVE:
-          {
-             Evas_Event_Mouse_Move *ev = event_copy;
-             evas_event_feed_mouse_move(e, ev->cur.canvas.x, ev->cur.canvas.y, ev->timestamp, ev->data);
-             break;
-          }
-      case EVAS_CALLBACK_MOUSE_WHEEL:
-          {
-             Evas_Event_Mouse_Wheel *ev = event_copy;
-             evas_event_feed_mouse_wheel(e, ev->direction, ev-> z, ev->timestamp, ev->data);
-             break;
-          }
-      case EVAS_CALLBACK_MULTI_DOWN:
-          {
-             Evas_Event_Multi_Down *ev = event_copy;
-             evas_event_feed_multi_down(e, ev->device, ev->canvas.x, ev->canvas.y, ev->radius, ev->radius_x, ev->radius_y, ev->pressure, ev->angle, ev->canvas.xsub, ev->canvas.ysub, ev->flags, ev->timestamp, ev->data);
-             break;
-          }
-      case EVAS_CALLBACK_MULTI_UP:
-          {
-             Evas_Event_Multi_Up *ev = event_copy;
-             evas_event_feed_multi_up(e, ev->device, ev->canvas.x, ev->canvas.y, ev->radius, ev->radius_x, ev->radius_y, ev->pressure, ev->angle, ev->canvas.xsub, ev->canvas.ysub, ev->flags, ev->timestamp, ev->data);
-             break;
-          }
-      case EVAS_CALLBACK_MULTI_MOVE:
-          {
-             Evas_Event_Multi_Move *ev = event_copy;
-             evas_event_feed_multi_move(e, ev->device, ev->cur.canvas.x, ev->cur.canvas.y, ev->radius, ev->radius_x, ev->radius_y, ev->pressure, ev->angle, ev->cur.canvas.xsub, ev->cur.canvas.ysub, ev->timestamp, ev->data);
-             break;
-          }
-      case EVAS_CALLBACK_KEY_DOWN:
-          {
-             Evas_Event_Key_Down *ev = event_copy;
-             evas_event_feed_key_down(e, ev->keyname, ev->key, ev->string, ev->compose, ev->timestamp, ev->data);
-             break;
-          }
-      case EVAS_CALLBACK_KEY_UP:
-          {
-             Evas_Event_Key_Up *ev = event_copy;
-             evas_event_feed_key_up(e, ev->keyname, ev->key, ev->string, ev->compose, ev->timestamp, ev->data);
-             break;
-          }
-      default: /* All non-input events are not handeled */
-        break;
-     }
-}
-
-EAPI int
-evas_event_down_count_get(const Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return 0;
-   MAGIC_CHECK_END();
-   return e->pointer.downs;
-}
diff --git a/libraries/evas/src/lib/canvas/evas_filter.c b/libraries/evas/src/lib/canvas/evas_filter.c
deleted file mode 100644
index 6194ec2..0000000
--- a/libraries/evas/src/lib/canvas/evas_filter.c
+++ /dev/null
@@ -1,1427 +0,0 @@
-/*
- * Filter implementation for evas
- */
-
-#if 0 // filtering disabled
-typedef enum
-{
-   /** Apply any filter effects to this object (Default) */
-   EVAS_FILTER_MODE_OBJECT,
-   /** Filter all objects beneath this object on the canvas */
-   EVAS_FILTER_MODE_BELOW,
-} Evas_Filter_Mode;
-typedef enum
-{
-   /** No filter: Default */
-   EVAS_FILTER_NONE,
-   /** A blur filter.  Params are quality (float), and radius (int). */
-   EVAS_FILTER_BLUR,
-   /** Negates the colors of an image.  Also called solarize */
-   EVAS_FILTER_INVERT,
-   EVAS_FILTER_SOLARIZE = EVAS_FILTER_INVERT,
-   /** Makes a sepia version of the image. */
-   EVAS_FILTER_SEPIA,
-   /** Makes a greyscale version of the image.  Params are 'red',
-    * 'green', 'blue' (all floats) which must add to 1.  The defaults are
-    * 0.3, 0.59 and 0.11 which approximates human vision. Setting 'all'
-    * sets rgb to the same value. */
-   EVAS_FILTER_GREYSCALE,
-   EVAS_FILTER_GRAYSCALE = EVAS_FILTER_GREYSCALE,
-   /** Brighten (or darken) image.  Param 'adjust' float (-1.0 to 1.0)
-    * amount to adjust. */
-   EVAS_FILTER_BRIGHTNESS,
-   /** Enhance contrast on image.  Param 'adjust' float (-1.0 to 1.0)
-    * amount to adjust. */
-   EVAS_FILTER_CONTRAST,
-   
-   EVAS_FILTER_LAST = EVAS_FILTER_CONTRAST
-} Evas_Filter;
-
-/**
- * Set the filter mode for an object.
- *
- * There are two valid filtering modes currently:
- *  - EVAS_FILTER_MODE_OBJECT: which applies the filter to the object itself
- *  - EVAS_FILTER_MODE_BELOW: which makes the object invisible and filters
- *  what is below the object.
- *
- * The default filter mode is EVAS_FILTER_MODE_OBJECT.
- *
- * @param o Object to set filter mode on.
- * @param mode Mode to set.
- * @return EINA_TRUE on success, EINA_FALSE otherwise.
- */
-   EAPI Eina_Bool                            evas_object_filter_mode_set      (Evas_Object *o, Evas_Filter_Mode mode);
-
-/**
- * Get the current filtering mode for an object.
- *
- * By default all objects are in object filtering mode, even if no filter is
- * set.
- *
- * @param o Object to get filter mode of.
- * @return Filter mode (default EVAS_FILTER_MODE_OBJECT)
- */
-   EAPI Evas_Filter_Mode                     evas_object_filter_mode_get      (Evas_Object *o);
-
-/**
- * Set the current filter type.
- *
- * This sets the filter type, whether a blur, color filter or some other type
- * of filter.  This is normally the only filter call necessary, although some
- * filters require additional parameters.
- *
- * If the object has a filter already, and existing parameters will be
- * cleared.
- *
- * Setting the blur to EVAS_FILTER_NONE removes any filter.
- *
- * @param o Object to set the filter on.
- * @param filter Filter to set.
- * @return EINA_TRUE On success
- */
-   EAPI Eina_Bool                            evas_object_filter_set           (Evas_Object *o, Evas_Filter filter);
-
-/**
- * Get the current filter.
- *
- * @param o Object to get filter of.
- * @return The filter if set, or EVAS_FILTER_NONE.
- */
-   EAPI Evas_Filter                          evas_object_filter_get           (Evas_Object *o);
-
-/**
- * Set an integer parameter of a filter.
- *
- * This sets an integer parameter of a filter, if such parameter is known to
- * the filter.  Note that some parameters may actually set multiple fields.
- * The individual filters define the specific parameters available.
- *
- * It should be noted that filter parameters are lost after the filter type
- * changes, so set the filter type, then the parameters.
- *
- * @param o Object to set parameter on.
- * @param param Name of parameter to set.
- * @param val Value to set.
- * @return EINA_TRUE if at least one parameter was set, EINA_FALSE
- * otherwise.
- */
-   EAPI Eina_Bool                            evas_object_filter_param_int_set (Evas_Object *o, const char *param, int val);
-
-/**
- * Get an integer value parameter from a filter.
- *
- * Gets the first matching parameter for a filter.  Note there is no way to
- * later fields if they do not have their own accessor name.
- *
- * Also note that there is no way to tell the difference between a -1 as a
- * value, and the error code.  Ask your filter writer to use a different
- * range.
- *
- * @param o The object.
- * @Param param Name of the parameter to get.
- * @return The value, or -1 on error.
- */
-   EAPI int                                  evas_object_filter_param_int_get (Evas_Object *o, const char *param);
-
-/**
- * Set a string parameter on a filter
- * 
- * Currently unimplemented as no filters use this yet
- */
-   EAPI Eina_Bool                            evas_object_filter_param_str_set (Evas_Object *o, const char *param, const char *val);
-
-/**
- * Get a string parameter from a filter
- *
- * Currently unimplemented as no filters use this yet
- */
-   EAPI const char                          *evas_object_filter_param_str_get (Evas_Object *o, const char *param);
-
-/**
- * Set an object parameter on a filter
- * 
- * Currently unimplemented as no filters use this yet
- */
-   EAPI Eina_Bool                            evas_object_filter_param_obj_set (Evas_Object *o, const char *param, Evas_Object *val);
-
-/**
- * get an object parameter from a filter
- * 
- * Currently unimplemented as no filters use this yet
- */
-   EAPI Evas_Object                         *evas_object_filter_param_obj_get (Evas_Object *o, const char *param);
-
-/**
- * Set a float parameter of a filter.
- *
- * This is the same as evas_object_filter_param_int_set(), but for floating
- * point values.
- *
- * @param o Object to set value on.
- * @param param Name of the parameter to set.
- * @param EINA_TRUE if at least one parameter was set, EINA_FALSE otherwise.
- */
-   EAPI Eina_Bool                            evas_object_filter_param_float_set(Evas_Object *o, const char *param, double val);
-
-/**
- * Get a float parameter of a filter.
- *
- * This is the same as evas_object_filter_param_int_get(), but for floating
- * point values.
- *
- * @param o Object to set value on.
- * @param param Name of the parameter to set.
- * @return The value, or -1 on error.
- */
-   EAPI double                               evas_object_filter_param_float_get(Evas_Object *o, const char *param);
-
-#include <stddef.h>     // offsetof
-
-#include "evas_common.h"
-#include "evas_private.h"
-
-#include <assert.h>
-/* disable neon - even after fixes:
- * Error: ARM register expected -- vdup.u32 q14,$0xff000000'
- * not going to fix now
-#ifdef BUILD_NEON
-# define BUILD_NEON0 1
-#else
-# define BUILD_NEON0 0
-#endif
-*/
-
-#define BUILD_NEON0 0
-
-typedef struct Evas_Filter_Info_Blur
-{
-   double quality;
-   int radius;
-} Evas_Filter_Info_Blur;
-
-typedef struct Evas_Filter_Info_GreyScale
-{
-   double r,g,b;
-} Evas_Filter_Info_GreyScale;
-
-typedef struct Evas_Filter_Info_Brightness
-{
-   double adjust;
-} Evas_Filter_Info_Brightness;
-
-typedef struct Evas_Filter_Info_Contrast
-{
-   double adjust;
-} Evas_Filter_Info_Contrast;
-
-typedef int (*Filter_Size_FN)(Evas_Filter_Info *,int,int,int*,int*,Eina_Bool);
-typedef uint8_t *(*Key_FN)(const Evas_Filter_Info  *, uint32_t *);
-
-struct fieldinfo
-{
-   const char *field;
-   int type;
-   size_t offset;
-};
-
-struct filterinfo
-{
-   Evas_Software_Filter_Fn filter;
-   const size_t datasize;
-   Filter_Size_FN sizefn;
-   Key_FN keyfn;
-   Eina_Bool alwaysalpha;
-};
-
-enum
-{
-   TYPE_INT,
-   TYPE_FLOAT
-};
-
-static int blur_size_get(Evas_Filter_Info*, int, int, int *, int *, Eina_Bool);
-static uint8_t *gaussian_key_get(const Evas_Filter_Info *, uint32_t *);
-
-static Eina_Bool gaussian_filter(Evas_Filter_Info *, RGBA_Image*, RGBA_Image*);
-static Eina_Bool negation_filter(Evas_Filter_Info *, RGBA_Image*, RGBA_Image*);
-static Eina_Bool sepia_filter(Evas_Filter_Info *, RGBA_Image*, RGBA_Image*);
-static Eina_Bool greyscale_filter(Evas_Filter_Info*, RGBA_Image*, RGBA_Image*);
-static Eina_Bool brightness_filter(Evas_Filter_Info*, RGBA_Image*, RGBA_Image*);
-static Eina_Bool contrast_filter(Evas_Filter_Info *, RGBA_Image*, RGBA_Image*);
-
-struct filterinfo filterinfo[] =
-{
-   /* None */
-   { NULL, 0, NULL, NULL, EINA_FALSE},
-   /* Blur */
-   { gaussian_filter, sizeof(Evas_Filter_Info_Blur), blur_size_get, gaussian_key_get, EINA_TRUE },
-   /* Negation */
-   { negation_filter, 0, NULL, NULL, EINA_FALSE },
-   /* Sepia */
-   { sepia_filter, 0, NULL, NULL, EINA_FALSE },
-   /* Greyscale */
-   { greyscale_filter, sizeof(Evas_Filter_Info_GreyScale), NULL, NULL, EINA_FALSE },
-   /* Brightness */
-   { brightness_filter, sizeof(Evas_Filter_Info_Brightness), NULL, NULL, EINA_FALSE },
-   /* Contrast */
-   { contrast_filter, sizeof(Evas_Filter_Info_Contrast), NULL, NULL, EINA_FALSE},
-};
-
-
-static struct fieldinfo blurfields[] =
-{
-   { "quality",  TYPE_FLOAT, offsetof(Evas_Filter_Info_Blur, quality) },
-   { "radius",  TYPE_INT, offsetof(Evas_Filter_Info_Blur, radius) },
-   { NULL, 0, 0 },
-};
-
-static struct fieldinfo greyfields[] =
-{
-   { "red",  TYPE_FLOAT, offsetof(Evas_Filter_Info_GreyScale, r) },
-   { "green",  TYPE_FLOAT, offsetof(Evas_Filter_Info_GreyScale, g) },
-   { "blue",  TYPE_FLOAT, offsetof(Evas_Filter_Info_GreyScale, b) },
-
-   { "all",  TYPE_FLOAT, offsetof(Evas_Filter_Info_GreyScale, r) },
-   { "all",  TYPE_FLOAT, offsetof(Evas_Filter_Info_GreyScale, g) },
-   { "all",  TYPE_FLOAT, offsetof(Evas_Filter_Info_GreyScale, b) },
-   { NULL, 0, 0 },
-};
-
-static struct fieldinfo brightnessfields[] =
-{
-   { "adjust",  TYPE_FLOAT, offsetof(Evas_Filter_Info_Brightness, adjust) },
-   { NULL, 0, 0 },
-};
-
-static struct fieldinfo contrastfields[] =
-{
-   { "adjust",  TYPE_FLOAT, offsetof(Evas_Filter_Info_Contrast, adjust) },
-   { NULL, 0, 0 },
-};
-
-static struct fieldinfo *filterfields[] =
-{
-   NULL,
-   blurfields,
-   NULL,
-   NULL,
-   greyfields,
-   brightnessfields,
-   contrastfields,
-};
-
-static Evas_Filter_Info *filter_alloc(Evas_Object *o);
-
-EAPI Eina_Bool
-evas_object_filter_mode_set(Evas_Object *o, Evas_Filter_Mode mode)
-{
-   Evas_Filter_Info *info;
-
-   MAGIC_CHECK(o, Evas_Object, MAGIC_OBJ);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-
-   if ((mode != EVAS_FILTER_MODE_OBJECT) && (mode != EVAS_FILTER_MODE_BELOW))
-      return EINA_FALSE;
-
-   if (!o->filter)
-     {
-        filter_alloc(o);
-     }
-   if (!o->filter) return EINA_FALSE;
-   info = o->filter;
-
-   if (info->mode == mode) return EINA_TRUE; /* easy case */
-   info->mode = mode;
-   info->dirty = 1;
-   return EINA_TRUE;
-}
-
-EAPI Evas_Filter_Mode
-evas_object_filter_mode_get(Evas_Object *o)
-{
-   MAGIC_CHECK(o, Evas_Object, MAGIC_OBJ);
-   return EVAS_FILTER_MODE_OBJECT;
-   MAGIC_CHECK_END();
-
-   if (!o->filter) return EVAS_FILTER_MODE_OBJECT;
-   return o->filter->mode;
-}
-
-EAPI Eina_Bool
-evas_object_filter_set(Evas_Object *o, Evas_Filter filter)
-{
-   Evas_Filter_Info *info;
-   struct filterinfo *finfo;
-
-   MAGIC_CHECK(o, Evas_Object, MAGIC_OBJ);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-
-   /* force filter to be signed: else gcc complains, but enums may always be
-    * signed */
-   if (((int)filter < (int)EVAS_FILTER_NONE) || (filter > EVAS_FILTER_LAST))
-      return EINA_FALSE;
-
-   /* Don't alloc on no-op */
-   if (!o-filter && filter == EVAS_FILTER_NONE) return EINA_TRUE;
-
-   if (!o->filter) filter_alloc(o);
-   if (!o->filter) return EINA_FALSE;
-
-   info = o->filter;
-
-   if (info->filter == filter) return EINA_TRUE;
-
-   finfo = filterinfo + filter;
-   info->filter = filter;
-   info->dirty = 1;
-   if (info->data)
-     {
-        if (info->data_free)
-           info->data_free(info->data);
-        else
-           free(info->data);
-     }
-   info->datalen = finfo->datasize;
-   if (finfo->datasize)
-     {
-        info->data = calloc(1, finfo->datasize);
-        if (!info->data)
-          {
-             o->filter = EVAS_FILTER_NONE;
-             return EINA_FALSE;
-          }
-     }
-   else
-      info->data = NULL;
-   info->data_free = NULL;
-
-   return EINA_TRUE;
-}
-
-EAPI Evas_Filter
-evas_object_filter_get(Evas_Object *o)
-{
-   MAGIC_CHECK(o, Evas_Object, MAGIC_OBJ);
-   return EVAS_FILTER_NONE;
-   MAGIC_CHECK_END();
-
-   if (!o->filter) return EVAS_FILTER_NONE;
-   return o->filter->filter;
-}
-
-EAPI Eina_Bool
-evas_object_filter_param_int_set(Evas_Object *o, const char *param, int val)
-{
-   char *data;
-   const struct fieldinfo *fields;
-   Eina_Bool found;
-   int i;
-
-   MAGIC_CHECK(o, Evas_Object, MAGIC_OBJ);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-
-   if ((!o->filter) || (!o->filter->data)) return EINA_FALSE;
-
-   fields = filterfields[o->filter->filter];
-   data = o->filter->data;
-   found = EINA_FALSE;
-   for (i = 0; fields[i].field; i++)
-     {
-        if (!strcmp(fields[i].field, param))
-          {
-             if (fields[i].type != TYPE_INT) continue;
-             *(int *)(data + fields[i].offset) = val;
-             o->filter->dirty = 1;
-             evas_object_change(o);
-             found = EINA_TRUE;
-          }
-     }
-   return found;
-}
-
-EAPI int
-evas_object_filter_param_int_get(Evas_Object *o, const char *param)
-{
-   char *data;
-   const struct fieldinfo *fields;
-   int val;
-   int i;
-
-   MAGIC_CHECK(o, Evas_Object, MAGIC_OBJ);
-   return -1;
-   MAGIC_CHECK_END();
-
-   if ((!o->filter) || (!o->filter->data)) return -1;
-
-   fields = filterfields[o->filter->filter];
-   if (!fields) return -1;
-   data = o->filter->data;
-
-   for (i = 0; fields[i].field; i++)
-     {
-        if (!strcmp(fields[i].field, param))
-          {
-             if (fields[i].type != TYPE_INT) continue;
-             val = *(int *)(data + fields[i].offset);
-             return val;
-          }
-     }
-   return -1;
-}
-
-EAPI Eina_Bool
-evas_object_filter_param_str_set(Evas_Object *o __UNUSED__,
-                                 const char *param __UNUSED__,
-                                 const char *val __UNUSED__)
-{
-   return EINA_FALSE;
-}
-
-EAPI const char *
-evas_object_filter_param_str_get(Evas_Object *o __UNUSED__,
-                                 const char *param __UNUSED__)
-{
-   return NULL;
-}
-
-EAPI Eina_Bool
-evas_object_filter_param_obj_set(Evas_Object *o __UNUSED__,
-                                 const char *param __UNUSED__,
-                                 Evas_Object *val __UNUSED__)
-{
-   return EINA_FALSE;
-}
-
-EAPI Evas_Object *
-evas_object_filter_param_obj_get(Evas_Object *o __UNUSED__,
-                                 const char *param __UNUSED__)
-{
-   return NULL;
-}
-
-EAPI Eina_Bool
-evas_object_filter_param_float_set(Evas_Object *o, const char *param,
-                                   double val)
-{
-   char *data;
-   const struct fieldinfo *fields;
-   int i;
-   Eina_Bool rv;
-
-   MAGIC_CHECK(o, Evas_Object, MAGIC_OBJ);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-
-   if ((!o->filter) || (!o->filter->data)) return EINA_FALSE;
-
-   rv = EINA_FALSE;
-   fields = filterfields[o->filter->filter];
-   if (!fields) return EINA_FALSE;
-
-   data = o->filter->data;
-
-   for (i = 0; fields[i].field; i++)
-     {
-        if (!strcmp(fields[i].field, param))
-          {
-             if (fields[i].type != TYPE_FLOAT) continue;
-             *(double *)(data + fields[i].offset) = val;
-             o->filter->dirty = 1;
-             o->changed = 1;
-             evas_object_change(o);
-             rv = EINA_TRUE;
-          }
-     }
-   return rv;
-}
-
-EAPI double
-evas_object_filter_param_float_get(Evas_Object *o, const char *param)
-{
-   char *data;
-   const struct fieldinfo *fields;
-   double val;
-   int i;
-
-   MAGIC_CHECK(o, Evas_Object, MAGIC_OBJ);
-   return -1;
-   MAGIC_CHECK_END();
-
-   if ((!o->filter) || (!o->filter->data)) return -1;
-
-   fields = filterfields[o->filter->filter];
-   if (!fields) return -1;
-   data = o->filter->data;
-
-   for (i = 0; fields[i].field; i++)
-     {
-        if (!strcmp(fields[i].field, param))
-          {
-             if (fields[i].type != TYPE_FLOAT) continue;
-             val = *(double *)(data + fields[i].offset);
-             return val;
-          }
-     }
-   return -1;
-}
-
-
-
-
-
-/*
- * Internal call
- */
-int
-evas_filter_get_size(Evas_Filter_Info *info, int inw, int inh,
-                     int *outw, int *outh, Eina_Bool inv)
-{
-   if (!info) return -1;
-   if ((!outw) && (!outh)) return 0;
-
-   if (filterinfo[info->filter].sizefn)
-      return filterinfo[info->filter].sizefn(info, inw, inh, outw, outh, inv);
-
-   if (outw) *outw = inw;
-   if (outh) *outh = inh;
-   return 0;
-}
-
-Eina_Bool
-evas_filter_always_alpha(Evas_Filter_Info *info)
-{
-   if (!info) return EINA_FALSE;
-   return filterinfo[info->filter].alwaysalpha;
-}
-
-/*
- * Another internal call:
- *    Given a filterinfo, generate a unique key for it
- *
- * For simple filters, it's just the filter type.
- * for more complex filters, it's the type, with it's params.
- *
- * Note management of the key data is up to the caller, that is it should
- * probably be freed after use.
- *
- * Note the automatic fallback generation places the single byte at the end so
- * the memcpy will be aligned.  Micro-optimisations FTW!
- *
- * @param info Filter info to generate from
- * @param len Length of the buffer returned.
- * @return key Key buffer
- */
-uint8_t *
-evas_filter_key_get(const Evas_Filter_Info *info, uint32_t *lenp)
-{
-   struct filterinfo *finfo;
-   uint8_t *key;
-   int len;
-
-   if (!info) return NULL;
-
-   finfo = filterinfo + info->filter;
-   if (finfo->keyfn) return finfo->keyfn(info, lenp);
-
-   len = 1 + finfo->datasize;
-   key = malloc(len);
-   if (!key) return NULL;
-   if (finfo->datasize) memcpy(key, info->data, finfo->datasize);
-   key[finfo->datasize] = info->filter;
-   if (lenp) *lenp = len;
-   return key;
-}
-
-Evas_Software_Filter_Fn
-evas_filter_software_get(Evas_Filter_Info *info)
-{
-   return filterinfo[info->filter].filter;
-}
-
-void
-evas_filter_free(Evas_Object *o)
-{
-   if (!o->filter) return;
-   if (o->filter->key) free(o->filter->key);
-   free(o->filter);
-   o->filter = NULL;
-}
-
-
-
-
-/*
- * Private calls
- */
-static Evas_Filter_Info *
-filter_alloc(Evas_Object *o)
-{
-   Evas_Filter_Info *info;
-
-   if (!o) return NULL;
-   info = calloc(1,sizeof(struct Evas_Filter_Info));
-   if (!info) return NULL;
-   info->dirty = 1;
-   info->filter = EVAS_FILTER_NONE;
-   info->mode = EVAS_FILTER_MODE_OBJECT;
-   info->datalen = 0;
-
-   o->filter = info;
-
-   return info;
-}
-
-static int
-blur_size_get(Evas_Filter_Info *info, int inw, int inh, int *outw, int *outh,
-              Eina_Bool inv)
-{
-   Evas_Filter_Info_Blur *blur = info->data;
-
-   if (inv)
-     {
-        if (outw) *outw = MAX(inw - (blur->radius * 2), 0);
-        if (outh) *outh = MAX(inh - (blur->radius * 2), 0);
-     }
-   else
-     {
-        if (outw) *outw = inw + (blur->radius * 2);
-        if (outh) *outh = inh + (blur->radius * 2);
-     }
-   return 0;
-}
-
-/*
- * Generate a key for the Gaussian generator.
- *
- * The size is:
- *    - 1 byte for the type (blur)
- *    - 1 byte for the quality (0-1 -> 0-255)
- *    - 2 bytes for radius (max is 508 anyway)
- *
- * @param info Filter info
- * @param len Length of the returned buffer
- * @return new buffer
- */
-static uint8_t *
-gaussian_key_get(const Evas_Filter_Info *info, uint32_t *lenp)
-{
-   struct Evas_Filter_Info_Blur *blur;
-   uint8_t *key;
-
-   if ((!info) || (!info->data)) return NULL;
-   blur = info->data;
-
-   if (lenp) *lenp = 4;
-   key = malloc(4);
-   if (!key) return NULL;
-   key[0] = EVAS_FILTER_BLUR;
-   key[1] = blur->quality * 255;
-   key[2] = blur->radius >> 8;
-   key[3] = blur->radius;
-
-   return key;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-/**
- * Software implementations
- */
-#define all(OP, A, R, G, B, W, I) \
-   do { \
-      A OP A_VAL(I) * W; \
-      R OP R_VAL(I) * W; \
-      G OP G_VAL(I) * W; \
-      B OP B_VAL(I) * W; \
-   } while (0)
-#define wavg(x,n)        (((x) / (n)) & 0xff)
-#define wavgd(x,n)       ((uint32_t)((x) / (n)) & 0xff)
-
-typedef int (*FilterH)(int, uint32_t *, int, uint32_t *);
-typedef int (*FilterV)(int, uint32_t *, int, int, uint32_t *);
-
-static int gaussian_filter_h(int rad, uint32_t *in, int w, uint32_t *out);
-static int gaussian_filter_h64(int rad, uint32_t *in, int w, uint32_t *out);
-static int gaussian_filter_hd(int rad, uint32_t *in, int w, uint32_t *out);
-static int gaussian_filter_v(int rad, uint32_t *in, int h, int skip, uint32_t *out);
-static int gaussian_filter_v64(int rad, uint32_t *in, int h, int skip, uint32_t *out);
-static int gaussian_filter_vd(int rad, uint32_t *in, int h, int skip, uint32_t *out);
-static const uint32_t *gaussian_row_get(int row, int *npoints, uint32_t *weight);
-static const uint64_t *gaussian_row_get64(int row, int *npoints, uint64_t *weight);
-static const double *gaussian_row_getd(int row, int *npoints, double *weight);
-
-static Eina_Bool
-gaussian_filter(Evas_Filter_Info *filter, RGBA_Image *src, RGBA_Image *dst)
-{
-   int i;
-   uint32_t nw, nh;
-   uint32_t *in, *tmp, *out;
-   FilterV filter_v = gaussian_filter_v;
-   FilterH filter_h = gaussian_filter_h;
-   Evas_Filter_Info_Blur *blur;
-   int w, h;
-
-   blur = filter->data;
-
-   /* Use 64 bit version if we are going to overflow */
-   if (blur->radius > 508) /** too big for doubles: Bail out */
-      return EINA_FALSE;
-   else if (blur->radius > 28)
-     {
-        filter_v = gaussian_filter_vd;
-        filter_h = gaussian_filter_hd;
-     } 
-   else if (blur->radius > 12)
-     {
-        filter_v = gaussian_filter_v64;
-        filter_h = gaussian_filter_h64;
-     }
-   
-   w = src->cache_entry.w;
-   h = src->cache_entry.h;
-   in = src->image.data;
-   
-   if (!in) return EINA_FALSE;
-   
-   nw = w + (2 * blur->radius);
-   nh = h + (2 * blur->radius);
-   
-   out = dst->image.data;
-   if (!out) return EINA_FALSE;
-   tmp = malloc(nw * h * sizeof(uint32_t));
-   
-   for (i = 0; i < h; i++)
-      filter_h(blur->radius,in + (i * w), w, tmp + (i * nw));
-   
-   for (i = 0; i < (int)nw; i++)
-      filter_v(blur->radius,tmp + i, h, nw, out + i);
-
-   free(tmp);
-   return EINA_TRUE;
-}
-
-/* Blur only horizontally */
-static int
-gaussian_filter_h(int rad, uint32_t *in, int w, uint32_t *out)
-{
-   const uint32_t *points;
-   int npoints = 0;
-   uint32_t weight = 0;
-   int i = 0, k = 0;
-   uint32_t r, g, b, a;
-   
-   /* Get twice the radius: even rows have 1 element */
-   points = gaussian_row_get(rad * 2, &npoints, &weight);
-   for (i = -rad; i < (w + rad); i++)
-     {
-        r = g = b = a = 0;
-        for (k = -rad; k <= rad; k++)
-          {
-             if ((k + i) < 0) continue;
-             if ((k + i) >= w) continue;
-             all(+=, a, r, g, b, points[k + rad], in + k + i);
-          }
-        *(out) = ARGB_JOIN(wavg(a, weight),
-                           wavg(r, weight),
-                           wavg(g, weight),
-                           wavg(b, weight));
-        out++;
-     }
-   return 0;
-}
-
-/* Blur only horizontally */
-static int
-gaussian_filter_hd(int rad, uint32_t *in, int w, uint32_t *out)
-{
-   const double *points;
-   int npoints = 0;
-   double weight = 0.0;
-   int i = 0, k = 0;
-   double r, g, b, a;
-
-   /* Get twice the radius: even rows have 1 element */
-   points = gaussian_row_getd(rad * 2, &npoints, &weight);
-   for (i = -rad; i < (w + rad); i++)
-     {
-        r = g = b = a = 0;
-        for (k = -rad; k <= rad; k++)
-          {
-             if ((k + i) < 0) continue;
-             if ((k + i) >= w) continue;
-             all(+=, a, r, g, b, points[k + rad], in + k + i);
-          }
-        *(out) = ARGB_JOIN(wavgd(a, weight),
-                           wavgd(r, weight),
-                           wavgd(g, weight),
-                           wavgd(b, weight));
-        out++;
-   }
-   return 0;
-}
-
-
-/* Blur only horizontally */
-static int
-gaussian_filter_h64(int rad, uint32_t *in, int w, uint32_t *out)
-{
-   const uint64_t *points;
-   int npoints = 0;
-   uint64_t weight = 0;
-   int i = 0, k = 0;
-   uint64_t r, g, b, a;
-
-   /* Get twice the radius: even rows have 1 element */
-   points = gaussian_row_get64(rad * 2, &npoints, &weight);
-   for (i = -rad ; i < w + rad; i ++){
-      r = g = b = a = 0;
-      for (k = -rad ; k <= rad ; k ++){
-         if ((k + i) < 0) continue;
-         if ((k + i) >= w) continue;
-         all(+=, a, r, g, b, points[k + rad], in + k + i);
-      }
-      *(out) = ARGB_JOIN(wavg(a, weight),
-                         wavg(r, weight),
-                         wavg(g, weight),
-                         wavg(b, weight));
-      out++;
-   }
-   return 0;
-}
-
-static int
-gaussian_filter_v(int rad, uint32_t *in, int h, int skip, uint32_t *out)
-{
-   const uint32_t *points;
-   int npoints = 0;
-   uint32_t weight = 0;
-   int i = 0, k = 0;
-   uint32_t r, g, b, a;
-
-   /* Get twice the radius: even rows have 1 element */
-   points = gaussian_row_get(rad * 2, &npoints, &weight);
-   weight = 0;
-   for (i = 0; i < npoints; i++) weight += points[i];
-
-   for (i = -rad; i < (h + rad); i++)
-     {
-        r = g = b = a = 0;
-        for (k = -rad; k <= rad; k++)
-          {
-             if ((k + i) < 0) continue;
-             if ((k + i) >= h) continue;
-             all(+=, a, r, g, b, points[k + rad], in + (skip * (k + i)));
-          }
-        *(out) = ARGB_JOIN(wavg(a, weight),
-                           wavg(r, weight),
-                           wavg(g, weight),
-                           wavg(b, weight));
-        out += skip;
-     }
-   return 0;
-}
-
-static int
-gaussian_filter_v64(int rad, uint32_t *in, int h, int skip, uint32_t *out)
-{
-   const uint64_t *points;
-   int npoints = 0;
-   uint64_t weight;
-   int i = 0, k = 0;
-   uint64_t r, g, b, a;
-
-   /* Get twice the radius: even rows have 1 element */
-   points = gaussian_row_get64(rad * 2, &npoints, &weight);
-   weight = 0;
-   for (i = 0; i < npoints; i++) weight += points[i];
-
-   for (i = -rad; i < (h + rad); i++)
-     {
-        r = g = b = a = 0;
-        for (k = -rad ; k <= rad ; k++)
-          {
-             if ((k + i) < 0) continue;
-             if ((k + i) >= h) continue;
-             all(+=, a, r, g, b, points[k + rad], in + (skip * (k + i)));
-          }
-        *(out) = ARGB_JOIN(wavg(a, weight),
-                           wavg(r, weight),
-                           wavg(g, weight),
-                           wavg(b, weight));
-        out += skip;
-     }
-   return 0;
-}
-
-static int
-gaussian_filter_vd(int rad, uint32_t *in, int h, int skip, uint32_t *out)
-{
-   const double *points;
-   int npoints = 0;
-   double weight = 0.0;
-   int i = 0, k = 0;
-   double r, g, b, a;
-
-   /* Get twice the radius: even rows have 1 element */
-   points = gaussian_row_getd(rad * 2, &npoints, &weight);
-   weight = 0;
-   for (i = 0 ; i < npoints ; i ++) weight += points[i];
-
-   for (i = -rad ; i < h + rad; i ++)
-     {
-        r = g = b = a = 0;
-        for (k = -rad ; k <= rad ; k ++)
-          {
-             if ((k + i) < 0) continue;
-             if ((k + i) >= h) continue;
-             all(+=, a, r, g, b, points[k + rad], in + (skip * (k + i)));
-          }
-        *(out) = ARGB_JOIN(wavgd(a, weight),
-                           wavgd(r, weight),
-                           wavgd(g, weight),
-                           wavgd(b, weight));
-        out += skip;
-     }
-   return 0;
-}
-
-static const uint32_t *
-gaussian_row_get(int row, int *npoints, uint32_t *weight)
-{
-   static uint32_t *points = NULL;
-   static int last = -1;
-   static uint32_t lastweight = -1;
-   int c, k;
-
-   if (row < 0) return NULL;
-
-   if (npoints) *npoints = row + 1;
-
-   if (last == row)
-     {
-        if (weight) *weight = lastweight;
-        return points;
-     }
-   if (points) free(points);
-
-   points = malloc((row + 1) * sizeof(uint32_t));
-   if (!points)
-     {
-        last = -1;
-        return NULL;
-     }
-   last = row;
-
-   c = 1;
-   for (k = 0; k <= row; k++)
-     {
-        points[k] = c;
-        c = c * (row - k) / (k + 1);
-     }
-
-   for (k = 0, lastweight = 0; k <= row; k++) lastweight += points[k];
-   if (weight) *weight = lastweight;
-   return points;
-}
-
-static const uint64_t *
-gaussian_row_get64(int row, int *npoints, uint64_t *weight)
-{
-   static uint64_t *points = NULL;
-   static int last = -1;
-   static uint64_t lastweight = -1;
-   uint64_t c;
-   int k;
-
-   if (row < 0) return NULL;
-
-   if (npoints) *npoints = row + 1;
-   if (last == row)
-     {
-        if (weight) *weight = lastweight;
-        return points;
-     }
-   if (points) free(points);
-   
-   points = malloc((row + 1) * sizeof(uint64_t));
-   if (!points)
-     {
-        last = -1;
-        return NULL;
-     }
-   last = row;
-   
-   c = 1;
-   for (k = 0; k <= row; k++)
-     {
-        points[k] = c;
-        c = c * (row - k) / (k + 1);
-     }
-   
-   for (k = 0, lastweight = 0; k <= row; k ++) lastweight += points[k];
-   if (weight) *weight = lastweight;
-   
-   return points;
-}
-
-static const double *
-gaussian_row_getd(int row, int *npoints, double *weight)
-{
-   static double *points = NULL;
-   static int last = -1;
-   static double lastweight = -1;
-   double c;
-   int k;
-   
-   if (row < 0) return NULL;
-   
-   if (last == row)
-     {
-        if (weight) *weight = lastweight;
-        return points;
-     }
-   
-   if (points) free(points);
-   points = malloc((row + 1) * sizeof(double));
-   if (!points)
-     {
-        last = -1;
-        return NULL;
-     }
-   last = row;
-   
-   if (npoints) *npoints = row + 1;
-   
-   c = 1;
-   for (k = 0; k <= row; k++)
-     {
-        points[k] = c;
-        c = c * (row - k) / (k + 1);
-     }
-   
-   for (k = 0, lastweight = 0; k <= row; k++) lastweight += points[k];
-   if (weight) *weight = lastweight;
-   
-   return points;
-}
-
-#if BUILD_NEON0
-static Eina_Bool
-negation_filter_neon(Evas_Filter_Info *info, RGBA_Image *src, RGBA_Image *dst)
-{
-   uint32_t tmp;
-
-   if (src->cache_entry.flags.alpha)
-     {
-        // FIXME: not implemented
-     }
-   else
-     {
-        /* No alpha */
-#define AP  "NEG_FILTER_NA"
-        asm volatile (
-
-           ".fpu neon                                       \n\t"
-           "vdup.u32    q14,   $0xff000000                   \n\t"
-           "vmvn.u32    q15,   q1                            \n\t"
-
-           // fixme: do check for small loops
-           AP"loopinit:                                     \n\t"
-               "sub     %[tmp], %[e], #31                   \n\t"
-
-           AP"loop:                                         \n\t"
-               "vldm    %[s]!,    {d0,d1,d2,d3}             \n\t"
-               "vand    q2,   q0, q15                       \n\t"
-               "vand    q3,   q1, q15                       \n\t"
-               "vand    q4,   q0, q14                       \n\t"
-               "vand    q5,   q1, q14                       \n\t"
-                        // fixme: can i do this with xor
-               "cmp     %[tmp], %[s]                        \n\t"
-
-               "vmvn    q6,   q2                            \n\t"
-               "vmvn    q7,   q3                            \n\t"
-
-               "vorr     q0,   q6,q4                         \n\t"
-               "vorr     q1,   q7,q5                         \n\t"
-
-               "vstm    %[d]!,  {d0,d1,d2,d3}               \n\t"
-
-               "bhi     "AP"loop                            \n\t"
-
-            : // no out
-            : // input
-               [e] "r" (src->image.data+ src->cache_entry.w*src->cache_entry.h),
-               [s] "r" (src->image.data),
-               [tmp] "r" (tmp),
-               [d] "r" (dst->image.data)
-            : "q0", "q1", "q2", "q3", "q4", "q5", "q6", "q7", "q14", "q15",
-                  "memory"
-         );
-#undef AP
-     }
-   return EINA_TRUE;
-}
-#endif
-
-static Eina_Bool
-negation_filter(Evas_Filter_Info *info, RGBA_Image *src, RGBA_Image *dst)
-{
-   uint32_t *in, *out;
-   int i,j;
-   int w,h;
-   uint32_t a;
-   uint8_t r,g,b;
-
-#if BUILD_NEON0
-   if (evas_common_cpu_has_feature(CPU_FEATURE_NEON) &&
-      (!src->cache_entry.flags.alpha))
-      return negation_filter_neon(info, src, dst);
-#endif
-   
-   in = src->image.data;
-   out = dst->image.data;
-   w = src->cache_entry.w;
-   h = src->cache_entry.h;
-
-   if (src->cache_entry.flags.alpha)
-     {
-        for (i = 0; i < h; i++)
-          {
-             for (j = 0; j < w; j++)
-               {
-                  a = A_VAL(in);
-                  r = R_VAL(in);
-                  g = G_VAL(in);
-                  b = B_VAL(in);
-                  *out = ARGB_JOIN(a, a - r, a - g, a - b);
-                  out++;
-                  in++;
-               }
-          }
-     }
-   else
-     {
-        for (i = 0; i < h; i++)
-          {
-             for (j = 0; j < w; j++)
-               {
-                  a = A_VAL(in);
-                  r = R_VAL(in);
-                  g = G_VAL(in);
-                  b = B_VAL(in);
-                  *out = ARGB_JOIN(a, ~r, ~g, ~b);
-                  out++;
-                  in++;
-               }
-          }
-     }
-   return EINA_TRUE;
-   info = NULL;
-}
-
-static Eina_Bool
-sepia_filter(Evas_Filter_Info *info __UNUSED__, RGBA_Image *src, RGBA_Image *dst)
-{
-   uint32_t *in, *out;
-   int i, j;
-   int w, h;
-   uint32_t a, r, g, b, nr, ng, nb;
-
-   in = src->image.data;
-   out = dst->image.data;
-   w = src->cache_entry.w;
-   h = src->cache_entry.h;
-
-   for (i = 0; i < h; i++)
-     {
-        for (j = 0; j < w; j++)
-          {
-             a = A_VAL(in);
-             r = R_VAL(in);
-             g = G_VAL(in);
-             b = B_VAL(in);
-             nr = ((uint32_t)((r * 0.393) + (g * 0.769) + (b * 0.189)));
-             ng = ((uint32_t)((r * 0.349) + (g * 0.686) + (b * 0.168)));
-             nb = ((uint32_t)((r * 0.272) + (g * 0.534) + (b * 0.131)));
-             if (nr > 255) nr = 255;
-             if (ng > 255) ng = 255;
-             if (nb > 255) nb = 255;
-             *out = ARGB_JOIN(a, nr, ng, nb);
-             out++;
-             in++;
-          }
-     }
-
-   return EINA_TRUE;
-
-}
-
-static Eina_Bool
-greyscale_filter(Evas_Filter_Info *info __UNUSED__, RGBA_Image *src, RGBA_Image *dst)
-{
-   uint32_t *in, *out;
-   int i, j;
-   int w, h;
-   uint32_t cur;
-   uint32_t a, r, g, b;
-
-   in = src->image.data;
-   out = dst->image.data;
-   w = src->cache_entry.w;
-   h = src->cache_entry.h;
-
-   if (src->cache_entry.flags.alpha)
-     {
-        for (i = 0; i < h; i++)
-          {
-             for (j = 0; j < w; j++)
-               {
-                  a = A_VAL(in);
-                  r = R_VAL(in);
-                  g = G_VAL(in);
-                  b = B_VAL(in);
-                  cur = (r * 0.3) + (g * 0.59) + (b * 0.11);
-                  *out = ARGB_JOIN(a, r, g, b);
-                  out++;
-                  in++;
-               }
-          }
-     }
-   else
-     {
-        for (i = 0 ; i < h ; i ++)
-          {
-             for (j = 0; j < w ; j ++)
-               {
-                  r = R_VAL(in);
-                  g = G_VAL(in);
-                  b = B_VAL(in);
-                  cur = r * 0.3 + g * 0.59 + b * 0.11;
-                  *out = ARGB_JOIN(255, r, g, b);
-                  out++;
-                  in++;
-               }
-          }
-     }
-   return EINA_TRUE;
-}
-
-static Eina_Bool
-brightness_filter(Evas_Filter_Info *info, RGBA_Image *src, RGBA_Image *dst)
-{
-   uint32_t *in, *out;
-   int i, j;
-   int w, h;
-   int a,r,g,b;
-   int delta;
-   int adjdelta;
-   Evas_Filter_Info_Brightness *bness;
-
-   in = src->image.data;
-   out = dst->image.data;
-   w = src->cache_entry.w;
-   h = src->cache_entry.h;
-   bness = info->data;
-
-   delta = bness->adjust * 255;
-   if (delta > 255)
-      delta = 255;
-   else if (delta < -255)
-      delta = -255;
-
-   /* Note we could optimise the -255, 0 and 255 cases, but why would people
-    * be doing that */
-   if (delta >= 0)
-     {
-       for (i = 0; i < h; i++)
-         {
-            for (j = 0; j < w; j++)
-              {
-                 a = A_VAL(in);
-                 r = R_VAL(in);
-                 g = G_VAL(in);
-                 b = B_VAL(in);
-                 adjdelta = (a * delta) >> 8;
-                 r = MIN(r + adjdelta, a);
-                 g = MIN(g + adjdelta, a);
-                 b = MIN(b + adjdelta, a);
-                 *out = ARGB_JOIN(a, r ,g, b);
-                 out++;
-                 in++;
-              }
-         }
-     }
-   else
-     {
-        /* Delta negative */
-        for (i = 0; i < h; i++)
-          {
-             for (j = 0; j < w; j++)
-               {
-                  a = A_VAL(in);
-                  r = R_VAL(in);
-                  g = G_VAL(in);
-                  b = B_VAL(in);
-                  adjdelta = (a * delta) >> 8;
-                  r = MAX(r + adjdelta, 0);
-                  g = MAX(g + adjdelta, 0);
-                  b = MAX(b + adjdelta, 0);
-                  *out = ARGB_JOIN(a, r ,g, b);
-                  out++;
-                  in++;
-               }
-          }
-     }
-
-   return EINA_TRUE;
-
-}
-
-static Eina_Bool
-contrast_filter(Evas_Filter_Info *info __UNUSED__, RGBA_Image *src, RGBA_Image *dst)
-{
-   uint32_t *in, *out;
-   int i, j;
-   int w, h;
-
-   in = src->image.data;
-   out = dst->image.data;
-   w = src->cache_entry.w;
-   h = src->cache_entry.h;
-
-   for (i = 0; i < h; i++)
-     {
-        for (j = 0; j < w; j++)
-          {
-             // FIXME: not even implemented
-             out++;
-             in++;
-          }
-     }
-
-   return EINA_TRUE;
-
-}
-#endif
-
-/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/
diff --git a/libraries/evas/src/lib/canvas/evas_focus.c b/libraries/evas/src/lib/canvas/evas_focus.c
deleted file mode 100644
index 29da7e7..0000000
--- a/libraries/evas/src/lib/canvas/evas_focus.c
+++ /dev/null
@@ -1,61 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-
-/* private calls */
-
-/* local calls */
-
-/* public calls */
-
-EAPI void
-evas_object_focus_set(Evas_Object *obj, Eina_Bool focus)
-{
-   int event_id = 0;
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-
-   _evas_object_event_new();
-
-   event_id = _evas_event_counter;
-   if (focus)
-     {
-        if (obj->focused) goto end;
-        if (obj->layer->evas->focused)
-          evas_object_focus_set(obj->layer->evas->focused, 0);
-        obj->focused = 1;
-        obj->layer->evas->focused = obj;
-        evas_object_event_callback_call(obj, EVAS_CALLBACK_FOCUS_IN, NULL, event_id);
-        evas_event_callback_call(obj->layer->evas,
-                                 EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN, obj);
-     }
-   else
-     {
-        if (!obj->focused) goto end;
-        obj->focused = 0;
-        obj->layer->evas->focused = NULL;
-        evas_object_event_callback_call(obj, EVAS_CALLBACK_FOCUS_OUT, NULL, event_id);
-        evas_event_callback_call(obj->layer->evas,
-                                 EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT, obj);
-     }
-   end:
-   _evas_post_event_callback_call(obj->layer->evas);
-}
-
-EAPI Eina_Bool
-evas_object_focus_get(const Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   return obj->focused;
-}
-
-EAPI Evas_Object *
-evas_focus_get(const Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return NULL;
-   MAGIC_CHECK_END();
-   return e->focused;
-}
diff --git a/libraries/evas/src/lib/canvas/evas_font_dir.c b/libraries/evas/src/lib/canvas/evas_font_dir.c
deleted file mode 100644
index e97f7f7..0000000
--- a/libraries/evas/src/lib/canvas/evas_font_dir.c
+++ /dev/null
@@ -1,1349 +0,0 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef HAVE_EVIL
-# include <Evil.h>
-#endif
-
-#ifdef BUILD_FONT_LOADER_EET
-#include <Eet.h>
-#endif
-
-#ifdef HAVE_FONTCONFIG
-#include <fontconfig/fontconfig.h>
-#endif
-
-#include "evas_common.h"
-#include "evas_private.h"
-
-/* font dir cache */
-static Eina_Hash *font_dirs = NULL;
-static Eina_List *fonts_cache = NULL;
-static Eina_List *fonts_zero = NULL;
-
-typedef struct _Fndat Fndat;
-
-struct _Fndat
-{
-   Evas_Font_Description *fdesc;
-   const char      *source;
-   Evas_Font_Size   size;
-   Evas_Font_Set   *font;
-   int              ref;
-   Font_Rend_Flags  wanted_rend;
-
-#ifdef HAVE_FONTCONFIG
-   FcFontSet *set;
-   FcPattern *p_nm;
-#endif
-};
-
-/* private methods for font dir cache */
-static Eina_Bool font_cache_dir_free(const Eina_Hash *hash, const void *key, void *data, void *fdata);
-static Evas_Font_Dir *object_text_font_cache_dir_update(char *dir, Evas_Font_Dir *fd);
-static Evas_Font *object_text_font_cache_font_find_x(Evas_Font_Dir *fd, char *font);
-static Evas_Font *object_text_font_cache_font_find_file(Evas_Font_Dir *fd, char *font);
-static Evas_Font *object_text_font_cache_font_find_alias(Evas_Font_Dir *fd, char *font);
-static Evas_Font *object_text_font_cache_font_find(Evas_Font_Dir *fd, char *font);
-static Evas_Font_Dir *object_text_font_cache_dir_add(char *dir);
-static void object_text_font_cache_dir_del(char *dir, Evas_Font_Dir *fd);
-static int evas_object_text_font_string_parse(char *buffer, char dest[14][256]);
-
-#ifdef HAVE_FONTCONFIG
-static int fc_init = 0;
-#endif
-
-void
-evas_font_dir_cache_free(void)
-{
-   if (!font_dirs) return;
-
-   eina_hash_foreach(font_dirs, font_cache_dir_free, NULL);
-   eina_hash_free(font_dirs);
-   font_dirs = NULL;
-
-#ifdef HAVE_FONTCONFIG
-/* this is bad i got a:
- * fccache.c:512: FcCacheFini: Assertion fcCacheChains[i] == ((void *)0)' failed.   
- * 
- * all i can do for now is shut this puppy down. butthat breaks, so disable
- * it as in reality - there is little reason to care about the memory not
- * being freed etc.
- * 
- *   fc_init--;
- *   if (fc_init == 0) FcFini();
- */
-#endif
-}
-
-const char *
-evas_font_dir_cache_find(char *dir, char *font)
-{
-   Evas_Font_Dir *fd = NULL;
-
-   if (!font_dirs) font_dirs = eina_hash_string_superfast_new(NULL);
-   else fd = eina_hash_find(font_dirs, dir);
-   fd = object_text_font_cache_dir_update(dir, fd);
-   if (fd)
-     {
-        Evas_Font *fn;
-
-        fn = object_text_font_cache_font_find(fd, font);
-        if (fn)
-          {
-             return fn->path;
-          }
-     }
-   return NULL;
-}
-
-static Eina_List *
-evas_font_set_get(const char *name)
-{
-   Eina_List *fonts = NULL;
-   char *p;
-
-   p = strchr(name, ',');
-   if (!p)
-     {
-        fonts = eina_list_append(fonts, eina_stringshare_add(name));
-     }
-   else
-     {
-        const char *pp;
-        char *nm;
-
-        pp = name;
-        while (p)
-          {
-             nm = alloca(p - pp + 1);
-             strncpy(nm, pp, p - pp);
-             nm[p - pp] = 0;
-             fonts = eina_list_append(fonts, eina_stringshare_add(nm));
-             pp = p + 1;
-             p = strchr(pp, ',');
-             if (!p) fonts = eina_list_append(fonts, eina_stringshare_add(pp));
-          }
-     }
-   return fonts;
-}
-
-void
-evas_fonts_zero_free(Evas *evas)
-{
-   Fndat *fd;
-
-   EINA_LIST_FREE(fonts_zero, fd)
-     {
-        if (fd->fdesc) evas_font_desc_unref(fd->fdesc);
-        if (fd->source) eina_stringshare_del(fd->source);
-        evas->engine.func->font_free(evas->engine.data.output, fd->font);
-#ifdef HAVE_FONTCONFIG
-        if (fd->set) FcFontSetDestroy(fd->set);
-        if (fd->p_nm) FcPatternDestroy(fd->p_nm);
-#endif
-        free(fd);
-     }
-}
-
-void
-evas_fonts_zero_presure(Evas *evas)
-{
-   Fndat *fd;
-
-   while (fonts_zero
-          && eina_list_count(fonts_zero) > 4) /* 4 is arbitrary */
-     {
-        fd = eina_list_data_get(fonts_zero);
-
-        if (fd->ref != 0) break;
-        fonts_zero = eina_list_remove_list(fonts_zero, fonts_zero);
-
-        if (fd->fdesc) evas_font_desc_unref(fd->fdesc);
-        if (fd->source) eina_stringshare_del(fd->source);
-        evas->engine.func->font_free(evas->engine.data.output, fd->font);
-#ifdef HAVE_FONTCONFIG
-        if (fd->set) FcFontSetDestroy(fd->set);
-        if (fd->p_nm) FcPatternDestroy(fd->p_nm);
-#endif
-        free(fd);
-
-        if (eina_list_count(fonts_zero) < 5) break;
-     }
-}
-
-void
-evas_font_free(Evas *evas, void *font)
-{
-   Eina_List *l;
-   Fndat *fd;
-
-   EINA_LIST_FOREACH(fonts_cache, l, fd)
-     {
-        if (fd->font == font)
-          {
-             fd->ref--;
-             if (fd->ref == 0)
-               {
-                  fonts_cache = eina_list_remove_list(fonts_cache, l);
-                  fonts_zero = eina_list_append(fonts_zero, fd);
-               }
-             break;
-          }
-     }
-   while (fonts_zero
-          && eina_list_count(fonts_zero) > 42) /* 42 is arbitrary */
-     {
-        fd = eina_list_data_get(fonts_zero);
-
-        if (fd->ref != 0) break;
-        fonts_zero = eina_list_remove_list(fonts_zero, fonts_zero);
-
-        if (fd->fdesc) evas_font_desc_unref(fd->fdesc);
-        if (fd->source) eina_stringshare_del(fd->source);
-        evas->engine.func->font_free(evas->engine.data.output, fd->font);
-#ifdef HAVE_FONTCONFIG
-        if (fd->set) FcFontSetDestroy(fd->set);
-        if (fd->p_nm) FcPatternDestroy(fd->p_nm);
-#endif
-        free(fd);
-
-        if (eina_list_count(fonts_zero) < 43) break;
-     }
-}
-
-static void
-evas_font_init(void)
-{
-   static int done = 0;
-   if (done) return;
-   done = 1;
-#ifdef HAVE_FONTCONFIG
-   fc_init++;
-   if (fc_init == 1)
-     {
-        FcInit();
-        FcConfigEnableHome(1);
-     }
-#endif
-}
-
-#ifdef HAVE_FONTCONFIG
-static Evas_Font_Set *
-evas_load_fontconfig(Evas *evas, FcFontSet *set, int size,
-      Font_Rend_Flags wanted_rend)
-{
-   Evas_Font_Set *font = NULL;
-   int i;
-
-   /* Do loading for all in family */
-   for (i = 0; i < set->nfont; i++)
-     {
-        FcValue filename;
-
-        FcPatternGet(set->fonts[i], FC_FILE, 0, &filename);
-
-        if (font)
-          evas->engine.func->font_add(evas->engine.data.output, font, (char *)filename.u.s, size, wanted_rend);
-        else
-          font = evas->engine.func->font_load(evas->engine.data.output, (char *)filename.u.s, size, wanted_rend);
-     }
-
-   return font;
-}
-#endif
-
-#ifdef HAVE_FONTCONFIG
-/* In sync with Evas_Font_Style, Evas_Font_Weight and Evas_Font_Width */
-static int _fc_slant_map[] =
-{
-   FC_SLANT_ROMAN,
-   FC_SLANT_OBLIQUE,
-   FC_SLANT_ITALIC
-};
-
-static int _fc_weight_map[] =
-{
-   FC_WEIGHT_NORMAL,
-   FC_WEIGHT_THIN,
-   FC_WEIGHT_ULTRALIGHT,
-   FC_WEIGHT_LIGHT,
-   FC_WEIGHT_BOOK,
-   FC_WEIGHT_MEDIUM,
-   FC_WEIGHT_SEMIBOLD,
-   FC_WEIGHT_BOLD,
-   FC_WEIGHT_ULTRABOLD,
-   FC_WEIGHT_BLACK,
-   FC_WEIGHT_EXTRABLACK
-};
-
-# ifdef FC_WIDTH
-static int _fc_width_map[] =
-{
-   FC_WIDTH_NORMAL,
-   FC_WIDTH_ULTRACONDENSED,
-   FC_WIDTH_EXTRACONDENSED,
-   FC_WIDTH_CONDENSED,
-   FC_WIDTH_SEMICONDENSED,
-   FC_WIDTH_SEMIEXPANDED,
-   FC_WIDTH_EXPANDED,
-   FC_WIDTH_EXTRAEXPANDED,
-   FC_WIDTH_ULTRAEXPANDED
-};
-# endif
-
-#endif
-
-struct _Style_Map
-{
-   const char *name;
-   int type;
-};
-typedef struct _Style_Map Style_Map;
-
-static Style_Map _style_width_map[] =
-{
-     {"normal", EVAS_FONT_WIDTH_NORMAL},
-     {"ultracondensed", EVAS_FONT_WIDTH_ULTRACONDENSED},
-     {"extracondensed", EVAS_FONT_WIDTH_EXTRACONDENSED},
-     {"condensed", EVAS_FONT_WIDTH_CONDENSED},
-     {"semicondensed", EVAS_FONT_WIDTH_SEMICONDENSED},
-     {"semiexpanded", EVAS_FONT_WIDTH_SEMIEXPANDED},
-     {"expanded", EVAS_FONT_WIDTH_EXPANDED},
-     {"extraexpanded", EVAS_FONT_WIDTH_EXTRAEXPANDED},
-     {"ultraexpanded", EVAS_FONT_WIDTH_ULTRAEXPANDED},
-};
-
-static Style_Map _style_weight_map[] =
-{
-     {"normal", EVAS_FONT_WEIGHT_NORMAL},
-     {"thin", EVAS_FONT_WEIGHT_THIN},
-     {"ultralight", EVAS_FONT_WEIGHT_ULTRALIGHT},
-     {"light", EVAS_FONT_WEIGHT_LIGHT},
-     {"book", EVAS_FONT_WEIGHT_BOOK},
-     {"medium", EVAS_FONT_WEIGHT_MEDIUM},
-     {"semibold", EVAS_FONT_WEIGHT_SEMIBOLD},
-     {"bold", EVAS_FONT_WEIGHT_BOLD},
-     {"ultrabold", EVAS_FONT_WEIGHT_ULTRABOLD},
-     {"black", EVAS_FONT_WEIGHT_BLACK},
-     {"extrablack", EVAS_FONT_WEIGHT_EXTRABLACK}
-};
-
-static Style_Map _style_slant_map[] =
-{
-     {"normal", EVAS_FONT_SLANT_NORMAL},
-     {"oblique", EVAS_FONT_SLANT_OBLIQUE},
-     {"italic", EVAS_FONT_SLANT_ITALIC}
-};
-
-#define _STYLE_MAP_LEN(x) (sizeof(x) / sizeof(*(x)))
-/**
- * @internal
- * Find a certain attribute from the map in the style.
- * @return the index of the found one.
- */
-static int
-_evas_font_style_find_internal(const char *style, const char *style_end,
-      Style_Map _map[], size_t map_len)
-{
-   size_t i;
-   while (style < style_end)
-     {
-        for (i = 0 ; i < map_len ; i++)
-          {
-             size_t len;
-             const char *cur = _map[i].name;
-             len = strlen(cur);
-             if (!strncasecmp(style, cur, len) &&
-                   (!cur[len] || (cur[len] == ' ')))
-               {
-                  return _map[i].type;
-               }
-          }
-        style = strchr(style, ' ');
-        if (!style)
-           break;
-
-        while (*style && (*style == ' '))
-           style++;
-     }
-   return 0;
-}
-
-int
-evas_font_style_find(const char *start, const char *end,
-      Evas_Font_Style style)
-{
-#define _RET_STYLE(x) \
-   return _evas_font_style_find_internal(start, end, \
-                   _style_##x##_map, _STYLE_MAP_LEN(_style_##x##_map));
-   switch (style)
-     {
-        case EVAS_FONT_STYLE_SLANT:
-           _RET_STYLE(slant);
-        case EVAS_FONT_STYLE_WEIGHT:
-           _RET_STYLE(weight);
-        case EVAS_FONT_STYLE_WIDTH:
-           _RET_STYLE(width);
-        default:
-           return 0;
-     }
-#undef _RET_STYLE
-}
-
-void
-evas_font_desc_unref(Evas_Font_Description *fdesc)
-{
-   if (--(fdesc->ref) == 0)
-     {
-        eina_stringshare_del(fdesc->name);
-        eina_stringshare_del(fdesc->fallbacks);
-        eina_stringshare_del(fdesc->lang);
-        free(fdesc);
-     }
-}
-
-Evas_Font_Description *
-evas_font_desc_ref(Evas_Font_Description *fdesc)
-{
-   fdesc->ref++;
-   return fdesc;
-}
-
-Evas_Font_Description *
-evas_font_desc_new(void)
-{
-   Evas_Font_Description *fdesc;
-   fdesc = calloc(1, sizeof(*fdesc));
-   fdesc->ref = 1;
-   fdesc->is_new = EINA_TRUE;
-
-   return fdesc;
-}
-
-Evas_Font_Description *
-evas_font_desc_dup(const Evas_Font_Description *fdesc)
-{
-   Evas_Font_Description *new;
-   new = evas_font_desc_new();
-   memcpy(new, fdesc, sizeof(*new));
-   new->ref = 1;
-   new->is_new = EINA_TRUE;
-   new->name = eina_stringshare_ref(new->name);
-
-   return new;
-}
-
-int
-evas_font_desc_cmp(const Evas_Font_Description *a,
-      const Evas_Font_Description *b)
-{
-   /* FIXME: Do actual comparison, i.e less than and bigger than. */
-   return !((a->name == b->name) && (a->weight == b->weight) &&
-         (a->slant == b->slant) && (a->width == b->width) &&
-         (a->lang == b->lang));
-}
-
-void
-evas_font_name_parse(Evas_Font_Description *fdesc, const char *name)
-{
-   const char *end;
-
-   end = strchr(name, ':');
-   if (!end)
-      eina_stringshare_replace(&(fdesc->name), name);
-   else
-      eina_stringshare_replace_length(&(fdesc->name), name, end - name);
-
-   while (end)
-     {
-        const char *tend;
-        name = end;
-        end = strchr(end + 1, ':');
-        if (!end)
-           tend = name + strlen(name);
-        else
-           tend = end;
-
-        if (!strncmp(name, ":style=", 7))
-          {
-#define _SET_STYLE(x) \
-             fdesc->x = _evas_font_style_find_internal(name + 7, tend, \
-                   _style_##x##_map, _STYLE_MAP_LEN(_style_##x##_map));
-             _SET_STYLE(slant);
-             _SET_STYLE(weight);
-             _SET_STYLE(width);
-#undef _SET_STYLE
-          }
-        else if (!strncmp(name, ":lang=", 6))
-          {
-             const char *tmp = name + 6;
-             eina_stringshare_replace_length(&(fdesc->lang), tmp, tend - tmp);
-          }
-     }
-}
-
-void *
-evas_font_load(Evas *evas, Evas_Font_Description *fdesc, const char *source, Evas_Font_Size size)
-{
-#ifdef HAVE_FONTCONFIG
-   FcPattern *p_nm = NULL;
-   FcFontSet *set = NULL;
-#endif
-
-   Evas_Font_Set *font = NULL;
-   Eina_List *fonts, *l;
-   Fndat *fd;
-   char *nm;
-   Font_Rend_Flags wanted_rend = 0;
-
-   if (!fdesc) return NULL;
-   fdesc->is_new = EINA_FALSE;
-
-   if (fdesc->slant != EVAS_FONT_SLANT_NORMAL)
-      wanted_rend |= FONT_REND_SLANT;
-   if (fdesc->weight == EVAS_FONT_WEIGHT_BOLD)
-      wanted_rend |= FONT_REND_WEIGHT;
-
-   evas_font_init();
-
-   EINA_LIST_FOREACH(fonts_cache, l, fd)
-     {
-        if (!evas_font_desc_cmp(fdesc, fd->fdesc))
-          {
-             if (((!source) && (!fd->source)) ||
-                 ((source) && (fd->source) && (!strcmp(source, fd->source))))
-               {
-                  if ((size == fd->size) &&
-                        (wanted_rend == fd->wanted_rend))
-                    {
-                       fonts_cache = eina_list_promote_list(fonts_cache, l);
-                       fd->ref++;
-                       return fd->font;
-                    }
-#ifdef HAVE_FONTCONFIG
-                  else if (fd->set && fd->p_nm)
-                    {
-                       font = evas_load_fontconfig(evas, fd->set, size,
-                             wanted_rend);
-                       goto on_find;
-                    }
-#endif
-               }
-          }
-     }
-
-   EINA_LIST_FOREACH(fonts_zero, l, fd)
-     {
-        if (!evas_font_desc_cmp(fdesc, fd->fdesc))
-          {
-             if (((!source) && (!fd->source)) ||
-                 ((source) && (fd->source) && (!strcmp(source, fd->source))))
-               {
-                  if ((size == fd->size) &&
-                        (wanted_rend == fd->wanted_rend))
-                    {
-                       fonts_zero = eina_list_remove_list(fonts_zero, l);
-                       fonts_cache = eina_list_prepend(fonts_cache, fd);
-                       fd->ref++;
-                       return fd->font;
-                    }
-#ifdef HAVE_FONTCONFIG
-                  else if (fd->set && fd->p_nm)
-                    {
-                       font = evas_load_fontconfig(evas, fd->set, size,
-                             wanted_rend);
-                       goto on_find;
-                    }
-#endif
-               }
-          }
-     }
-
-   fonts = evas_font_set_get(fdesc->name);
-   EINA_LIST_FOREACH(fonts, l, nm) /* Load each font in append */
-     {
-        if (l == fonts || !font) /* First iteration OR no font */
-          {
-#ifdef BUILD_FONT_LOADER_EET
-             if (source) /* Load Font from "eet" source */
-               {
-                  Eet_File *ef;
-                  char *fake_name;
-
-                  fake_name = evas_file_path_join(source, nm);
-                  if (fake_name)
-                    {
-                       font = evas->engine.func->font_load(evas->engine.data.output, fake_name, size, wanted_rend);
-                       if (!font) /* Load from fake name failed, probably not cached */
-                         {
-                            /* read original!!! */
-                            ef = eet_open(source, EET_FILE_MODE_READ);
-                            if (ef)
-                              {
-                                 void *fdata;
-                                 int fsize = 0;
-
-                                 fdata = eet_read(ef, nm, &fsize);
-                                 if ((fdata) && (fsize > 0))
-                                   {
-                                      font = evas->engine.func->font_memory_load(evas->engine.data.output, fake_name, size, fdata, fsize, wanted_rend);
-                                      free(fdata);
-                                   }
-                                 eet_close(ef);
-                              }
-                         }
-                       free(fake_name);
-                    }
-               }
-             if (!font) /* Source load failed */
-               {
-#endif
-                  if (evas_file_path_is_full_path((char *)nm)) /* Try filename */
-                    font = evas->engine.func->font_load(evas->engine.data.output, (char *)nm, size, wanted_rend);
-                  else /* search font path */
-                    {
-                       Eina_List *ll;
-                       char *dir;
-
-                       EINA_LIST_FOREACH(evas->font_path, ll, dir)
-                         {
-                            const char *f_file;
-
-                            f_file = evas_font_dir_cache_find(dir, (char *)nm);
-                            if (f_file)
-                              {
-                                 font = evas->engine.func->font_load(evas->engine.data.output, f_file, size, wanted_rend);
-                                 if (font) break;
-                              }
-                         }
-                    }
-#ifdef BUILD_FONT_LOADER_EET
-               }
-#endif
-          }
-        else /* Base font loaded, append others */
-          {
-#ifdef BUILD_FONT_LOADER_EET
-             void *ok = NULL;
-
-             if (source)
-               {
-                  Eet_File *ef;
-                  char *fake_name;
-
-                  fake_name = evas_file_path_join(source, nm);
-                  if (fake_name)
-                    {
-                       /* FIXME: make an engine func */
-                       if (!evas->engine.func->font_add(evas->engine.data.output, font, fake_name, size, wanted_rend))
-                         {
-                            /* read original!!! */
-                            ef = eet_open(source, EET_FILE_MODE_READ);
-                            if (ef)
-                              {
-                                 void *fdata;
-                                 int fsize = 0;
-
-                                 fdata = eet_read(ef, nm, &fsize);
-                                 if ((fdata) && (fsize > 0))
-                                   {
-                                      ok = evas->engine.func->font_memory_add(evas->engine.data.output, font, fake_name, size, fdata, fsize, wanted_rend);
-                                      free(fdata);
-                                   }
-                                 eet_close(ef);
-                              }
-                         }
-                       else
-                         ok = (void *)1;
-                       free(fake_name);
-                    }
-               }
-             if (!ok)
-               {
-#endif
-                  if (evas_file_path_is_full_path((char *)nm))
-                    evas->engine.func->font_add(evas->engine.data.output, font, (char *)nm, size, wanted_rend);
-                  else
-                    {
-                       Eina_List *ll;
-                       char *dir;
-
-                       EINA_LIST_FOREACH(evas->font_path, ll, dir)
-                         {
-                            const char *f_file;
-
-                            f_file = evas_font_dir_cache_find(dir, (char *)nm);
-                            if (f_file)
-                              {
-                                 if (evas->engine.func->font_add(evas->engine.data.output, font, f_file, size, wanted_rend))
-                                   break;
-                              }
-                         }
-                    }
-#ifdef BUILD_FONT_LOADER_EET
-               }
-#endif
-          }
-        eina_stringshare_del(nm);
-     }
-   fonts = eina_list_free(fonts);
-
-#ifdef HAVE_FONTCONFIG
-   if (!font) /* Search using fontconfig */
-     {
-        FcResult res;
-
-        p_nm = FcPatternBuild (NULL,
-              FC_WEIGHT, FcTypeInteger, _fc_weight_map[fdesc->weight],
-              FC_SLANT,  FcTypeInteger, _fc_slant_map[fdesc->slant],
-#ifdef FC_WIDTH
-              FC_WIDTH,  FcTypeInteger, _fc_width_map[fdesc->width],
-#endif
-              NULL);
-        FcPatternAddString (p_nm, FC_FAMILY, (FcChar8*) fdesc->name);
-
-        /* Handle font fallbacks */
-        if (fdesc->fallbacks)
-          {
-             while (1)
-               {
-                  const char *start, *end;
-                  start = fdesc->fallbacks;
-                  end = strchr(start, ',');
-                  if (end)
-                    {
-                       char *tmp = alloca((end - start) + 1);
-                       strncpy(tmp, start, end - start);
-                       tmp[end - start] = 0;
-                       FcPatternAddString (p_nm, FC_FAMILY, (FcChar8*) tmp);
-                    }
-                  else
-                    {
-                       FcPatternAddString (p_nm, FC_FAMILY, (FcChar8*) start);
-                       break;
-                    }
-               }
-          }
-
-        if (fdesc->lang)
-           FcPatternAddString (p_nm, FC_LANG, (FcChar8 *) fdesc->lang);
-
-        FcConfigSubstitute(NULL, p_nm, FcMatchPattern);
-        FcDefaultSubstitute(p_nm);
-
-        /* do matching */
-        set = FcFontSort(NULL, p_nm, FcTrue, NULL, &res);
-        if (!set)
-          {
-             ERR("No fontconfig font matches '%s'. It was the last resource, no font found!", fdesc->name);
-             FcPatternDestroy(p_nm);
-             p_nm = NULL;
-          }
-        else
-          {
-             font = evas_load_fontconfig(evas, set, size, wanted_rend);
-          }
-     }
-#endif
-
-#ifdef HAVE_FONTCONFIG
- on_find:
-#endif
-   fd = calloc(1, sizeof(Fndat));
-   if (fd)
-     {
-        fd->fdesc = evas_font_desc_ref(fdesc);
-        if (source) fd->source = eina_stringshare_add(source);
-        fd->font = font;
-        fd->wanted_rend = wanted_rend;
-        fd->size = size;
-        fd->ref = 1;
-        fonts_cache = eina_list_prepend(fonts_cache, fd);
-#ifdef HAVE_FONTCONFIG
-        fd->set = set;
-        fd->p_nm = p_nm;
-#endif
-     }
-
-   if (font)
-      evas->engine.func->font_hinting_set(evas->engine.data.output, font,
-            evas->hinting);
-   return font;
-}
-
-void
-evas_font_load_hinting_set(Evas *evas, void *font, int hinting)
-{
-   evas->engine.func->font_hinting_set(evas->engine.data.output, font,
-                                       hinting);
-}
-
-Eina_List *
-evas_font_dir_available_list(const Evas *evas)
-{
-   Eina_List *l;
-   Eina_List *ll;
-   Eina_List *available = NULL;
-   char *dir;
-
-#ifdef HAVE_FONTCONFIG
-   /* Add font config fonts */
-   FcPattern *p;
-   FcFontSet *set = NULL;
-   FcObjectSet *os;
-   int i;
-
-   evas_font_init();
-
-   p = FcPatternCreate();
-   os = FcObjectSetBuild(FC_FAMILY, FC_STYLE, NULL);
-
-   if (p && os) set = FcFontList(NULL, p, os);
-
-   if (p) FcPatternDestroy(p);
-   if (os) FcObjectSetDestroy(os);
-
-   if (set)
-     {
-        for (i = 0; i < set->nfont; i++)
-          {
-             char *font;
-
-             font = (char *)FcNameUnparse(set->fonts[i]);
-             available = eina_list_append(available, eina_stringshare_add(font));
-             free(font);
-          }
-
-        FcFontSetDestroy(set);
-     }
-#endif
-
-   /* Add fonts in evas font_path*/
-   if (!evas->font_path)
-     return available;
-
-   if (!font_dirs) font_dirs = eina_hash_string_superfast_new(NULL);
-
-   EINA_LIST_FOREACH(evas->font_path, l, dir)
-     {
-        Evas_Font_Dir *fd;
-
-        fd = eina_hash_find(font_dirs, dir);
-        fd = object_text_font_cache_dir_update(dir, fd);
-        if (fd && fd->aliases)
-          {
-             Evas_Font_Alias *fa;
-
-             EINA_LIST_FOREACH(fd->aliases, ll, fa)
-               available = eina_list_append(available, eina_stringshare_add((char *)fa->alias));
-          }
-     }
-
-   return available;
-}
-
-void
-evas_font_dir_available_list_free(Eina_List *available)
-{
-   while (available)
-     {
-        eina_stringshare_del(available->data);
-        available = eina_list_remove(available, available->data);
-     }
-}
-
-/* private stuff */
-static Eina_Bool
-font_cache_dir_free(const Eina_Hash *hash __UNUSED__, const void *key, void *data, void *fdata __UNUSED__)
-{
-   object_text_font_cache_dir_del((char *) key, data);
-   return 1;
-}
-
-static Evas_Font_Dir *
-object_text_font_cache_dir_update(char *dir, Evas_Font_Dir *fd)
-{
-   DATA64 mt;
-   char *tmp;
-
-   if (fd)
-     {
-        mt = evas_file_modified_time(dir);
-        if (mt != fd->dir_mod_time)
-          {
-             object_text_font_cache_dir_del(dir, fd);
-             eina_hash_del(font_dirs, dir, fd);
-          }
-        else
-          {
-             tmp = evas_file_path_join(dir, "fonts.dir");
-             if (tmp)
-               {
-                  mt = evas_file_modified_time(tmp);
-                  free(tmp);
-                  if (mt != fd->fonts_dir_mod_time)
-                    {
-                       object_text_font_cache_dir_del(dir, fd);
-                       eina_hash_del(font_dirs, dir, fd);
-                    }
-                  else
-                    {
-                       tmp = evas_file_path_join(dir, "fonts.alias");
-                       if (tmp)
-                         {
-                            mt = evas_file_modified_time(tmp);
-                            free(tmp);
-                         }
-                       if (mt != fd->fonts_alias_mod_time)
-                         {
-                            object_text_font_cache_dir_del(dir, fd);
-                            eina_hash_del(font_dirs, dir, fd);
-                         }
-                       else
-                         return fd;
-                    }
-               }
-          }
-     }
-   return object_text_font_cache_dir_add(dir);
-}
-
-static Evas_Font *
-object_text_font_cache_font_find_x(Evas_Font_Dir *fd, char *font)
-{
-   Eina_List *l;
-   char font_prop[14][256];
-   int num;
-   Evas_Font *fn;
-
-   num = evas_object_text_font_string_parse(font, font_prop);
-   if (num != 14) return NULL;
-   EINA_LIST_FOREACH(fd->fonts, l, fn)
-     {
-        if (fn->type == 1)
-          {
-             int i;
-             int match = 0;
-
-             for (i = 0; i < 14; i++)
-               {
-                  if ((font_prop[i][0] == '*') && (font_prop[i][1] == 0))
-                    match++;
-                  else
-                    {
-                       if (!strcasecmp(font_prop[i], fn->x.prop[i])) match++;
-                       else break;
-                    }
-               }
-             if (match == 14) return fn;
-          }
-     }
-   return NULL;
-}
-
-static Evas_Font *
-object_text_font_cache_font_find_file(Evas_Font_Dir *fd, char *font)
-{
-   Eina_List *l;
-   Evas_Font *fn;
-
-   EINA_LIST_FOREACH(fd->fonts, l, fn)
-     {
-        if (fn->type == 0)
-          {
-             if (!strcasecmp(font, fn->simple.name)) return fn;
-          }
-     }
-   return NULL;
-}
-
-static Evas_Font *
-object_text_font_cache_font_find_alias(Evas_Font_Dir *fd, char *font)
-{
-   Eina_List *l;
-   Evas_Font_Alias *fa;
-
-   EINA_LIST_FOREACH(fd->aliases, l, fa)
-     if (!strcasecmp(fa->alias, font)) return fa->fn;
-   return NULL;
-}
-
-static Evas_Font *
-object_text_font_cache_font_find(Evas_Font_Dir *fd, char *font)
-{
-   Evas_Font *fn;
-
-   fn = eina_hash_find(fd->lookup, font);
-   if (fn) return fn;
-   fn = object_text_font_cache_font_find_alias(fd, font);
-   if (!fn) fn = object_text_font_cache_font_find_x(fd, font);
-   if (!fn) fn = object_text_font_cache_font_find_file(fd, font);
-   if (!fn) return NULL;
-   eina_hash_add(fd->lookup, font, fn);
-   return fn;
-}
-
-static Evas_Font_Dir *
-object_text_font_cache_dir_add(char *dir)
-{
-   Evas_Font_Dir *fd;
-   char *tmp, *tmp2;
-   Eina_List *fdir;
-   Evas_Font *fn;
-
-   fd = calloc(1, sizeof(Evas_Font_Dir));
-   if (!fd) return NULL;
-   fd->lookup = eina_hash_string_superfast_new(NULL);
-
-   eina_hash_add(font_dirs, dir, fd);
-
-   /* READ fonts.alias, fonts.dir and directory listing */
-
-   /* fonts.dir */
-   tmp = evas_file_path_join(dir, "fonts.dir");
-   if (tmp)
-     {
-        FILE *f;
-
-        f = fopen(tmp, "rb");
-        if (f)
-          {
-             int num;
-             char fname[4096], fdef[4096];
-
-             if (fscanf(f, "%i\n", &num) != 1) goto cant_read;
-             /* read font lines */
-             while (fscanf(f, "%4090s %[^\n]\n", fname, fdef) == 2)
-               {
-                  char font_prop[14][256];
-                  int i;
-
-                  /* skip comments */
-                  if ((fdef[0] == '!') || (fdef[0] == '#')) continue;
-                  /* parse font def */
-                  num = evas_object_text_font_string_parse((char *)fdef, font_prop);
-                  if (num == 14)
-                    {
-                       fn = calloc(1, sizeof(Evas_Font));
-                       if (fn)
-                         {
-                            fn->type = 1;
-                            for (i = 0; i < 14; i++)
-                              fn->x.prop[i] = eina_stringshare_add(font_prop[i]);
-                            tmp2 = evas_file_path_join(dir, fname);
-                            if (tmp2)
-                              {
-                                 fn->path = eina_stringshare_add(tmp2);
-                                 free(tmp2);
-                              }
-                            fd->fonts = eina_list_append(fd->fonts, fn);
-                         }
-                    }
-               }
-             cant_read: ;
-             fclose(f);
-          }
-        free(tmp);
-     }
-
-   /* directoy listing */
-   fdir = evas_file_path_list(dir, "*.ttf", 0);
-   while (fdir)
-     {
-        tmp = evas_file_path_join(dir, fdir->data);
-        if (tmp)
-          {
-             fn = calloc(1, sizeof(Evas_Font));
-             if (fn)
-               {
-                  char *p;
-
-                  fn->type = 0;
-                  tmp2 = alloca(strlen(fdir->data) + 1);
-                  strcpy(tmp2, fdir->data);
-                  p = strrchr(tmp2, '.');
-                  if (p) *p = 0;
-                  fn->simple.name = eina_stringshare_add(tmp2);
-                  tmp2 = evas_file_path_join(dir, fdir->data);
-                  if (tmp2)
-                    {
-                       fn->path = eina_stringshare_add(tmp2);
-                       free(tmp2);
-                    }
-                  fd->fonts = eina_list_append(fd->fonts, fn);
-               }
-             free(tmp);
-          }
-        free(fdir->data);
-        fdir = eina_list_remove(fdir, fdir->data);
-     }
-
-   /* fonts.alias */
-   tmp = evas_file_path_join(dir, "fonts.alias");
-   if (tmp)
-     {
-        FILE *f;
-
-        f = fopen(tmp, "rb");
-        if (f)
-          {
-             char fname[4096], fdef[4096];
-
-             /* read font alias lines */
-             while (fscanf(f, "%4090s %[^\n]\n", fname, fdef) == 2)
-               {
-                  Evas_Font_Alias *fa;
-
-                  /* skip comments */
-                  if ((fname[0] == '!') || (fname[0] == '#')) continue;
-                  fa = calloc(1, sizeof(Evas_Font_Alias));
-                  if (fa)
-                    {
-                       fa->alias = eina_stringshare_add(fname);
-                       fa->fn = object_text_font_cache_font_find_x(fd, fdef);
-                       if ((!fa->alias) || (!fa->fn))
-                         {
-                            if (fa->alias) eina_stringshare_del(fa->alias);
-                            free(fa);
-                         }
-                       else
-                         fd->aliases = eina_list_append(fd->aliases, fa);
-                    }
-               }
-             fclose(f);
-          }
-        free(tmp);
-     }
-
-   fd->dir_mod_time = evas_file_modified_time(dir);
-   tmp = evas_file_path_join(dir, "fonts.dir");
-   if (tmp)
-     {
-        fd->fonts_dir_mod_time = evas_file_modified_time(tmp);
-        free(tmp);
-     }
-   tmp = evas_file_path_join(dir, "fonts.alias");
-   if (tmp)
-     {
-        fd->fonts_alias_mod_time = evas_file_modified_time(tmp);
-        free(tmp);
-     }
-
-   return fd;
-}
-
-static void
-object_text_font_cache_dir_del(char *dir __UNUSED__, Evas_Font_Dir *fd)
-{
-   if (fd->lookup) eina_hash_free(fd->lookup);
-   while (fd->fonts)
-     {
-        Evas_Font *fn;
-        int i;
-
-        fn = fd->fonts->data;
-        fd->fonts = eina_list_remove(fd->fonts, fn);
-        for (i = 0; i < 14; i++)
-          {
-             if (fn->x.prop[i]) eina_stringshare_del(fn->x.prop[i]);
-          }
-        if (fn->simple.name) eina_stringshare_del(fn->simple.name);
-        if (fn->path) eina_stringshare_del(fn->path);
-        free(fn);
-     }
-   while (fd->aliases)
-     {
-        Evas_Font_Alias *fa;
-
-        fa = fd->aliases->data;
-        fd->aliases = eina_list_remove(fd->aliases, fa);
-        if (fa->alias) eina_stringshare_del(fa->alias);
-        free(fa);
-     }
-   free(fd);
-}
-
-static int
-evas_object_text_font_string_parse(char *buffer, char dest[14][256])
-{
-   char *p;
-   int n, m, i;
-
-   n = 0;
-   m = 0;
-   p = buffer;
-   if (p[0] != '-') return 0;
-   i = 1;
-   while (p[i])
-     {
-        dest[n][m] = p[i];
-        if ((p[i] == '-') || (m == 255))
-          {
-             dest[n][m] = 0;
-             n++;
-             m = -1;
-          }
-        i++;
-        m++;
-        if (n == 14) return n;
-     }
-   dest[n][m] = 0;
-   n++;
-   return n;
-}
-
-EAPI void
-evas_font_path_clear(Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-   while (e->font_path)
-     {
-        eina_stringshare_del(e->font_path->data);
-        e->font_path = eina_list_remove(e->font_path, e->font_path->data);
-     }
-}
-
-EAPI void
-evas_font_path_append(Evas *e, const char *path)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   if (!path) return;
-   e->font_path = eina_list_append(e->font_path, eina_stringshare_add(path));
-}
-
-EAPI void
-evas_font_path_prepend(Evas *e, const char *path)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   if (!path) return;
-   e->font_path = eina_list_prepend(e->font_path, eina_stringshare_add(path));
-}
-
-EAPI const Eina_List *
-evas_font_path_list(const Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return NULL;
-   MAGIC_CHECK_END();
-   return e->font_path;
-}
-
-static void
-evas_font_object_rehint(Evas_Object *obj)
-{
-   if (obj->smart.smart)
-     {
-        EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(obj), obj)
-          evas_font_object_rehint(obj);
-     }
-   else
-     {
-        if (!strcmp(obj->type, "text"))
-          _evas_object_text_rehint(obj);
-        if (!strcmp(obj->type, "textblock"))
-          _evas_object_textblock_rehint(obj);
-     }
-}
-
-EAPI void
-evas_font_hinting_set(Evas *e, Evas_Font_Hinting_Flags hinting)
-{
-   Evas_Layer *lay;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-   if (e->hinting == hinting) return;
-   e->hinting = hinting;
-
-   EINA_INLIST_FOREACH(e->layers, lay)
-     {
-        Evas_Object *obj;
-
-        EINA_INLIST_FOREACH(lay->objects, obj)
-          evas_font_object_rehint(obj);
-     }
-}
-
-EAPI Evas_Font_Hinting_Flags
-evas_font_hinting_get(const Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return EVAS_FONT_HINTING_BYTECODE;
-   MAGIC_CHECK_END();
-   return e->hinting;
-}
-
-EAPI Eina_Bool
-evas_font_hinting_can_hint(const Evas *e, Evas_Font_Hinting_Flags hinting)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return 0;
-   MAGIC_CHECK_END();
-   if (e->engine.func->font_hinting_can_hint)
-     return e->engine.func->font_hinting_can_hint(e->engine.data.output,
-                                                  hinting);
-   return EINA_FALSE;
-}
-
-EAPI void
-evas_font_cache_flush(Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   e->engine.func->font_cache_flush(e->engine.data.output);
-}
-
-EAPI void
-evas_font_cache_set(Evas *e, int size)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   if (size < 0) size = 0;
-   e->engine.func->font_cache_set(e->engine.data.output, size);
-}
-
-EAPI int
-evas_font_cache_get(const Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return 0;
-   MAGIC_CHECK_END();
-
-   return e->engine.func->font_cache_get(e->engine.data.output);
-}
-
-EAPI Eina_List *
-evas_font_available_list(const Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return NULL;
-   MAGIC_CHECK_END();
-
-   return evas_font_dir_available_list(e);
-}
-
-EAPI void
-evas_font_available_list_free(Evas *e, Eina_List *available)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   evas_font_dir_available_list_free(available);
-}
-
diff --git a/libraries/evas/src/lib/canvas/evas_gl.c b/libraries/evas/src/lib/canvas/evas_gl.c
deleted file mode 100644
index 85ed851..0000000
--- a/libraries/evas/src/lib/canvas/evas_gl.c
+++ /dev/null
@@ -1,272 +0,0 @@
-/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/
-#include "evas_common.h"
-#include "evas_private.h"
-#include "Evas_GL.h"
-
-struct _Evas_GL
-{
-   DATA32      magic;
-   Evas       *evas;
-
-   Eina_List  *contexts;
-   Eina_List  *surfaces;
-};
-
-struct _Evas_GL_Context
-{
-   void    *data;
-};
-
-struct _Evas_GL_Surface
-{
-   void    *data;
-};
-
-EAPI Evas_GL *
-evas_gl_new(Evas *e)
-{
-   Evas_GL *evas_gl;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return NULL;
-   MAGIC_CHECK_END();
-
-   evas_gl = calloc(1, sizeof(Evas_GL));
-   if (!evas_gl) return NULL;
-
-   evas_gl->magic = MAGIC_EVAS_GL;
-   evas_gl->evas = e;
-
-   if (!evas_gl->evas->engine.func->gl_context_create)
-     {
-        ERR("GL engine not available\n");
-        free(evas_gl);
-        return NULL;
-     }
-
-   return evas_gl;
-}
-
-EAPI void
-evas_gl_free(Evas_GL *evas_gl)
-{
-   MAGIC_CHECK(evas_gl, Evas_GL, MAGIC_EVAS_GL);
-   return;
-   MAGIC_CHECK_END();
-
-
-   // Delete undeleted surfaces
-   while (evas_gl->surfaces)
-     evas_gl_surface_destroy(evas_gl, evas_gl->surfaces->data);
-
-   // Delete undeleted contexts
-   while (evas_gl->contexts)
-     evas_gl_context_destroy(evas_gl, evas_gl->contexts->data);
-
-   evas_gl->magic = 0;
-   free(evas_gl);
-}
-
-EAPI Evas_GL_Config *
-evas_gl_config_new()
-{
-   Evas_GL_Config *cfg;
-
-   cfg = calloc(1, sizeof(Evas_GL_Config));
-
-   if (!cfg) return NULL;
-
-   return cfg;
-}
-
-EAPI void
-evas_gl_config_free(Evas_GL_Config *cfg)
-{
-   if (cfg) free(cfg);
-}
-
-EAPI Evas_GL_Surface *
-evas_gl_surface_create(Evas_GL *evas_gl, Evas_GL_Config *config, int width, int height)
-{
-   Evas_GL_Surface *surf;
-
-   MAGIC_CHECK(evas_gl, Evas_GL, MAGIC_EVAS_GL);
-   return NULL;
-   MAGIC_CHECK_END();
-
-   if (!config)
-     {
-        ERR("Invalid Config\n");
-        return NULL;
-     }
-
-   surf = calloc(1, sizeof(Evas_GL_Surface));
-
-   if (!surf) return NULL;
-
-   surf->data = evas_gl->evas->engine.func->gl_surface_create(evas_gl->evas->engine.data.output, config, width, height);
-
-   if (!surf->data)
-     {
-        ERR("Failed creating a surface from the engine\n");
-        free(surf);
-        return NULL;
-     }
-
-   // Keep track of the surface creations
-   evas_gl->surfaces = eina_list_prepend(evas_gl->surfaces, surf);
-
-   return surf;
-}
-
-EAPI void
-evas_gl_surface_destroy(Evas_GL *evas_gl, Evas_GL_Surface *surf)
-{
-   // Magic
-   MAGIC_CHECK(evas_gl, Evas_GL, MAGIC_EVAS_GL);
-   return;
-   MAGIC_CHECK_END();
-
-   if (!surf)
-     {
-        ERR("Trying to destroy a NULL surface pointer!\n");
-        return;
-     }
-
-   // Call Engine's Surface Destroy
-   evas_gl->evas->engine.func->gl_surface_destroy(evas_gl->evas->engine.data.output, surf->data);
-
-   // Remove it from the list
-   evas_gl->surfaces = eina_list_remove(evas_gl->surfaces, surf);
-
-   // Delete the object
-   free(surf);
-   surf = NULL;
-}
-
-EAPI Evas_GL_Context *
-evas_gl_context_create(Evas_GL *evas_gl, Evas_GL_Context *share_ctx)
-{
-   Evas_GL_Context *ctx;
-
-   // Magic
-   MAGIC_CHECK(evas_gl, Evas_GL, MAGIC_EVAS_GL);
-   return NULL;
-   MAGIC_CHECK_END();
-
-   // Allocate a context object
-   ctx = calloc(1, sizeof(Evas_GL_Context));
-   if (!ctx)
-     {
-        ERR("Unable to create a Evas_GL_Context object\n");
-        return NULL;
-     }
-
-   // Call engine->gl_create_context
-   if (share_ctx)
-     {
-        ctx->data = evas_gl->evas->engine.func->gl_context_create(evas_gl->evas->engine.data.output, share_ctx->data);
-     }
-   else
-     {
-        ctx->data = evas_gl->evas->engine.func->gl_context_create(evas_gl->evas->engine.data.output, NULL);
-     }
-
-   // Set a few variables
-   if (!ctx->data)
-     {
-        ERR("Failed creating a context from the engine\n");
-        free(ctx);
-        return NULL;
-     }
-
-   // Keep track of the context creations
-   evas_gl->contexts = eina_list_prepend(evas_gl->contexts, ctx);
-
-   return ctx;
-
-}
-
-EAPI void
-evas_gl_context_destroy(Evas_GL *evas_gl, Evas_GL_Context *ctx)
-{
-
-   MAGIC_CHECK(evas_gl, Evas_GL, MAGIC_EVAS_GL);
-   return;
-   MAGIC_CHECK_END();
-
-   if (!ctx)
-     {
-        ERR("Trying to destroy a NULL context pointer!\n");
-        return;
-     }
-
-   // Call Engine's destroy
-   evas_gl->evas->engine.func->gl_context_destroy(evas_gl->evas->engine.data.output, ctx->data);
-
-   // Remove it from the list
-   evas_gl->contexts = eina_list_remove(evas_gl->contexts, ctx);
-
-   // Delete the object
-   free(ctx);
-   ctx = NULL;
-}
-
-EAPI Eina_Bool
-evas_gl_make_current(Evas_GL *evas_gl, Evas_GL_Surface *surf, Evas_GL_Context *ctx)
-{
-   Eina_Bool ret;
-
-   MAGIC_CHECK(evas_gl, Evas_GL, MAGIC_EVAS_GL);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-
-   if ((!surf) || (!ctx))
-     ret = (Eina_Bool)evas_gl->evas->engine.func->gl_make_current(evas_gl->evas->engine.data.output, NULL, NULL);
-   else
-     ret = (Eina_Bool)evas_gl->evas->engine.func->gl_make_current(evas_gl->evas->engine.data.output, surf->data, ctx->data);
-
-   return ret;
-}
-
-EAPI const char *
-evas_gl_string_query(Evas_GL *evas_gl, int name)
-{
-   MAGIC_CHECK(evas_gl, Evas_GL, MAGIC_EVAS_GL);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-
-   return (const char *)evas_gl->evas->engine.func->gl_string_query(evas_gl->evas->engine.data.output, name);
-}
-
-EAPI Evas_GL_Func
-evas_gl_proc_address_get(Evas_GL *evas_gl, const char *name)
-{
-   MAGIC_CHECK(evas_gl, Evas_GL, MAGIC_EVAS_GL);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-
-   return (Evas_GL_Func)evas_gl->evas->engine.func->gl_proc_address_get(evas_gl->evas->engine.data.output, name);
-}
-
-EAPI Eina_Bool
-evas_gl_native_surface_get(Evas_GL *evas_gl, Evas_GL_Surface *surf, Evas_Native_Surface *ns)
-{
-   MAGIC_CHECK(evas_gl, Evas_GL, MAGIC_EVAS_GL);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-
-   return (Eina_Bool)evas_gl->evas->engine.func->gl_native_surface_get(evas_gl->evas->engine.data.output, surf->data, ns);
-}
-
-
-EAPI Evas_GL_API *
-evas_gl_api_get(Evas_GL *evas_gl)
-{
-   MAGIC_CHECK(evas_gl, Evas_GL, MAGIC_EVAS_GL);
-   return NULL;
-   MAGIC_CHECK_END();
-
-   return (Evas_GL_API*)evas_gl->evas->engine.func->gl_api_get(evas_gl->evas->engine.data.output);
-
-}
diff --git a/libraries/evas/src/lib/canvas/evas_key.c b/libraries/evas/src/lib/canvas/evas_key.c
deleted file mode 100644
index f74ef34..0000000
--- a/libraries/evas/src/lib/canvas/evas_key.c
+++ /dev/null
@@ -1,245 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-
-/* private calls */
-
-static int
-evas_key_modifier_number(const Evas_Modifier *m, const char *keyname)
-{
-   int i;
-
-   for (i = 0; i < m->mod.count; i++)
-     {
-        if (!strcmp(m->mod.list[i], keyname)) return i;
-     }
-   return -1;
-}
-
-static int
-evas_key_lock_number(const Evas_Lock *l, const char *keyname)
-{
-   int i;
-
-   for (i = 0; i < l->lock.count; i++)
-     {
-        if (!strcmp(l->lock.list[i], keyname)) return i;
-     }
-   return -1;
-}
-
-/* local calls */
-
-/* public calls */
-
-EAPI const Evas_Modifier *
-evas_key_modifier_get(const Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return NULL;
-   MAGIC_CHECK_END();
-   return &(e->modifiers);
-}
-
-EAPI const Evas_Lock *
-evas_key_lock_get(const Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return NULL;
-   MAGIC_CHECK_END();
-   return &(e->locks);
-}
-
-EAPI Eina_Bool
-evas_key_modifier_is_set(const Evas_Modifier *m, const char *keyname)
-{
-   Evas_Modifier_Mask num;
-   int n;
-
-   if (!m) return 0;
-   if (!keyname) return 0;
-   n = evas_key_modifier_number(m, keyname);
-   if (n < 0) return 0;
-   num = (Evas_Modifier_Mask)n;
-   num = 1 << num;
-   if (m->mask & num) return 1;
-   return 0;
-}
-
-EAPI Eina_Bool
-evas_key_lock_is_set(const Evas_Lock *l, const char *keyname)
-{
-   Evas_Modifier_Mask num;
-   int n;
-
-   if (!l) return 0;
-   if (!keyname) return 0;
-   n = evas_key_lock_number(l, keyname);
-   if (n < 0) return 0;
-   num = (Evas_Modifier_Mask)n;
-   num = 1 << num;
-   if (l->mask & num) return 1;
-   return 0;
-}
-
-EAPI void
-evas_key_modifier_add(Evas *e, const char *keyname)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-   if (!keyname) return;
-   if (e->modifiers.mod.count >= 64) return;
-   evas_key_modifier_del(e, keyname);
-   e->modifiers.mod.count++;
-   e->modifiers.mod.list = realloc(e->modifiers.mod.list, e->modifiers.mod.count * sizeof(char *));
-   e->modifiers.mod.list[e->modifiers.mod.count - 1] = strdup(keyname);
-   e->modifiers.mask = 0;
-}
-
-EAPI void
-evas_key_modifier_del(Evas *e, const char *keyname)
-{
-   int i;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-   if (!keyname) return;
-   for (i = 0; i < e->modifiers.mod.count; i++)
-     {
-        if (!strcmp(e->modifiers.mod.list[i], keyname))
-          {
-             int j;
-
-             free(e->modifiers.mod.list[i]);
-             e->modifiers.mod.count--;
-             for (j = i; j < e->modifiers.mod.count; j++)
-               e->modifiers.mod.list[j] = e->modifiers.mod.list[j + 1];
-             e->modifiers.mask = 0;
-             return;
-          }
-     }
-}
-
-EAPI void
-evas_key_lock_add(Evas *e, const char *keyname)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-   if (!keyname) return;
-   if (e->locks.lock.count >= 64) return;
-   evas_key_lock_del(e, keyname);
-   e->locks.lock.count++;
-   e->locks.lock.list = realloc(e->locks.lock.list, e->locks.lock.count * sizeof(char *));
-   e->locks.lock.list[e->locks.lock.count - 1] = strdup(keyname);
-   e->locks.mask = 0;
-}
-
-EAPI void
-evas_key_lock_del(Evas *e, const char *keyname)
-{
-   int i;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-   if (!keyname) return;
-   e->locks.mask = 0;
-   for (i = 0; i < e->locks.lock.count; i++)
-     {
-        if (!strcmp(e->locks.lock.list[i], keyname))
-          {
-             int j;
-
-             free(e->locks.lock.list[i]);
-             e->locks.lock.count--;
-             for (j = i; j < e->locks.lock.count; j++)
-               e->locks.lock.list[j] = e->locks.lock.list[j + 1];
-             e->locks.mask = 0;
-             return;
-          }
-     }
-}
-
-EAPI void
-evas_key_modifier_on(Evas *e, const char *keyname)
-{
-   Evas_Modifier_Mask num;
-   int n;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-   n = (Evas_Modifier_Mask)evas_key_modifier_number(&(e->modifiers), keyname);
-   if (n < 0) return;
-   num = (Evas_Modifier_Mask)n;
-   num = 1 << num;
-   e->modifiers.mask |= num;
-}
-
-EAPI void
-evas_key_modifier_off(Evas *e, const char *keyname)
-{
-   Evas_Modifier_Mask num;
-   int n;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-   n = evas_key_modifier_number(&(e->modifiers), keyname);
-   if (n < 0) return;
-   num = (Evas_Modifier_Mask)n;
-   num = 1 << num;
-   e->modifiers.mask &= ~num;
-}
-
-EAPI void
-evas_key_lock_on(Evas *e, const char *keyname)
-{
-   Evas_Modifier_Mask num;
-   int n;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-   n = evas_key_lock_number(&(e->locks), keyname);
-   if (n < 0) return;
-   num = (Evas_Modifier_Mask)n;
-   num = 1 << num;
-   e->locks.mask |= num;
-}
-
-EAPI void
-evas_key_lock_off(Evas *e, const char *keyname)
-{
-   Evas_Modifier_Mask num;
-   int n;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-   n = evas_key_lock_number(&(e->locks), keyname);
-   if (n < 0) return;
-   num = (Evas_Modifier_Mask)n;
-   num = 1 << num;
-   e->locks.mask &= ~num;
-}
-
-/* errr need to add key grabbing/ungrabbing calls - missing modifier stuff. */
-
-EAPI Evas_Modifier_Mask
-evas_key_modifier_mask_get(const Evas *e, const char *keyname)
-{
-   Evas_Modifier_Mask num;
-   int n;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return 0;
-   MAGIC_CHECK_END();
-   if (!keyname) return 0;
-   n = evas_key_modifier_number(&(e->modifiers), keyname);
-   if (n < 0) return 0;
-   num = (Evas_Modifier_Mask)n;
-   return 1 << num;
-}
diff --git a/libraries/evas/src/lib/canvas/evas_key_grab.c b/libraries/evas/src/lib/canvas/evas_key_grab.c
deleted file mode 100644
index 3fc2172..0000000
--- a/libraries/evas/src/lib/canvas/evas_key_grab.c
+++ /dev/null
@@ -1,179 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-
-/* private calls */
-
-/* FIXME: this is not optimal, but works. i should have a hash of keys per */
-/* Evas and then a linked lists of grabs for that key and what */
-/* modifiers/not_modifers they use */
-
-static Evas_Key_Grab *evas_key_grab_new  (Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, Eina_Bool exclusive);
-static Evas_Key_Grab *evas_key_grab_find (Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, Eina_Bool exclusive);
-
-static Evas_Key_Grab *
-evas_key_grab_new(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, Eina_Bool exclusive)
-{
-   /* MEM OK */
-   Evas_Key_Grab *g;
-
-   g = evas_mem_calloc(sizeof(Evas_Key_Grab));
-   if (!g) return NULL;
-   g->object = obj;
-   g->modifiers = modifiers;
-   g->not_modifiers = not_modifiers;
-   g->exclusive = exclusive;
-   g->keyname = strdup(keyname);
-   if (obj->layer->evas->walking_grabs)
-     g->just_added = EINA_TRUE;
-   if (!g->keyname)
-     {
-        if (!evas_mem_free(strlen(keyname) + 1))
-          {
-             free(g);
-             return NULL;
-          }
-        g->keyname = strdup(keyname);
-        if (!g->keyname)
-          {
-             free(g);
-             return NULL;
-          }
-     }
-   g->object->grabs = eina_list_append(g->object->grabs, g);
-   if (eina_error_get())
-     {
-        MERR_BAD();
-        evas_mem_free(sizeof(Eina_List));
-        g->object->grabs = eina_list_append(g->object->grabs, g);
-        if (eina_error_get())
-          {
-             MERR_FATAL();
-             free(g->keyname);
-             free(g);
-             return NULL;
-          }
-     }
-   obj->layer->evas->grabs = eina_list_append(obj->layer->evas->grabs, g);
-   if (eina_error_get())
-     {
-        MERR_BAD();
-        evas_mem_free(sizeof(Eina_List));
-        obj->layer->evas->grabs = eina_list_append(obj->layer->evas->grabs, g);
-        if (eina_error_get())
-          {
-             MERR_FATAL();
-             g->object->grabs = eina_list_remove(g->object->grabs, g);
-             free(g->keyname);
-             free(g);
-             return NULL;
-          }
-     }
-   return g;
-}
-
-static Evas_Key_Grab *
-evas_key_grab_find(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, Eina_Bool exclusive)
-{
-   /* MEM OK */
-   Eina_List *l;
-   Evas_Key_Grab *g;
-
-   EINA_LIST_FOREACH(obj->layer->evas->grabs, l, g)
-     {
-        if ((g->modifiers == modifiers) &&
-            (g->not_modifiers == not_modifiers) &&
-            (!strcmp(g->keyname, keyname)))
-          {
-             if ((exclusive) ||  (obj == g->object)) return g;
-          }
-     }
-   return NULL;
-}
-
-/* local calls */
-
-void
-evas_object_grabs_cleanup(Evas_Object *obj)
-{
-   if (obj->layer->evas->walking_grabs)
-     {
-        Eina_List *l;
-        Evas_Key_Grab *g;
-
-        EINA_LIST_FOREACH(obj->grabs, l, g)
-          g->delete_me = EINA_TRUE;
-     }
-   else
-     {
-        while (obj->grabs)
-          {
-             Evas_Key_Grab *g = obj->grabs->data;
-             if (g->keyname) free(g->keyname);
-             free(g);
-             obj->layer->evas->grabs = eina_list_remove(obj->layer->evas->grabs,
-                                                        g);
-             obj->grabs = eina_list_remove(obj->grabs, g);
-          }
-     }
-}
-
-void
-evas_key_grab_free(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers)
-{
-   /* MEM OK */
-   Evas_Key_Grab *g;
-
-   g = evas_key_grab_find(obj, keyname, modifiers, not_modifiers, 0);
-   if (!g) return;
-   g->object->grabs = eina_list_remove(g->object->grabs, g);
-   obj->layer->evas->grabs = eina_list_remove(obj->layer->evas->grabs, g);
-   if (g->keyname) free(g->keyname);
-   free(g);
-}
-
-/* public calls */
-
-EAPI Eina_Bool
-evas_object_key_grab(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, Eina_Bool exclusive)
-{
-   /* MEM OK */
-   Evas_Key_Grab *g;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-   if (!keyname) return EINA_FALSE;
-   if (exclusive)
-     {
-        g = evas_key_grab_find(obj, keyname, modifiers, not_modifiers,
-                               exclusive);
-        if (g) return EINA_FALSE;
-     }
-   g = evas_key_grab_new(obj, keyname, modifiers, not_modifiers, exclusive);
-   if (!g) return EINA_FALSE;
-   return EINA_TRUE;
-}
-
-EAPI void
-evas_object_key_ungrab(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers)
-{
-   /* MEM OK */
-   Evas_Key_Grab *g;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (!keyname) return;
-   g = evas_key_grab_find(obj, keyname, modifiers, not_modifiers, 0);
-   if (!g) return;
-   if (g->object->layer->evas->walking_grabs)
-     {
-        if (!g->delete_me)
-          {
-             g->object->layer->evas->delete_grabs++;
-             g->delete_me = EINA_TRUE;
-          }
-     }
-   else
-     evas_key_grab_free(g->object, keyname, modifiers, not_modifiers);
-}
diff --git a/libraries/evas/src/lib/canvas/evas_layer.c b/libraries/evas/src/lib/canvas/evas_layer.c
deleted file mode 100644
index 54e9907..0000000
--- a/libraries/evas/src/lib/canvas/evas_layer.c
+++ /dev/null
@@ -1,193 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-
-static void _evas_layer_free(Evas_Layer *lay);
-
-void
-evas_object_inject(Evas_Object *obj, Evas *e)
-{
-   Evas_Layer *lay;
-
-   if (obj->in_layer) return;
-   lay = evas_layer_find(e, obj->cur.layer);
-   if (!lay)
-     {
-        lay = evas_layer_new(e);
-        lay->layer = obj->cur.layer;
-        evas_layer_add(lay);
-     }
-   lay->objects = (Evas_Object *)eina_inlist_append(EINA_INLIST_GET(lay->objects), EINA_INLIST_GET(obj));
-   lay->usage++;
-   obj->layer = lay;
-   obj->in_layer = 1;
-}
-
-void
-evas_object_release(Evas_Object *obj, int clean_layer)
-{
-   if (!obj->in_layer) return;
-   obj->layer->objects = (Evas_Object *)eina_inlist_remove(EINA_INLIST_GET(obj->layer->objects), EINA_INLIST_GET(obj));
-   obj->layer->usage--;
-   if (clean_layer)
-     {
-        if (obj->layer->usage <= 0)
-          {
-             evas_layer_del(obj->layer);
-             _evas_layer_free(obj->layer);
-          }
-     }
-   obj->layer = NULL;
-   obj->in_layer = 0;
-}
-
-Evas_Layer *
-evas_layer_new(Evas *e)
-{
-   Evas_Layer *lay;
-
-   lay = calloc(1, sizeof(Evas_Layer));
-   if (!lay) return NULL;
-   lay->evas = e;
-   return lay;
-}
-
-static void
-_evas_layer_free(Evas_Layer *lay)
-{
-   free(lay);
-}
-
-void
-evas_layer_pre_free(Evas_Layer *lay)
-{
-   Evas_Object *obj;
-
-   EINA_INLIST_FOREACH(lay->objects, obj)
-     {
-        if ((!obj->smart.parent) && (!obj->delete_me))
-          evas_object_del(obj);
-     }
-}
-
-void
-evas_layer_free_objects(Evas_Layer *lay)
-{
-   while (lay->objects)
-     {
-        Evas_Object *obj;
-
-        obj = (Evas_Object *)lay->objects;
-        evas_object_free(obj, 0);
-     }
-}
-
-void
-evas_layer_clean(Evas *e)
-{
-   Evas_Layer *tmp;
-
-   while (e->layers)
-     {
-        tmp = e->layers;
-        evas_layer_del(tmp);
-        _evas_layer_free(tmp);
-     }
-}
-
-Evas_Layer *
-evas_layer_find(Evas *e, short layer_num)
-{
-   Evas_Layer *layer;
-
-   EINA_INLIST_FOREACH(e->layers, layer)
-     {
-        if (layer->layer == layer_num) return layer;
-     }
-   return NULL;
-}
-
-void
-evas_layer_add(Evas_Layer *lay)
-{
-   Evas_Layer *layer;
-
-   EINA_INLIST_FOREACH(lay->evas->layers, layer)
-     {
-        if (layer->layer > lay->layer)
-          {
-             lay->evas->layers = (Evas_Layer *)eina_inlist_prepend_relative(EINA_INLIST_GET(lay->evas->layers),
-                                                                            EINA_INLIST_GET(lay),
-                                                                            EINA_INLIST_GET(layer));
-             return;
-          }
-     }
-   lay->evas->layers = (Evas_Layer *)eina_inlist_append(EINA_INLIST_GET(lay->evas->layers), EINA_INLIST_GET(lay));
-}
-
-void
-evas_layer_del(Evas_Layer *lay)
-{
-   Evas *e;
-
-   e = lay->evas;
-   e->layers = (Evas_Layer *)eina_inlist_remove(EINA_INLIST_GET(e->layers), EINA_INLIST_GET(lay));
-}
-
-/* public functions */
-
-EAPI void
-evas_object_layer_set(Evas_Object *obj, short l)
-{
-   Evas *e;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (obj->delete_me) return;
-   if (evas_object_intercept_call_layer_set(obj, l)) return;
-   if (obj->smart.parent) return;
-   if (obj->cur.layer == l)
-     {
-        evas_object_raise(obj);
-        return;
-     }
-   e = obj->layer->evas;
-   evas_object_release(obj, 1);
-   obj->cur.layer = l;
-   evas_object_inject(obj, e);
-   obj->restack = 1;
-   evas_object_change(obj);
-   if (obj->clip.clipees)
-     {
-        evas_object_inform_call_restack(obj);
-        return;
-     }
-   evas_object_change(obj);
-   if (!obj->smart.smart)
-     {
-        if (evas_object_is_in_output_rect(obj,
-                                          obj->layer->evas->pointer.x,
-                                          obj->layer->evas->pointer.y, 1, 1) &&
-            obj->cur.visible)
-          if (eina_list_data_find(obj->layer->evas->pointer.object.in, obj))
-            evas_event_feed_mouse_move(obj->layer->evas,
-                                       obj->layer->evas->pointer.x,
-                                       obj->layer->evas->pointer.y,
-                                       obj->layer->evas->last_timestamp,
-                                       NULL);
-     }
-   evas_object_inform_call_restack(obj);
-}
-
-EAPI short
-evas_object_layer_get(const Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   if (obj->smart.parent)
-     {
-        return obj->smart.parent->cur.layer;
-     }
-   return obj->cur.layer;
-}
diff --git a/libraries/evas/src/lib/canvas/evas_main.c b/libraries/evas/src/lib/canvas/evas_main.c
deleted file mode 100644
index 687744f..0000000
--- a/libraries/evas/src/lib/canvas/evas_main.c
+++ /dev/null
@@ -1,710 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-#include "evas_cs.h"
-
-#ifdef LKDEBUG
-EAPI Eina_Bool lockdebug = EINA_FALSE;
-EAPI int lockmax = 0;
-#endif
-
-static int _evas_init_count = 0;
-int _evas_log_dom_global = -1;
-EAPI int
-evas_init(void)
-{
-   if (++_evas_init_count != 1)
-     return _evas_init_count;
-
-#ifdef LKDEBUG
-   if (getenv("EVAS_LOCK_DEBUG"))
-      {
-         lockdebug = EINA_TRUE;
-         lockmax = atoi(getenv("EVAS_LOCK_DEBUG"));
-      }
-#endif
-   
-#ifdef HAVE_EVIL
-   if (!evil_init())
-     return --_evas_init_count;
-#endif
-
-   if (!eina_init())
-     goto shutdown_evil;
-
-   _evas_log_dom_global = eina_log_domain_register
-     ("evas_main", EVAS_DEFAULT_LOG_COLOR);
-   if (_evas_log_dom_global < 0)
-     {
-        EINA_LOG_ERR("Can not create a module log domain.");
-        goto shutdown_eina;
-     }
-
-   evas_module_init();
-#ifdef BUILD_ASYNC_EVENTS
-   if (!evas_async_events_init())
-     goto shutdown_module;
-#endif
-#ifdef EVAS_CSERVE
-   if (getenv("EVAS_CSERVE")) evas_cserve_init();
-#endif
-#ifdef BUILD_ASYNC_PRELOAD
-   _evas_preload_thread_init();
-#endif
-#ifdef EVAS_FRAME_QUEUING
-   evas_common_frameq_init();
-#endif
-
-   return _evas_init_count;
-
-#ifdef BUILD_ASYNC_EVENTS
- shutdown_module:
-   evas_module_shutdown();
-   eina_log_domain_unregister(_evas_log_dom_global);
-#endif
- shutdown_eina:
-   eina_shutdown();
- shutdown_evil:
-#ifdef HAVE_EVIL
-   evil_shutdown();
-#endif
-
-   return --_evas_init_count;
-}
-
-EAPI int
-evas_shutdown(void)
-{
-   if (--_evas_init_count != 0)
-     return _evas_init_count;
-
-#ifdef EVAS_FRAME_QUEUING
-   if (evas_common_frameq_enabled())
-     {
-        evas_common_frameq_finish();
-        evas_common_frameq_destroy();
-     }
-#endif
-#ifdef BUILD_ASYNC_EVENTS
-   _evas_preload_thread_shutdown();
-#endif
-#ifdef EVAS_CSERVE
-   if (getenv("EVAS_CSERVE")) evas_cserve_shutdown();
-#endif
-#ifdef BUILD_ASYNC_EVENTS
-   evas_async_events_shutdown();
-#endif
-   evas_font_dir_cache_free();
-   evas_common_shutdown();
-   evas_module_shutdown();
-   eina_log_domain_unregister(_evas_log_dom_global);
-   eina_shutdown();
-#ifdef HAVE_EVIL
-   evil_shutdown();
-#endif
-
-   return _evas_init_count;
-}
-
-
-EAPI Evas *
-evas_new(void)
-{
-   Evas *e;
-
-   e = calloc(1, sizeof(Evas));
-   if (!e) return NULL;
-
-   e->magic = MAGIC_EVAS;
-   e->output.render_method = RENDER_METHOD_INVALID;
-   e->viewport.w = 1;
-   e->viewport.h = 1;
-   e->framespace.x = 0;
-   e->framespace.y = 0;
-   e->framespace.w = 0;
-   e->framespace.h = 0;
-   e->hinting = EVAS_FONT_HINTING_BYTECODE;
-   e->name_hash = eina_hash_string_superfast_new(NULL);
-   eina_clist_init(&e->calc_list);
-   eina_clist_init(&e->calc_done);
-
-#define EVAS_ARRAY_SET(E, Array) \
-   eina_array_step_set(&E->Array, sizeof (E->Array), 4096);
-
-   EVAS_ARRAY_SET(e, delete_objects);
-   EVAS_ARRAY_SET(e, active_objects);
-   EVAS_ARRAY_SET(e, restack_objects);
-   EVAS_ARRAY_SET(e, render_objects);
-   EVAS_ARRAY_SET(e, pending_objects);
-   EVAS_ARRAY_SET(e, obscuring_objects);
-   EVAS_ARRAY_SET(e, temporary_objects);
-   EVAS_ARRAY_SET(e, calculate_objects);
-   EVAS_ARRAY_SET(e, clip_changes);
-
-#undef EVAS_ARRAY_SET
-
-   return e;
-}
-
-EAPI void
-evas_free(Evas *e)
-{
-   Eina_Rectangle *r;
-   Evas_Coord_Touch_Point *touch_point;
-   Evas_Layer *lay;
-   int i;
-   int del;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-#ifdef EVAS_FRAME_QUEUING
-   evas_common_frameq_flush();
-#endif
-
-   if (e->walking_list == 0) evas_render_idle_flush(e);
-   
-   if (e->walking_list > 0) return;
-
-   if (e->callbacks)
-     {
-        if (e->callbacks->deletions_waiting) return;
-
-        e->callbacks->deletions_waiting = 0;
-        evas_event_callback_list_post_free(&e->callbacks->callbacks);
-        if (!e->callbacks->callbacks)
-          {
-             free(e->callbacks);
-             e->callbacks = NULL;
-          }
-
-        _evas_post_event_callback_free(e);
-     }
-   
-   del = 1;
-   e->walking_list++;
-   e->cleanup = 1;
-   while (del)
-     {
-        del = 0;
-        EINA_INLIST_FOREACH(e->layers, lay)
-          {
-             Evas_Object *o;
-
-             evas_layer_pre_free(lay);
-
-             EINA_INLIST_FOREACH(lay->objects, o)
-               {
-                  if ((o->callbacks) && (o->callbacks->walking_list))
-                    {
-                       /* Defer free */
-                       e->delete_me = 1;
-                       e->walking_list--;
-                       return;
-                    }
-                  if (!o->delete_me)
-                    del = 1;
-               }
-          }
-     }
-   EINA_INLIST_FOREACH(e->layers, lay)
-     evas_layer_free_objects(lay);
-   evas_layer_clean(e);
-
-   e->walking_list--;
-
-   evas_font_path_clear(e);
-   e->pointer.object.in = eina_list_free(e->pointer.object.in);
-
-   if (e->name_hash) eina_hash_free(e->name_hash);
-   e->name_hash = NULL;
-
-   EINA_LIST_FREE(e->damages, r)
-     eina_rectangle_free(r);
-   EINA_LIST_FREE(e->obscures, r)
-     eina_rectangle_free(r);
-
-   evas_fonts_zero_free(e);
-   
-   evas_event_callback_all_del(e);
-   evas_event_callback_cleanup(e);
-
-   if (e->engine.func)
-     {
-        e->engine.func->context_free(e->engine.data.output, e->engine.data.context);
-        e->engine.func->output_free(e->engine.data.output);
-        e->engine.func->info_free(e, e->engine.info);
-     }
-
-   for (i = 0; i < e->modifiers.mod.count; i++)
-     free(e->modifiers.mod.list[i]);
-   if (e->modifiers.mod.list) free(e->modifiers.mod.list);
-
-   for (i = 0; i < e->locks.lock.count; i++)
-     free(e->locks.lock.list[i]);
-   if (e->locks.lock.list) free(e->locks.lock.list);
-
-   if (e->engine.module) evas_module_unref(e->engine.module);
-
-   eina_array_flush(&e->delete_objects);
-   eina_array_flush(&e->active_objects);
-   eina_array_flush(&e->restack_objects);
-   eina_array_flush(&e->render_objects);
-   eina_array_flush(&e->pending_objects);
-   eina_array_flush(&e->obscuring_objects);
-   eina_array_flush(&e->temporary_objects);
-   eina_array_flush(&e->calculate_objects);
-   eina_array_flush(&e->clip_changes);
-
-   EINA_LIST_FREE(e->touch_points, touch_point)
-     free(touch_point);
-
-   e->magic = 0;
-   free(e);
-}
-
-EAPI void
-evas_output_method_set(Evas *e, int render_method)
-{
-   Evas_Module *em;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   /* if our engine to set it to is invalid - abort */
-   if (render_method == RENDER_METHOD_INVALID) return;
-   /* if the engine is already set up - abort */
-   if (e->output.render_method != RENDER_METHOD_INVALID) return;
-   /* Request the right engine. */
-   em = evas_module_engine_get(render_method);
-   if (!em) return ;
-   if (em->id_engine != render_method) return;
-   if (!evas_module_load(em)) return;
-
-   /* set the correct render */
-   e->output.render_method = render_method;
-   e->engine.func = (em->functions);
-   evas_module_use(em);
-   if (e->engine.module) evas_module_unref(e->engine.module);
-   e->engine.module = em;
-   evas_module_ref(em);
-   /* get the engine info struct */
-   if (e->engine.func->info) e->engine.info = e->engine.func->info(e);
-   return;
-}
-
-EAPI int
-evas_output_method_get(const Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return RENDER_METHOD_INVALID;
-   MAGIC_CHECK_END();
-
-   return e->output.render_method;
-}
-
-EAPI Evas_Engine_Info *
-evas_engine_info_get(const Evas *e)
-{
-   Evas_Engine_Info *info;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return NULL;
-   MAGIC_CHECK_END();
-
-   if (!e->engine.info) return NULL;
-
-   info = e->engine.info;
-   ((Evas *)e)->engine.info_magic = info->magic;
-
-   return info;
-}
-
-EAPI Eina_Bool
-evas_engine_info_set(Evas *e, Evas_Engine_Info *info)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-   if (!info) return EINA_FALSE;
-   if (info != e->engine.info) return EINA_FALSE;
-   if (info->magic != e->engine.info_magic) return EINA_FALSE;
-   return (Eina_Bool)e->engine.func->setup(e, info);
-}
-
-EAPI void
-evas_output_size_set(Evas *e, int w, int h)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   if ((w == e->output.w) && (h == e->output.h)) return;
-   if (w < 1) w = 1;
-   if (h < 1) h = 1;
-
-#ifdef EVAS_FRAME_QUEUING
-   evas_common_frameq_flush();
-#endif
-
-   e->output.w = w;
-   e->output.h = h;
-   e->output.changed = 1;
-   e->output_validity++;
-   e->changed = 1;
-   evas_render_invalidate(e);
-}
-
-EAPI void
-evas_output_size_get(const Evas *e, int *w, int *h)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   if (w) *w = 0;
-   if (h) *h = 0;
-   return;
-   MAGIC_CHECK_END();
-
-   if (w) *w = e->output.w;
-   if (h) *h = e->output.h;
-}
-
-EAPI void
-evas_output_viewport_set(Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   if ((x == e->viewport.x) && (y == e->viewport.y) &&
-       (w == e->viewport.w) && (h == e->viewport.h)) return;
-   if (w <= 0) return;
-   if (h <= 0) return;
-   if ((x != 0) || (y != 0))
-     {
-        ERR("Compat error. viewport x,y != 0,0 not supported");
-        x = 0;
-        y = 0;
-     }
-   e->viewport.x = x;
-   e->viewport.y = y;
-   e->viewport.w = w;
-   e->viewport.h = h;
-   e->viewport.changed = 1;
-   e->output_validity++;
-   e->changed = 1;
-}
-
-EAPI void
-evas_output_viewport_get(const Evas *e, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   if (x) *x = 0;
-   if (y) *y = 0;
-   if (w) *w = 0;
-   if (h) *h = 0;
-   return;
-   MAGIC_CHECK_END();
-
-   if (x) *x = e->viewport.x;
-   if (y) *y = e->viewport.y;
-   if (w) *w = e->viewport.w;
-   if (h) *h = e->viewport.h;
-}
-
-EAPI void 
-evas_output_framespace_set(Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) 
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   if ((x == e->framespace.x) && (y == e->framespace.y) &&
-       (w == e->framespace.w) && (h == e->framespace.h)) return;
-   e->framespace.x = x;
-   e->framespace.y = y;
-   e->framespace.w = w;
-   e->framespace.h = h;
-   e->framespace.changed = 1;
-   e->output_validity++;
-   e->changed = 1;
-}
-
-EAPI void 
-evas_output_framespace_get(const Evas *e, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) 
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   if (x) *x = 0;
-   if (y) *y = 0;
-   if (w) *w = 0;
-   if (h) *h = 0;
-   return;
-   MAGIC_CHECK_END();
-
-   if (x) *x = e->framespace.x;
-   if (y) *y = e->framespace.y;
-   if (w) *w = e->framespace.w;
-   if (h) *h = e->framespace.h;
-}
-
-EAPI Evas_Coord
-evas_coord_screen_x_to_world(const Evas *e, int x)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return 0;
-   MAGIC_CHECK_END();
-   if (e->output.w == e->viewport.w) return e->viewport.x + x;
-   return (long long)e->viewport.x + (((long long)x * (long long)e->viewport.w) / (long long)e->output.w);
-}
-
-EAPI Evas_Coord
-evas_coord_screen_y_to_world(const Evas *e, int y)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return 0;
-   MAGIC_CHECK_END();
-   if (e->output.h == e->viewport.h) return e->viewport.y + y;
-   return (long long)e->viewport.y + (((long long)y * (long long)e->viewport.h) / (long long)e->output.h);
-}
-
-EAPI int
-evas_coord_world_x_to_screen(const Evas *e, Evas_Coord x)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return 0;
-   MAGIC_CHECK_END();
-   if (e->output.w == e->viewport.w) return x - e->viewport.x;
-   return (int)((((long long)x - (long long)e->viewport.x) * (long long)e->output.w) /  (long long)e->viewport.w);
-}
-
-EAPI int
-evas_coord_world_y_to_screen(const Evas *e, Evas_Coord y)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return 0;
-   MAGIC_CHECK_END();
-   if (e->output.h == e->viewport.h) return y - e->viewport.y;
-   return (int)((((long long)y - (long long)e->viewport.y) * (long long)e->output.h) /  (long long)e->viewport.h);
-}
-
-EAPI int
-evas_render_method_lookup(const char *name)
-{
-   Evas_Module *em;
-
-   if (!name) return RENDER_METHOD_INVALID;
-   /* search on the engines list for the name */
-   em = evas_module_find_type(EVAS_MODULE_TYPE_ENGINE, name);
-   if (!em) return RENDER_METHOD_INVALID;
-
-   return em->id_engine;
-}
-
-EAPI Eina_List *
-evas_render_method_list(void)
-{
-   return evas_module_engine_list();
-}
-
-EAPI void
-evas_render_method_list_free(Eina_List *list)
-{
-   eina_list_free(list);
-}
-
-EAPI Eina_Bool
-evas_object_image_extension_can_load_get(const char *file)
-{
-   const char *tmp;
-   Eina_Bool result;
-
-   tmp = eina_stringshare_add(file);
-   result = evas_common_extension_can_load_get(tmp);
-   eina_stringshare_del(tmp);
-
-   return result;
-}
-
-EAPI Eina_Bool
-evas_object_image_extension_can_load_fast_get(const char *file)
-{
-   return evas_common_extension_can_load_get(file);
-}
-
-EAPI void
-evas_pointer_output_xy_get(const Evas *e, int *x, int *y)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   if (x) *x = 0;
-   if (y) *y = 0;
-   return;
-   MAGIC_CHECK_END();
-   if (x) *x = e->pointer.x;
-   if (y) *y = e->pointer.y;
-}
-
-EAPI void
-evas_pointer_canvas_xy_get(const Evas *e, Evas_Coord *x, Evas_Coord *y)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   if (x) *x = 0;
-   if (y) *y = 0;
-   return;
-   MAGIC_CHECK_END();
-   if (x) *x = e->pointer.x;
-   if (y) *y = e->pointer.y;
-}
-
-EAPI int
-evas_pointer_button_down_mask_get(const Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return 0;
-   MAGIC_CHECK_END();
-   return (int)e->pointer.button;
-}
-
-EAPI Eina_Bool
-evas_pointer_inside_get(const Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return 0;
-   MAGIC_CHECK_END();
-   return (int)e->pointer.inside;
-}
-
-EAPI void
-evas_data_attach_set(Evas *e, void *data)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-   e->attach_data = data;
-}
-
-EAPI void *
-evas_data_attach_get(const Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return NULL;
-   MAGIC_CHECK_END();
-   return e->attach_data;
-}
-
-EAPI void
-evas_focus_in(Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-   if (e->focus) return;
-   e->focus = 1;
-   evas_event_callback_call(e, EVAS_CALLBACK_CANVAS_FOCUS_IN, NULL);
-}
-
-EAPI void
-evas_focus_out(Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-   if (!e->focus) return;
-   e->focus = 0;
-   evas_event_callback_call(e, EVAS_CALLBACK_CANVAS_FOCUS_OUT, NULL);
-}
-
-EAPI Eina_Bool
-evas_focus_state_get(const Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return 0;
-   MAGIC_CHECK_END();
-   return e->focus;
-}
-
-EAPI void
-evas_nochange_push(Evas *e)
-{
-   e->nochange++;
-}
-
-EAPI void
-evas_nochange_pop(Evas *e)
-{
-   e->nochange--;
-}
-
-void
-_evas_walk(Evas *e)
-{
-   e->walking_list++;
-}
-
-void
-_evas_unwalk(Evas *e)
-{
-   e->walking_list--;
-   if ((e->walking_list == 0) && (e->delete_me)) evas_free(e);
-}
-
-EAPI const char *
-evas_load_error_str(Evas_Load_Error error)
-{
-   switch (error)
-     {
-      case EVAS_LOAD_ERROR_NONE:
-         return "No error on load";
-      case EVAS_LOAD_ERROR_GENERIC:
-         return "A non-specific error occurred";
-      case EVAS_LOAD_ERROR_DOES_NOT_EXIST:
-         return "File (or file path) does not exist";
-      case EVAS_LOAD_ERROR_PERMISSION_DENIED:
-         return "Permission deinied to an existing file (or path)";
-      case EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED:
-         return "Allocation of resources failure prevented load";
-      case EVAS_LOAD_ERROR_CORRUPT_FILE:
-         return "File corrupt (but was detected as a known format)";
-      case EVAS_LOAD_ERROR_UNKNOWN_FORMAT:
-         return "File is not a known format";
-      default:
-         return "Unknown error";
-     }
-}
-
-EAPI void
-evas_color_hsv_to_rgb(float h, float s, float v, int *r, int *g, int *b)
-{
-   evas_common_convert_color_hsv_to_rgb(h, s, v, r, g, b);
-}
-
-EAPI void
-evas_color_rgb_to_hsv(int r, int g, int b, float *h, float *s, float *v)
-{
-   evas_common_convert_color_rgb_to_hsv(r, g, b, h, s, v);
-}
-
-EAPI void
-evas_color_argb_premul(int a, int *r, int *g, int *b)
-{
-   evas_common_convert_color_argb_premul(a, r, g, b);
-}
-
-EAPI void
-evas_color_argb_unpremul(int a, int *r, int *g, int *b)
-{
-   evas_common_convert_color_argb_unpremul(a, r, g, b);
-}
-
-EAPI void
-evas_data_argb_premul(unsigned int *data, unsigned int len)
-{
-   if (!data || (len < 1)) return;
-   evas_common_convert_argb_premul(data, len);
-}
-
-EAPI void
-evas_data_argb_unpremul(unsigned int *data, unsigned int len)
-{
-   if (!data || (len < 1)) return;
-   evas_common_convert_argb_unpremul(data, len);
-}
diff --git a/libraries/evas/src/lib/canvas/evas_map.c b/libraries/evas/src/lib/canvas/evas_map.c
deleted file mode 100644
index 5dcb760..0000000
--- a/libraries/evas/src/lib/canvas/evas_map.c
+++ /dev/null
@@ -1,1037 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-#include <math.h>
-
-static void
-_evas_map_calc_geom_change(Evas_Object *obj)
-{
-   int is, was = 0, pass = 0;
-
-   evas_object_change(obj);
-   evas_object_clip_dirty(obj);
-   if (obj->layer->evas->events_frozen <= 0)
-     {
-        evas_object_recalc_clippees(obj);
-        if (!pass)
-          {
-             if (!obj->smart.smart)
-               {
-                  is = evas_object_is_in_output_rect(obj,
-                                                     obj->layer->evas->pointer.x,
-                                                     obj->layer->evas->pointer.y, 1, 1);
-                  if ((is ^ was) && obj->cur.visible)
-                    evas_event_feed_mouse_move(obj->layer->evas,
-                                               obj->layer->evas->pointer.x,
-                                               obj->layer->evas->pointer.y,
-                                               obj->layer->evas->last_timestamp,
-                                               NULL);
-               }
-          }
-     }
-   evas_object_inform_call_move(obj);
-   evas_object_inform_call_resize(obj);
-}
-
-static void
-_evas_map_calc_map_geometry(Evas_Object *obj)
-{
-   Evas_Coord x1, x2, yy1, yy2;
-   const Evas_Map_Point *p, *p_end;
-   Eina_Bool ch = EINA_FALSE;
-
-   if (!obj->cur.map) return;
-
-   // WARN: Do not merge below code to SLP until it is fixed.
-   // It has an infinite loop bug.
-   if (obj->prev.map)
-     {
-        // FIXME: this causes an infinite loop somewhere... hard to debug
-        if (obj->prev.map->count == obj->cur.map->count)
-          {
-             const Evas_Map_Point *p2;
-
-             p = obj->cur.map->points;
-             p_end = p + obj->cur.map->count;
-             p2 = obj->prev.map->points;
-
-             for (; p < p_end; p++, p2++)
-               {
-                  if ((p->a != p2->a) ||
-                      (p->r != p2->r) ||
-                      (p->g != p2->g) ||
-                      (p->b != p2->b))
-                    {
-                       ch = 1;
-                       break;
-                    }
-                  if ((p->x != p2->x) ||
-                      (p->y != p2->y) ||
-                      (p->z != p2->z))
-                    {
-                       ch = 1;
-                       break;
-                    }
-               }
-          }
-        else
-           ch = 1;
-     }
-   else
-      ch = 1;
-
-   p = obj->cur.map->points;
-   p_end = p + obj->cur.map->count;
-   x1 = x2 = lround(p->x);
-   yy1 = yy2 = lround(p->y);
-   p++;
-   for (; p < p_end; p++)
-     {
-        Evas_Coord x, y;
-        
-        x = lround(p->x);
-        y = lround(p->y);
-        if (x < x1) x1 = x;
-        if (x > x2) x2 = x;
-        if (y < yy1) yy1 = y;
-        if (y > yy2) yy2 = y;
-     }
-// this causes clip-out bugs now mapped objs canbe opaque!!!   
-//   // add 1 pixel of fuzz around the map region to ensure updates are correct
-//   x1 -= 1; yy1 -= 1;
-//   x2 += 1; yy2 += 1;
-   if (obj->cur.map->normal_geometry.x != x1) ch = 1;
-   if (obj->cur.map->normal_geometry.y != yy1) ch = 1;
-   if (obj->cur.map->normal_geometry.w != (x2 - x1)) ch = 1;
-   if (obj->cur.map->normal_geometry.h != (yy2 - yy1)) ch = 1;
-   obj->cur.map->normal_geometry.x = x1;
-   obj->cur.map->normal_geometry.y = yy1;
-   obj->cur.map->normal_geometry.w = (x2 - x1);
-   obj->cur.map->normal_geometry.h = (yy2 - yy1);
-   if (ch) _evas_map_calc_geom_change(obj);
-}
-
-static inline Evas_Map *
-_evas_map_new(int count)
-{
-   int i;
-   int alloc;
-   Evas_Map *m;
-
-   /* Adjust allocation such that: at least 4 points, and always an even
-    * number: this allows the software engine to work efficiently */
-   alloc = (count < 4) ? 4 : count;
-   if (alloc & 0x1) alloc ++;
-
-   m = calloc(1, sizeof(Evas_Map) + (alloc * sizeof(Evas_Map_Point)));
-   if (!m) return NULL;
-   m->count = count;
-   m->persp.foc = 0;
-   m->alpha = 1;
-   m->smooth = 1;
-   m->magic = MAGIC_MAP;
-   for (i = 0; i < count; i++)
-     {
-        m->points[i].r = 255;
-        m->points[i].g = 255;
-        m->points[i].b = 255;
-        m->points[i].a = 255;
-     }
-   return m;
-}
-
-static inline Eina_Bool
-_evas_map_copy(Evas_Map *dst, const Evas_Map *src)
-{
-   if (dst->count != src->count)
-     {
-        ERR("cannot copy map of different sizes: dst=%i, src=%i", dst->count, src->count);
-        return EINA_FALSE;
-     }
-   memcpy(dst->points, src->points, src->count * sizeof(Evas_Map_Point));
-   dst->smooth = src->smooth;
-   dst->alpha = src->alpha;
-   dst->persp = src->persp;
-   return EINA_TRUE;
-}
-
-static inline Evas_Map *
-_evas_map_dup(const Evas_Map *orig)
-{
-   Evas_Map *copy = _evas_map_new(orig->count);
-   if (!copy) return NULL;
-   memcpy(copy->points, orig->points, orig->count * sizeof(Evas_Map_Point));
-   copy->smooth = orig->smooth;
-   copy->alpha = orig->alpha;
-   copy->persp = orig->persp;
-   return copy;
-}
-
-static inline void
-_evas_map_free(Evas_Object *obj, Evas_Map *m)
-{
-   if (obj)
-     {
-        if (m->surface)
-          obj->layer->evas->engine.func->image_map_surface_free
-          (obj->layer->evas->engine.data.output, m->surface);
-     }
-   m->magic = 0;
-   free(m);
-}
-
-/****************************************************************************/
-/* util functions for manipulating maps, so you don't need to know the math */
-/****************************************************************************/
-static inline void
-_evas_map_util_points_populate(Evas_Map *m, const Evas_Coord x, const Evas_Coord y, const Evas_Coord w, const Evas_Coord h, const Evas_Coord z)
-{
-   Evas_Map_Point *p = m->points;
-   int i;
-
-   p[0].x = x;
-   p[0].y = y;
-   p[0].z = z;
-   p[0].u = 0.0;
-   p[0].v = 0.0;
-
-   p[1].x = x + w;
-   p[1].y = y;
-   p[1].z = z;
-   p[1].u = w;
-   p[1].v = 0.0;
-
-   p[2].x = x + w;
-   p[2].y = y + h;
-   p[2].z = z;
-   p[2].u = w;
-   p[2].v = h;
-
-   p[3].x = x;
-   p[3].y = y + h;
-   p[3].z = z;
-   p[3].u = 0.0;
-   p[3].v = h;
-
-   for (i = 0; i < 4; i++)
-     {
-        p[i].px = p[i].x;
-        p[i].py = p[i].y;
-     }
-}
-
-Eina_Bool
-evas_map_coords_get(const Evas_Map *m, Evas_Coord x, Evas_Coord y,
-                    Evas_Coord *mx, Evas_Coord *my, int grab)
-{
-   MAGIC_CHECK(m, Evas_Map, MAGIC_MAP);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-
-   int i, j, edges, edge[m->count][2], douv;
-   Evas_Coord xe[2];
-   double u[2] = { 0.0, 0.0 };
-   double v[2] = { 0.0, 0.0 };
-
-   if (m->count < 4) return 0;
-   // FIXME need to handle grab mode and extrapolte coords outside
-   // map
-   if (grab)
-     {
-        Evas_Coord ymin, ymax;
-
-        ymin = m->points[0].y;
-        ymax = m->points[0].y;
-        for (i = 1; i < m->count; i++)
-          {
-             if (m->points[i].y < ymin) ymin = m->points[i].y;
-             else if (m->points[i].y > ymax) ymax = m->points[i].y;
-          }
-        if (y <= ymin) y = ymin + 1;
-        if (y >= ymax) y = ymax - 1;
-     }
-   edges = 0;
-   for (i = 0; i < m->count; i++)
-     {
-        j = (i + 1) % m->count;
-        if ((m->points[i].y <= y) && (m->points[j].y > y))
-          {
-             edge[edges][0] = i;
-             edge[edges][1] = j;
-             edges++;
-          }
-        else if ((m->points[j].y <= y) && (m->points[i].y > y))
-          {
-             edge[edges][0] = j;
-             edge[edges][1] = i;
-             edges++;
-          }
-     }
-   douv = 0;
-   if ((mx) || (my)) douv = 1;
-   for (i = 0; i < (edges - 1); i+= 2)
-     {
-        Evas_Coord yp, yd;
-
-        j = i + 1;
-        yd = m->points[edge[i][1]].y - m->points[edge[i][0]].y;
-        if (yd > 0)
-          {
-             yp = y - m->points[edge[i][0]].y;
-             xe[0] = m->points[edge[i][1]].x - m->points[edge[i][0]].x;
-             xe[0] = m->points[edge[i][0]].x + ((xe[0] * yp) / yd);
-             if (douv)
-               {
-                  u[0] = m->points[edge[i][1]].u - m->points[edge[i][0]].u;
-                  u[0] = m->points[edge[i][0]].u + ((u[0] * yp) / yd);
-                  v[0] = m->points[edge[i][1]].v - m->points[edge[i][0]].v;
-                  v[0] = m->points[edge[i][0]].v + ((v[0] * yp) / yd);
-               }
-          }
-        else
-          {
-             xe[0] = m->points[edge[i][0]].x;
-             if (douv)
-               {
-                  u[0] = m->points[edge[i][0]].u;
-                  v[0] = m->points[edge[i][0]].v;
-               }
-          }
-        yd = m->points[edge[j][1]].y - m->points[edge[j][0]].y;
-        if (yd > 0)
-          {
-             yp = y - m->points[edge[j][0]].y;
-             xe[1] = m->points[edge[j][1]].x - m->points[edge[j][0]].x;
-             xe[1] = m->points[edge[j][0]].x + ((xe[1] * yp) / yd);
-             if (douv)
-               {
-                  u[1] = m->points[edge[j][1]].u - m->points[edge[j][0]].u;
-                  u[1] = m->points[edge[j][0]].u + ((u[1] * yp) / yd);
-                  v[1] = m->points[edge[j][1]].v - m->points[edge[j][0]].v;
-                  v[1] = m->points[edge[j][0]].v + ((v[1] * yp) / yd);
-               }
-          }
-        else
-          {
-             xe[1] = m->points[edge[j][0]].x;
-             if (douv)
-               {
-                  u[1] = m->points[edge[j][0]].u;
-                  v[1] = m->points[edge[j][0]].v;
-               }
-          }
-        if (xe[0] > xe[1])
-          {
-             int ti;
-
-             ti = xe[0]; xe[0] = xe[1]; xe[1] = ti;
-             if (douv)
-               {
-                  double td;
-
-                  td = u[0]; u[0] = u[1]; u[1] = td;
-                  td = v[0]; v[0] = v[1]; v[1] = td;
-               }
-          }
-        if ((x >= xe[0]) && (x < xe[1]))
-          {
-             if (douv)
-               {
-                  if (mx)
-                    *mx = u[0] + (((x - xe[0]) * (u[1] - u[0])) /
-                                  (xe[1] - xe[0]));
-                 if (my)
-                    *my = v[0] + (((x - xe[0]) * (v[1] - v[0])) /
-                                  (xe[1] - xe[0]));
-               }
-             return EINA_TRUE;
-          }
-        if (grab)
-          {
-             if (douv)
-               {
-                  if (mx)
-                    *mx = u[0] + (((x - xe[0]) * (u[1] - u[0])) /
-                                  (xe[1] - xe[0]));
-                  if (my)
-                    *my = v[0] + (((x - xe[0]) * (v[1] - v[0])) /
-                                  (xe[1] - xe[0]));
-               }
-             return EINA_TRUE;
-          }
-     }
-   return EINA_FALSE;
-}
-
-Eina_Bool
-evas_map_inside_get(const Evas_Map *m, Evas_Coord x, Evas_Coord y)
-{
-   return evas_map_coords_get(m, x, y, NULL, NULL, 0);
-}
-
-EAPI void
-evas_object_map_enable_set(Evas_Object *obj, Eina_Bool enabled)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   Eina_Bool pchange = EINA_FALSE;
-
-   enabled = !!enabled;
-   if (obj->cur.usemap == enabled) return;
-   pchange = obj->changed;
-   obj->cur.usemap = enabled;
-   if (enabled)
-     {
-        if (!obj->cur.map)
-          obj->cur.map = _evas_map_new(4);
-        evas_object_mapped_clip_across_mark(obj);
-//        obj->cur.map->normal_geometry = obj->cur.geometry;
-     }
-   else
-     {
-        if (obj->cur.map)
-          {
-             _evas_map_calc_geom_change(obj);
-             evas_object_mapped_clip_across_mark(obj);
-             //FIXME: Since the last frame is not updated when map is
-             //disabled, afterimage problem is happened in s/w rendering.
-             //Need to find out the fundamental reason then fix it.
-             evas_damage_rectangle_add(obj->layer->evas,
-                                       0,
-                                       0,
-                                       obj->layer->evas->output.w,
-                                       obj->layer->evas->output.h);
-          }
-     }
-   _evas_map_calc_map_geometry(obj);
-   /* This is a bit heavy handed, but it fixes the case of same geometry, but
-    * changed colour or UV settings. */
-   evas_object_change(obj);
-   if (!obj->changed_pchange) obj->changed_pchange = pchange;
-   obj->changed_map = EINA_TRUE;
-}
-
-EAPI Eina_Bool
-evas_object_map_enable_get(const Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-   return obj->cur.usemap;
-}
-
-
-EAPI void
-evas_object_map_source_set(Evas_Object *obj, Evas_Object *src)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   (void)src; /* method still needs to be implemented. */
-}
-
-EAPI Evas_Object *
-evas_object_map_source_get(const Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   return NULL;
-}
-
-EAPI void
-evas_object_map_set(Evas_Object *obj, const Evas_Map *map)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-
-   if (!map)
-     {
-        if (obj->cur.map)
-          {
-             if (obj->cur.map->surface)
-               {
-                  obj->layer->evas->engine.func->image_map_surface_free
-                    (obj->layer->evas->engine.data.output,
-                     obj->cur.map->surface);
-                  obj->cur.map->surface = NULL;
-               }
-             obj->prev.geometry = obj->cur.map->normal_geometry;
-             if (!obj->prev.map)
-               {
-                  _evas_map_free(obj, obj->cur.map);
-                  obj->cur.map = NULL;
-                  evas_object_mapped_clip_across_mark(obj);
-                  return;
-               }
-             _evas_map_free(obj, obj->cur.map);
-             obj->cur.map = NULL;
-             if (!obj->cur.usemap) _evas_map_calc_geom_change(obj);
-             else _evas_map_calc_map_geometry(obj);
-             if (obj->cur.usemap)
-               {
-                  evas_object_mapped_clip_across_mark(obj);
-                  //FIXME: Since the last frame is not updated when map is
-                  //disabled, afterimage problem is happened in s/w
-                  //rendering. Need to find out the fundamental reason
-                  //then fix it.
-                  evas_damage_rectangle_add(obj->layer->evas,
-                                            0,
-                                            0,
-                                            obj->layer->evas->output.w,
-                                            obj->layer->evas->output.h);
-               }
-          }
-        return;
-     }
-
-   if ((obj->cur.map) && (obj->cur.map->count == map->count))
-     {
-        Evas_Map *omap = obj->cur.map;
-        obj->cur.map = _evas_map_new(map->count);
-        memcpy(obj->cur.map, omap, sizeof(Evas_Map) + (map->count * sizeof(Evas_Map_Point)));
-        _evas_map_copy(obj->cur.map, map);
-        if (obj->prev.map == omap) obj->prev.map = NULL;
-        free(omap);
-     }
-   else
-     {
-        if (obj->cur.map) evas_map_free(obj->cur.map);
-        obj->cur.map = _evas_map_dup(map);
-        if (obj->cur.usemap)
-           evas_object_mapped_clip_across_mark(obj);
-     }
-   _evas_map_calc_map_geometry(obj);
-}
-
-EAPI const Evas_Map *
-evas_object_map_get(const Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-
-   return obj->cur.map;
-}
-
-EAPI Evas_Map *
-evas_map_new(int count)
-{
-   if (count != 4)
-     {
-        ERR("map point count (%i) != 4 is unsupported!", count);
-        return NULL;
-     }
-
-   return _evas_map_new(count);
-}
-
-EAPI void
-evas_map_smooth_set(Evas_Map *m, Eina_Bool enabled)
-{
-   MAGIC_CHECK(m, Evas_Map, MAGIC_MAP);
-   return;
-   MAGIC_CHECK_END();
-
-   m->smooth = enabled;
-}
-
-EAPI Eina_Bool
-evas_map_smooth_get(const Evas_Map *m)
-{
-   MAGIC_CHECK(m, Evas_Map, MAGIC_MAP);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-
-   return m->smooth;
-}
-
-EAPI void
-evas_map_alpha_set(Evas_Map *m, Eina_Bool enabled)
-{
-   MAGIC_CHECK(m, Evas_Map, MAGIC_MAP);
-   return;
-   MAGIC_CHECK_END();
-
-   m->alpha = enabled;
-}
-
-EAPI Eina_Bool
-evas_map_alpha_get(const Evas_Map *m)
-{
-   MAGIC_CHECK(m, Evas_Map, MAGIC_MAP);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-
-   return m->alpha;
-}
-
-EAPI Evas_Map *
-evas_map_dup(const Evas_Map *m)
-{
-   MAGIC_CHECK(m, Evas_Map, MAGIC_MAP);
-   return NULL;
-   MAGIC_CHECK_END();
-
-   return _evas_map_dup(m);
-}
-
-EAPI void
-evas_map_free(Evas_Map *m)
-{
-   MAGIC_CHECK(m, Evas_Map, MAGIC_MAP);
-   return;
-   MAGIC_CHECK_END();
-
-   _evas_map_free(NULL, m);
-}
-
-EAPI int
-evas_map_count_get(const Evas_Map *m)
-{
-   MAGIC_CHECK(m, Evas_Map, MAGIC_MAP);
-   return -1;
-   MAGIC_CHECK_END();
-
-   return m->count;
-}
-
-EAPI void
-evas_map_point_coord_set(Evas_Map *m, int idx, Evas_Coord x, Evas_Coord y, Evas_Coord z)
-{
-   MAGIC_CHECK(m, Evas_Map, MAGIC_MAP);
-   return;
-   MAGIC_CHECK_END();
-
-   Evas_Map_Point *p;
-
-   if (idx >= m->count) return;
-   p = m->points + idx;
-   p->x = p->px = x;
-   p->y = p->py = y;
-   p->z = z;
-}
-
-EAPI void
-evas_map_point_coord_get(const Evas_Map *m, int idx, Evas_Coord *x, Evas_Coord *y, Evas_Coord *z)
-{
-   MAGIC_CHECK(m, Evas_Map, MAGIC_MAP);
-   goto error;
-   MAGIC_CHECK_END();
-
-   const Evas_Map_Point *p;
-
-   if (idx >= m->count) goto error;
-   p = m->points + idx;
-   if (x) *x = p->x;
-   if (y) *y = p->y;
-   if (z) *z = p->z;
-   return;
-
- error:
-   if (x) *x = 0;
-   if (y) *y = 0;
-   if (z) *z = 0;
-}
-
-EAPI void
-evas_map_point_image_uv_set(Evas_Map *m, int idx, double u, double v)
-{
-   MAGIC_CHECK(m, Evas_Map, MAGIC_MAP);
-   return;
-   MAGIC_CHECK_END();
-
-   Evas_Map_Point *p;
-
-   if (idx >= m->count) return;
-   p = m->points + idx;
-   p->u = u;
-   p->v = v;
-}
-
-EAPI void
-evas_map_point_image_uv_get(const Evas_Map *m, int idx, double *u, double *v)
-{
-   MAGIC_CHECK(m, Evas_Map, MAGIC_MAP);
-   goto error;
-   MAGIC_CHECK_END();
-
-   const Evas_Map_Point *p;
-
-   if (idx >= m->count) goto error;
-   p = m->points + idx;
-   if (u) *u = p->u;
-   if (v) *v = p->v;
-   return;
-
- error:
-   if (u) *u = 0.0;
-   if (v) *v = 0.0;
-}
-
-EAPI void
-evas_map_point_color_set(Evas_Map *m, int idx, int r, int g, int b, int a)
-{
-   MAGIC_CHECK(m, Evas_Map, MAGIC_MAP);
-   return;
-   MAGIC_CHECK_END();
-
-   Evas_Map_Point *p;
-
-   if (idx >= m->count) return;
-   p = m->points + idx;
-   p->r = r;
-   p->g = g;
-   p->b = b;
-   p->a = a;
-}
-
-EAPI void
-evas_map_point_color_get(const Evas_Map *m, int idx, int *r, int *g, int *b, int *a)
-{
-   MAGIC_CHECK(m, Evas_Map, MAGIC_MAP);
-   return;
-   MAGIC_CHECK_END();
-
-   const Evas_Map_Point *p;
-
-   if (idx >= m->count) return;
-   p = m->points + idx;
-   if (r) *r = p->r;
-   if (g) *g = p->g;
-   if (b) *b = p->b;
-   if (a) *a = p->a;
-}
-
-EAPI void
-evas_map_util_points_populate_from_object_full(Evas_Map *m, const Evas_Object *obj, Evas_Coord z)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-
-   if (m->count != 4)
-     {
-        ERR("map has count=%d where 4 was expected.", m->count);
-        return;
-     }
-   _evas_map_util_points_populate(m, obj->cur.geometry.x, obj->cur.geometry.y,
-                                  obj->cur.geometry.w, obj->cur.geometry.h, z);
-}
-
-EAPI void
-evas_map_util_points_populate_from_object(Evas_Map *m, const Evas_Object *obj)
-{
-   MAGIC_CHECK(m, Evas_Map, MAGIC_MAP);
-   return;
-   MAGIC_CHECK_END();
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-
-   if (m->count != 4)
-     {
-        ERR("map has count=%d where 4 was expected.", m->count);
-        return;
-     }
-   _evas_map_util_points_populate(m, obj->cur.geometry.x, obj->cur.geometry.y,
-                                  obj->cur.geometry.w, obj->cur.geometry.h, 0);
-}
-
-EAPI void
-evas_map_util_points_populate_from_geometry(Evas_Map *m, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Evas_Coord z)
-{
-   MAGIC_CHECK(m, Evas_Map, MAGIC_MAP);
-   return;
-   MAGIC_CHECK_END();
-
-   if (m->count != 4)
-     {
-        ERR("map has count=%d where 4 was expected.", m->count);
-        return;
-     }
-   _evas_map_util_points_populate(m, x, y, w, h, z);
-}
-
-EAPI void
-evas_map_util_points_color_set(Evas_Map *m, int r, int g, int b, int a)
-{
-   MAGIC_CHECK(m, Evas_Map, MAGIC_MAP);
-   return;
-   MAGIC_CHECK_END();
-
-   Evas_Map_Point *p, *p_end;
-
-   p = m->points;
-   p_end = p + m->count;
-   for (; p < p_end; p++)
-     {
-        p->r = r;
-        p->g = g;
-        p->b = b;
-        p->a = a;
-     }
-}
-
-EAPI void
-evas_map_util_rotate(Evas_Map *m, double degrees, Evas_Coord cx, Evas_Coord cy)
-{
-   MAGIC_CHECK(m, Evas_Map, MAGIC_MAP);
-   return;
-   MAGIC_CHECK_END();
-
-   double r = (degrees * M_PI) / 180.0;
-   Evas_Map_Point *p, *p_end;
-
-   p = m->points;
-   p_end = p + m->count;
-
-   for (; p < p_end; p++)
-     {
-        double x, y, xx, yy;
-
-        x = p->x - cx;
-        y = p->y - cy;
-
-        xx = x * cos(r);
-        yy = x * sin(r);
-        x = xx - (y * sin(r));
-        y = yy + (y * cos(r));
-
-        p->px = p->x = x + cx;
-        p->py = p->y = y + cy;
-     }
-}
-
-EAPI void
-evas_map_util_zoom(Evas_Map *m, double zoomx, double zoomy, Evas_Coord cx, Evas_Coord cy)
-{
-   MAGIC_CHECK(m, Evas_Map, MAGIC_MAP);
-   return;
-   MAGIC_CHECK_END();
-
-   Evas_Map_Point *p, *p_end;
-
-   p = m->points;
-   p_end = p + m->count;
-
-   for (; p < p_end; p++)
-     {
-        double x, y;
-
-        x = p->x - cx;
-        y = p->y - cy;
-
-        x = (((double)x) * zoomx);
-        y = (((double)y) * zoomy);
-
-        p->px = p->x = x + cx;
-        p->py = p->y = y + cy;
-     }
-}
-
-EAPI void
-evas_map_util_3d_rotate(Evas_Map *m, double dx, double dy, double dz,
-                        Evas_Coord cx, Evas_Coord cy, Evas_Coord cz)
-{
-   MAGIC_CHECK(m, Evas_Map, MAGIC_MAP);
-   return;
-   MAGIC_CHECK_END();
-
-   double rz = (dz * M_PI) / 180.0;
-   double rx = (dx * M_PI) / 180.0;
-   double ry = (dy * M_PI) / 180.0;
-   Evas_Map_Point *p, *p_end;
-
-   p = m->points;
-   p_end = p + m->count;
-
-   for (; p < p_end; p++)
-     {
-        double x, y, z, xx, yy, zz;
-
-        x = p->x - cx;
-        y = p->y - cy;
-        z = p->z - cz;
-
-        if (rz != 0.0)
-          {
-             xx = x * cos(rz);
-             yy = x * sin(rz);
-             x = xx - (y * sin(rz));
-             y = yy + (y * cos(rz));
-          }
-
-        if (ry != 0.0)
-          {
-             xx = x * cos(ry);
-             zz = x * sin(ry);
-             x = xx - (z * sin(ry));
-             z = zz + (z * cos(ry));
-          }
-
-        if (rx != 0.0)
-          {
-             zz = z * cos(rx);
-             yy = z * sin(rx);
-             z = zz - (y * sin(rx));
-             y = yy + (y * cos(rx));
-          }
-
-        p->px = p->x = x + cx;
-        p->py = p->y = y + cy;
-        p->z = z + cz;
-     }
-}
-
-EAPI void
-evas_map_util_3d_lighting(Evas_Map *m,
-                          Evas_Coord lx, Evas_Coord ly, Evas_Coord lz,
-                          int lr, int lg, int lb, int ar, int ag, int ab)
-{
-   MAGIC_CHECK(m, Evas_Map, MAGIC_MAP);
-   return;
-   MAGIC_CHECK_END();
-
-   int i;
-
-   for (i = 0; i < m->count; i++)
-     {
-        double x, y, z;
-        double nx, ny, nz, x1, yy1, z1, x2, yy2, z2, ln, br;
-        int h, j, mr, mg, mb;
-
-        x = m->points[i].x;
-        y = m->points[i].y;
-        z = m->points[i].z;
-        // calc normal
-        h = (i - 1 + 4) % 4 + (i & ~0x3); // prev point
-        j = (i + 1)     % 4 + (i & ~0x3); // next point
-
-        x1 = m->points[h].x - x;
-        yy1 = m->points[h].y - y;
-        z1 = m->points[h].z - z;
-
-        x2 = m->points[j].x - x;
-        yy2 = m->points[j].y - y;
-        z2 = m->points[j].z - z;
-        nx = (yy1 * z2) - (z1 * yy2);
-        ny = (z1 * x2) - (x1 * z2);
-        nz = (x1 * yy2) - (yy1 * x2);
-
-        ln = (nx * nx) + (ny * ny) + (nz * nz);
-        ln = sqrt(ln);
-
-        if (ln != 0.0)
-          {
-             nx /= ln;
-             ny /= ln;
-             nz /= ln;
-          }
-
-        // calc point -> light vector
-        x = lx - x;
-        y = ly - y;
-        z = lz - z;
-
-        ln = (x * x) + (y * y) + (z * z);
-        ln = sqrt(ln);
-
-        if (ln != 0.0)
-          {
-             x /= ln;
-             y /= ln;
-             z /= ln;
-          }
-
-        // brightness - tan (0.0 -> 1.0 brightness really)
-        br = (nx * x) + (ny * y) + (nz * z);
-        if (br < 0.0) br = 0.0;
-
-        mr = ar + ((lr - ar) * br);
-        mg = ag + ((lg - ag) * br);
-        mb = ab + ((lb - ab) * br);
-        if (m->points[i].a != 255)
-          {
-             mr = (mr * m->points[i].a) / 255;
-             mg = (mg * m->points[i].a) / 255;
-             mb = (mb * m->points[i].a) / 255;
-          }
-        m->points[i].r = (m->points[i].r * mr) / 255;
-        m->points[i].g = (m->points[i].g * mg) / 255;
-        m->points[i].b = (m->points[i].b * mb) / 255;
-     }
-}
-
-EAPI void
-evas_map_util_3d_perspective(Evas_Map *m,
-                             Evas_Coord px, Evas_Coord py,
-                             Evas_Coord z0, Evas_Coord foc)
-{
-   MAGIC_CHECK(m, Evas_Map, MAGIC_MAP);
-   return;
-   MAGIC_CHECK_END();
-
-   Evas_Map_Point *p, *p_end;
-
-   p = m->points;
-   p_end = p + m->count;
-
-   m->persp.px = px;
-   m->persp.py = py;
-   m->persp.z0 = z0;
-   m->persp.foc = foc;
-
-   if (foc <= 0) return;
-
-   for (; p < p_end; p++)
-     {
-        double x, y, zz;
-
-        x = p->x - px;
-        y = p->y - py;
-
-        zz = ((p->z - z0) + foc);
-
-        if (zz > 0)
-          {
-             x = (x * foc) / zz;
-             y = (y * foc) / zz;
-          }
-
-        p->x = px + x;
-        p->y = py + y;
-     }
-}
-
-EAPI Eina_Bool
-evas_map_util_clockwise_get(Evas_Map *m)
-{
-   MAGIC_CHECK(m, Evas_Map, MAGIC_MAP);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-
-   int i, j, k, count;
-   long long c;
-
-   if (m->count < 3) return EINA_FALSE;
-
-   count = 0;
-   for (i = 0; i < m->count; i++)
-     {
-        j = (i + 1) % m->count;
-        k = (i + 2) % m->count;
-        c =
-          ((m->points[j].x - m->points[i].x) *
-           (m->points[k].y - m->points[j].y))
-          -
-          ((m->points[j].y - m->points[i].y) *
-           (m->points[k].x - m->points[j].x));
-        if (c < 0) count--;
-        else if (c > 0) count++;
-     }
-   if (count > 0) return EINA_TRUE;
-   return EINA_FALSE;
-}
diff --git a/libraries/evas/src/lib/canvas/evas_name.c b/libraries/evas/src/lib/canvas/evas_name.c
deleted file mode 100644
index 1a9d20f..0000000
--- a/libraries/evas/src/lib/canvas/evas_name.c
+++ /dev/null
@@ -1,72 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-
-EAPI void
-evas_object_name_set(Evas_Object *obj, const char *name)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (obj->name)
-     {
-        eina_hash_del(obj->layer->evas->name_hash, obj->name, obj);
-        free(obj->name);
-     }
-   if (!name) obj->name = NULL;
-   else
-     {
-        obj->name = strdup(name);
-        eina_hash_add(obj->layer->evas->name_hash, obj->name, obj);
-     }
-}
-
-EAPI const char *
-evas_object_name_get(const Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   return obj->name;
-}
-
-EAPI Evas_Object *
-evas_object_name_find(const Evas *e, const char *name)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return NULL;
-   MAGIC_CHECK_END();
-   if (!name) return NULL;
-   return (Evas_Object *)eina_hash_find(e->name_hash, name);
-}
-
-static Evas_Object *
-_evas_object_name_child_find(const Evas_Object *obj, const char *name, int recurse)
-{
-   const Eina_Inlist *lst;
-   Evas_Object *child;
-   
-   if (!obj->smart.smart) return NULL;
-   lst = evas_object_smart_members_get_direct(obj);
-   EINA_INLIST_FOREACH(lst, child)
-     {
-        if (child->delete_me) continue;
-        if (!child->name) continue;
-        if (!strcmp(name, child->name)) return child;
-        if (recurse != 0)
-          {
-             if ((obj = _evas_object_name_child_find(child, name, recurse - 1)))
-               return (Evas_Object *)obj;
-          }
-     }
-   return NULL;
-}
-
-EAPI Evas_Object *
-evas_object_name_child_find(const Evas_Object *obj, const char *name, int recurse)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   if (!name) return NULL;
-   return _evas_object_name_child_find(obj, name, recurse);
-}
diff --git a/libraries/evas/src/lib/canvas/evas_object_box.c b/libraries/evas/src/lib/canvas/evas_object_box.c
deleted file mode 100644
index 228d37c..0000000
--- a/libraries/evas/src/lib/canvas/evas_object_box.c
+++ /dev/null
@@ -1,2127 +0,0 @@
-#include "evas_common.h"
-
-#ifdef _WIN32_WCE
-# undef remove
-#endif
-
-typedef struct _Evas_Object_Box_Iterator Evas_Object_Box_Iterator;
-typedef struct _Evas_Object_Box_Accessor Evas_Object_Box_Accessor;
-
-struct _Evas_Object_Box_Iterator
-{
-   Eina_Iterator iterator;
-
-   Eina_Iterator *real_iterator;
-   const Evas_Object *box;
-};
-
-struct _Evas_Object_Box_Accessor
-{
-   Eina_Accessor accessor;
-
-   Eina_Accessor *real_accessor;
-   const Evas_Object *box;
-};
-
-#define _evas_object_box_type "Evas_Object_Box"
-#define SIG_CHILD_ADDED "child,added"
-#define SIG_CHILD_REMOVED "child,removed"
-
-static const Evas_Smart_Cb_Description _signals[] = 
-{
-   {SIG_CHILD_ADDED, ""},
-   {SIG_CHILD_REMOVED, ""},
-   {NULL, NULL}
-};
-
-
-static void _sizing_eval(Evas_Object *obj);
-
-#define EVAS_OBJECT_BOX_DATA_GET(o, ptr)                        \
-  Evas_Object_Box_Data *ptr = evas_object_smart_data_get(o)
-
-#define EVAS_OBJECT_BOX_DATA_GET_OR_RETURN(o, ptr)                      \
-  EVAS_OBJECT_BOX_DATA_GET(o, ptr);                                     \
-  if (!ptr)                                                             \
-    {                                                                   \
-       CRIT("no widget data for object %p (%s)",        \
-                o, evas_object_type_get(o));                            \
-       fflush(stderr);                                                  \
-       abort();                                                         \
-       return;                                                          \
-}
-
-#define EVAS_OBJECT_BOX_DATA_GET_OR_RETURN_VAL(o, ptr, val)             \
-  EVAS_OBJECT_BOX_DATA_GET(o, ptr);                                     \
-  if (!ptr)                                                             \
-    {                                                                   \
-       CRIT("no widget data for object %p (%s)",        \
-               o, evas_object_type_get(o));                             \
-       fflush(stderr);                                                  \
-       abort();                                                         \
-       return val;                                                      \
-    }
-
-EVAS_SMART_SUBCLASS_NEW(_evas_object_box_type, _evas_object_box,
-                        Evas_Object_Box_Api, Evas_Smart_Class,
-                        evas_object_smart_clipped_class_get, NULL)
-
-static Eina_Bool
-_evas_object_box_iterator_next(Evas_Object_Box_Iterator *it, void **data)
-{
-   Evas_Object_Box_Option *opt;
-
-   if (!eina_iterator_next(it->real_iterator, (void **)&opt))
-     return EINA_FALSE;
-   if (data) *data = opt->obj;
-   return EINA_TRUE;
-}
-
-static Evas_Object *
-_evas_object_box_iterator_get_container(Evas_Object_Box_Iterator *it)
-{
-   return (Evas_Object *)it->box;
-}
-
-static void
-_evas_object_box_iterator_free(Evas_Object_Box_Iterator *it)
-{
-   eina_iterator_free(it->real_iterator);
-   free(it);
-}
-
-static Eina_Bool
-_evas_object_box_accessor_get_at(Evas_Object_Box_Accessor *it, unsigned int idx, void **data)
-{
-   Evas_Object_Box_Option *opt = NULL;
-
-   if (!eina_accessor_data_get(it->real_accessor, idx, (void *)&opt))
-     return EINA_FALSE;
-   if (data) *data = opt->obj;
-   return EINA_TRUE;
-}
-
-static Evas_Object *
-_evas_object_box_accessor_get_container(Evas_Object_Box_Accessor *it)
-{
-   return (Evas_Object *)it->box;
-}
-
-static void
-_evas_object_box_accessor_free(Evas_Object_Box_Accessor *it)
-{
-   eina_accessor_free(it->real_accessor);
-   free(it);
-}
-
-static void
-_on_child_resize(void *data, Evas *evas __UNUSED__, Evas_Object *o __UNUSED__, void *einfo __UNUSED__)
-{
-   Evas_Object *box = data;
-   EVAS_OBJECT_BOX_DATA_GET_OR_RETURN(box, priv);
-   if (!priv->layouting) evas_object_smart_changed(box);
-}
-
-static void
-_on_child_del(void *data, Evas *evas __UNUSED__, Evas_Object *o, void *einfo __UNUSED__)
-{
-   const Evas_Object_Box_Api *api;
-   Evas_Object *box = data;
-
-   EVAS_OBJECT_BOX_DATA_GET(box, priv);
-   api = priv->api;
-
-   if ((!api) || (!api->remove))
-     {
-        ERR("no api->remove");
-        return;
-     }
-
-   if (!api->remove(box, priv, o))
-     ERR("child removal failed");
-   evas_object_smart_changed(box);
-}
-
-static void
-_on_child_hints_changed(void *data, Evas *evas __UNUSED__, Evas_Object *o __UNUSED__, void *einfo __UNUSED__)
-{
-   Evas_Object *box = data;
-   EVAS_OBJECT_BOX_DATA_GET_OR_RETURN(box, priv);
-   if (!priv->layouting) evas_object_smart_changed(box);
-}
-
-static void
-_on_hints_changed(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *o , void *einfo __UNUSED__)
-{
-   _sizing_eval(o);
-}
-
-static Evas_Object_Box_Option *
-_evas_object_box_option_new(Evas_Object *o, Evas_Object_Box_Data *priv, Evas_Object *child)
-{
-   Evas_Object_Box_Option *opt;
-   const Evas_Object_Box_Api *api;
-
-   api = priv->api;
-   if ((!api) || (!api->option_new))
-     {
-        ERR("no api->option_new");
-        return NULL;
-     }
-
-   opt = api->option_new(o, priv, child);
-   if (!opt)
-     {
-        ERR("option_new failed");
-        return NULL;
-     }
-
-   return opt;
-}
-
-static void
-_evas_object_box_child_callbacks_unregister(Evas_Object *obj)
-{
-   evas_object_event_callback_del
-     (obj, EVAS_CALLBACK_RESIZE, _on_child_resize);
-   evas_object_event_callback_del
-     (obj, EVAS_CALLBACK_FREE, _on_child_del);
-   evas_object_event_callback_del
-     (obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_child_hints_changed);
-}
-
-static Evas_Object_Box_Option *
-_evas_object_box_option_callbacks_register(Evas_Object *o, Evas_Object_Box_Data *priv, Evas_Object_Box_Option *opt)
-{
-   const Evas_Object_Box_Api *api;
-   Evas_Object *obj = opt->obj;
-
-   api = priv->api;
-
-   if ((!api) || (!api->option_free))
-     {
-        WRN("api->option_free not set (may cause memory leaks, segfaults)");
-        return NULL;
-     }
-
-   evas_object_event_callback_add
-     (obj, EVAS_CALLBACK_RESIZE, _on_child_resize, o);
-   evas_object_event_callback_add
-     (obj, EVAS_CALLBACK_FREE, _on_child_del, o);
-   evas_object_event_callback_add
-     (obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_child_hints_changed, o);
-
-   return opt;
-}
-
-static Evas_Object_Box_Option *
-_evas_object_box_option_new_default(Evas_Object *o __UNUSED__, Evas_Object_Box_Data *priv __UNUSED__, Evas_Object *child)
-{
-   Evas_Object_Box_Option *opt;
-
-   opt = (Evas_Object_Box_Option *)malloc(sizeof(*opt));
-   if (!opt)
-     return NULL;
-
-   opt->obj = child;
-
-   return opt;
-}
-
-static void
-_evas_object_box_option_free_default(Evas_Object *o __UNUSED__, Evas_Object_Box_Data *priv __UNUSED__, Evas_Object_Box_Option *opt)
-{
-   free(opt);
-}
-
-static Evas_Object_Box_Option *
-_evas_object_box_append_default(Evas_Object *o, Evas_Object_Box_Data *priv, Evas_Object *child)
-{
-   Evas_Object_Box_Option *opt;
-
-   opt = _evas_object_box_option_new(o, priv, child);
-   if (!opt)
-     return NULL;
-
-   priv->children = eina_list_append(priv->children, opt);
-   priv->children_changed = EINA_TRUE;
-   evas_object_smart_callback_call(o, SIG_CHILD_ADDED, opt);
-
-   return opt;
-}
-
-static Evas_Object_Box_Option *
-_evas_object_box_prepend_default(Evas_Object *o, Evas_Object_Box_Data *priv, Evas_Object *child)
-{
-   Evas_Object_Box_Option *opt;
-
-   opt = _evas_object_box_option_new(o, priv, child);
-   if (!opt)
-     return NULL;
-
-   priv->children = eina_list_prepend(priv->children, opt);
-   priv->children_changed = EINA_TRUE;
-   evas_object_smart_callback_call(o, SIG_CHILD_ADDED, opt);
-
-   return opt;
-}
-
-static Evas_Object_Box_Option *
-_evas_object_box_insert_before_default(Evas_Object *o, Evas_Object_Box_Data *priv, Evas_Object *child, const Evas_Object *reference)
-{
-   Eina_List *l;
-   Evas_Object_Box_Option *opt;
-
-   EINA_LIST_FOREACH(priv->children, l, opt)
-     {
-        if (opt->obj == reference)
-          {
-             Evas_Object_Box_Option *new_opt;
-
-             new_opt = _evas_object_box_option_new(o, priv, child);
-             if (!new_opt)
-               return NULL;
-
-             priv->children = eina_list_prepend_relative
-               (priv->children, new_opt, opt);
-             priv->children_changed = EINA_TRUE;
-             evas_object_smart_callback_call(o, SIG_CHILD_ADDED, new_opt);
-             return new_opt;
-          }
-     }
-
-   return NULL;
-}
-
-static Evas_Object_Box_Option *
-_evas_object_box_insert_after_default(Evas_Object *o, Evas_Object_Box_Data *priv, Evas_Object *child, const Evas_Object *reference)
-{
-   Eina_List *l;
-   Evas_Object_Box_Option *opt;
-
-   EINA_LIST_FOREACH(priv->children, l, opt)
-     {
-        if (opt->obj == reference)
-          {
-             Evas_Object_Box_Option *new_opt;
-
-             new_opt = _evas_object_box_option_new(o, priv, child);
-             if (!new_opt)
-               return NULL;
-
-             priv->children = eina_list_append_relative
-                (priv->children, new_opt, opt);
-             priv->children_changed = EINA_TRUE;
-             evas_object_smart_callback_call(o, SIG_CHILD_ADDED, new_opt);
-             return new_opt;
-          }
-     }
-
-   return NULL;
-}
-
-static Evas_Object_Box_Option *
-_evas_object_box_insert_at_default(Evas_Object *o, Evas_Object_Box_Data *priv, Evas_Object *child, unsigned int pos)
-{
-   Eina_List *l;
-   unsigned int i;
-
-   if ((pos == 0) && (eina_list_count(priv->children) == 0))
-     {
-        Evas_Object_Box_Option *new_opt;
-
-        new_opt = _evas_object_box_option_new(o, priv, child);
-        if (!new_opt)
-          return NULL;
-
-        priv->children = eina_list_prepend(priv->children, new_opt);
-        priv->children_changed = EINA_TRUE;
-        evas_object_smart_callback_call(o, SIG_CHILD_ADDED, new_opt);
-        return new_opt;
-     }
-
-   for (l = priv->children, i = 0; l; l = l->next, i++)
-     {
-        Evas_Object_Box_Option *opt = l->data;
-
-        if (i == pos)
-          {
-             Evas_Object_Box_Option *new_opt;
-
-             new_opt = _evas_object_box_option_new(o, priv, child);
-             if (!new_opt)
-               return NULL;
-
-             priv->children = eina_list_prepend_relative
-               (priv->children, new_opt, opt);
-             priv->children_changed = EINA_TRUE;
-             evas_object_smart_callback_call(o, SIG_CHILD_ADDED, new_opt);
-             return new_opt;
-          }
-     }
-
-   return NULL;
-}
-
-static Evas_Object *
-_evas_object_box_remove_default(Evas_Object *o, Evas_Object_Box_Data *priv, Evas_Object *child)
-{
-   const Evas_Object_Box_Api *api;
-   Evas_Object_Box_Option *opt;
-   Eina_List *l;
-
-   api = priv->api;
-
-   if ((!api) || (!api->option_free))
-     {
-        ERR("api->option_free not set (may cause memory leaks, segfaults)");
-        return NULL;
-     }
-
-   EINA_LIST_FOREACH(priv->children, l, opt)
-     {
-        Evas_Object *obj = opt->obj;
-
-        if (obj == child)
-          {
-             priv->children = eina_list_remove(priv->children, opt);
-             api->option_free(o, priv, opt);
-             priv->children_changed = EINA_TRUE;
-             evas_object_smart_callback_call(o, SIG_CHILD_REMOVED, obj);
-
-             return obj;
-          }
-     }
-
-   return NULL;
-}
-
-static Evas_Object *
-_evas_object_box_remove_at_default(Evas_Object *o, Evas_Object_Box_Data *priv, unsigned int pos)
-{
-   const Evas_Object_Box_Api *api;
-   Eina_List *node;
-   Evas_Object_Box_Option *opt;
-   Evas_Object *obj;
-
-   api = priv->api;
-
-   if ((!api) || (!api->option_free))
-     {
-        WRN("api->option_free not set (may cause memory leaks, segfaults)");
-        return NULL;
-     }
-
-   node = eina_list_nth_list(priv->children, pos);
-   if (!node)
-     {
-        ERR("No item to be removed at position %d", pos);
-        return NULL;
-     }
-
-   opt = node->data;
-   obj = opt->obj;
-
-   priv->children = eina_list_remove_list(priv->children, node);
-   api->option_free(o, priv, opt);
-   priv->children_changed = EINA_TRUE;
-   evas_object_smart_callback_call(o, SIG_CHILD_REMOVED, obj);
-   return obj;
-}
-
-static void
-_evas_object_box_smart_add(Evas_Object *o)
-{
-   Evas_Object_Box_Data *priv;
-
-   priv = evas_object_smart_data_get(o);
-   if (!priv)
-     {
-        const Evas_Smart *smart;
-        const Evas_Smart_Class *sc;
-
-        priv = (Evas_Object_Box_Data *)calloc(1, sizeof(*priv));
-        if (!priv)
-          {
-             ERR("Could not allocate object private data.");
-             return;
-          }
-
-        smart = evas_object_smart_smart_get(o);
-        sc = evas_smart_class_get(smart);
-        priv->api = (const Evas_Object_Box_Api *)sc;
-
-        evas_object_smart_data_set(o, priv);
-     }
-   _evas_object_box_parent_sc->add(o);
-
-
-   evas_object_event_callback_add
-     (o, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_hints_changed, o);
-   priv->children = NULL;
-   priv->align.h = 0.5;
-   priv->align.v = 0.5;
-   priv->pad.h = 0;
-   priv->pad.v = 0;
-   priv->layout.cb = evas_object_box_layout_horizontal;
-   priv->layout.data = NULL;
-   priv->layout.free_data = NULL;
-}
-
-static void
-_evas_object_box_smart_del(Evas_Object *o)
-{
-   const Evas_Object_Box_Api *api;
-   Eina_List *l;
-
-   EVAS_OBJECT_BOX_DATA_GET(o, priv);
-
-   api = priv->api;
-   if ((!api) || (!api->option_free))
-     {
-        WRN("api->option_free not set (may cause memory leaks, segfaults)");
-        return;
-     }
-
-   l = priv->children;
-   while (l)
-     {
-        Evas_Object_Box_Option *opt = l->data;
-
-        _evas_object_box_child_callbacks_unregister(opt->obj);
-        api->option_free(o, priv, opt);
-        l = eina_list_remove_list(l, l);
-     }
-
-   if (priv->layout.data && priv->layout.free_data)
-     priv->layout.free_data(priv->layout.data);
-
-   _evas_object_box_parent_sc->del(o);
-}
-
-static void
-_evas_object_box_smart_resize(Evas_Object *o, Evas_Coord w, Evas_Coord h)
-{
-   Evas_Coord ow, oh;
-   evas_object_geometry_get(o, NULL, NULL, &ow, &oh);
-   if ((ow == w) && (oh == h)) return;
-   evas_object_smart_changed(o);
-}
-
-static void
-_evas_object_box_smart_calculate(Evas_Object *o)
-{
-   EVAS_OBJECT_BOX_DATA_GET_OR_RETURN(o, priv);
-   if (priv->layout.cb)
-       {
-           priv->layouting = 1;
-           priv->layout.cb(o, priv, priv->layout.data);
-           priv->layouting = 0;
-           priv->children_changed = EINA_FALSE;
-       }
-   else
-     ERR("No layout function set for %p box.", o);
-}
-
-static void
-_evas_object_box_smart_set_user(Evas_Object_Box_Api *api)
-{
-   api->base.add = _evas_object_box_smart_add;
-   api->base.del = _evas_object_box_smart_del;
-   api->base.resize = _evas_object_box_smart_resize;
-   api->base.calculate = _evas_object_box_smart_calculate;
-   api->base.callbacks = _signals;
-
-   api->append = _evas_object_box_append_default;
-   api->prepend = _evas_object_box_prepend_default;
-   api->insert_before = _evas_object_box_insert_before_default;
-   api->insert_after = _evas_object_box_insert_after_default;
-   api->insert_at = _evas_object_box_insert_at_default;
-   api->remove = _evas_object_box_remove_default;
-   api->remove_at = _evas_object_box_remove_at_default;
-   api->option_new = _evas_object_box_option_new_default;
-   api->option_free = _evas_object_box_option_free_default;
-}
-
-EAPI Evas_Object *
-evas_object_box_add(Evas *evas)
-{
-   return evas_object_smart_add(evas, _evas_object_box_smart_class_new());
-}
-
-EAPI Evas_Object *
-evas_object_box_add_to(Evas_Object *parent)
-{
-   Evas *evas;
-   Evas_Object *o;
-
-   evas = evas_object_evas_get(parent);
-   o = evas_object_box_add(evas);
-   evas_object_smart_member_add(o, parent);
-   return o;
-}
-
-EAPI void
-evas_object_box_smart_set(Evas_Object_Box_Api *api)
-{
-   if (!api)
-     return;
-   _evas_object_box_smart_set(api);
-}
-
-EAPI const Evas_Object_Box_Api *
-evas_object_box_smart_class_get(void)
-{
-   static Evas_Object_Box_Api _sc = 
-     EVAS_OBJECT_BOX_API_INIT_NAME_VERSION(_evas_object_box_type);
-   static const Evas_Object_Box_Api *class = NULL;
-
-   if (class)
-     return class;
-
-   evas_object_box_smart_set(&_sc);
-   class = &_sc;
-
-   return class;
-}
-
-EAPI void
-evas_object_box_layout_set(Evas_Object *o, Evas_Object_Box_Layout cb, const void *data, void (*free_data)(void *data))
-{
-   EVAS_OBJECT_BOX_DATA_GET_OR_RETURN(o, priv);
-
-   if ((priv->layout.cb == cb) && (priv->layout.data == data) && 
-       (priv->layout.free_data == free_data))
-     return;
-
-   if (priv->layout.data && priv->layout.free_data)
-     priv->layout.free_data(priv->layout.data);
-
-   priv->layout.cb = cb;
-   priv->layout.data = (void *)data;
-   priv->layout.free_data = free_data;
-   evas_object_smart_changed(o);
-}
-
-static void
-_fixed_point_divide_and_decompose_integer(int dividend, int divisor, int *int_part, int *frac_part)
-{
-   int quotient = (long long)(dividend << 16) / divisor;
-   *frac_part = quotient & 0xffff;
-   *int_part = quotient >> 16;
-}
-
-static void
-_layout_dimension_change_min_max_cell_bound(int dim, int *new_dim, int min_d, int max_d, int cell_sz)
-{
-   if (dim > cell_sz)
-     {
-        if ((min_d != 0) && (cell_sz < min_d))
-          *new_dim = min_d;
-        else
-          *new_dim = cell_sz;
-     }
-   else
-     {
-        if ((max_d != -1) && (cell_sz > max_d))
-          *new_dim = max_d;
-        else
-          *new_dim = cell_sz;
-     }
-}
-
-static void
-_layout_set_offset_and_expand_dimension_space_max_bounded(int dim, int *new_dim, int space_sz, int max_dim, int *offset, double align, int pad_before, int pad_after)
-{
-   if (align >= 0.0)
-     {
-        *new_dim = dim;
-        *offset = (space_sz - (dim + pad_before + pad_after)) * align
-          + pad_before;
-     }
-   else
-     {
-        if ((max_dim != -1) && (space_sz > max_dim))
-          {
-             *new_dim = max_dim;
-             *offset = (space_sz - (max_dim + pad_before + pad_after)) * 0.5
-               + pad_before;
-          }
-        else
-          {
-             *new_dim = space_sz;
-             *offset = 0;
-          }
-     }
-}
-
-static void
-_layout_set_offset_and_change_dimension_min_max_cell_bounded(int dim, int *new_dim, int min_dim, int max_dim, int cell_sz, int *offset, double align, int pad_before, int pad_after)
-{
-   if (align >= 0.0)
-     {
-        *new_dim = dim;
-        *offset =
-          (cell_sz - (dim + pad_before + pad_after)) * align + pad_before;
-     }
-   else
-     {
-        *offset = pad_before;
-        _layout_dimension_change_min_max_cell_bound
-          (dim, new_dim, min_dim, max_dim, cell_sz - pad_before - pad_after);
-     }
-}
-
-static void
-_sizing_eval(Evas_Object *obj)
-{
-   Evas_Coord minw, minh, maxw, maxh;
-   Evas_Coord w, h;
-
-   evas_object_size_hint_min_get(obj, &minw, &minh);
-   evas_object_size_hint_max_get(obj, &maxw, &maxh);
-   evas_object_geometry_get(obj, NULL, NULL, &w, &h);
-
-   if (w < minw) w = minw;
-   if (h < minh) h = minh;
-   if ((maxw >= 0) && (w > maxw)) w = maxw;
-   if ((maxh >= 0) && (h > maxh)) h = maxh;
-
-   evas_object_resize(obj, w, h);
-}
-
-static int
-_evas_object_box_layout_horizontal_weight_apply(Evas_Object_Box_Data *priv, Evas_Object_Box_Option **objects, int n_objects, int remaining, int weight_total)
-{
-   int rem_diff = 0;
-   int i;
-
-   for (i = 0; i < n_objects; i++)
-     {
-        Evas_Object_Box_Option *opt = objects[i];
-        Evas_Object *o = opt->obj;
-        int h;
-
-        evas_object_geometry_get(o, NULL, NULL, NULL, &h);
-
-        if (remaining <= 0)
-          {
-             int min_w;
-
-             evas_object_size_hint_min_get(o, &min_w, NULL);
-             evas_object_resize(o, min_w, h);
-          }
-        else
-          {
-             double normal_weight, weight_x;
-             int target_size;
-             int max_w;
-
-             evas_object_size_hint_weight_get(o, &weight_x, NULL);
-             normal_weight = weight_x / weight_total;
-             target_size = (int)((double)remaining * normal_weight);
-
-             evas_object_size_hint_max_get(o, &max_w, NULL);
-             if ((max_w != -1) && (target_size > max_w))
-               {
-                  evas_object_resize(o, max_w, h);
-                  rem_diff += max_w;
-                  objects[i] = objects[n_objects - 1];
-                  weight_total -= weight_x;
-                  n_objects--;
-                  return _evas_object_box_layout_horizontal_weight_apply
-                    (priv, objects, n_objects, remaining - rem_diff,
-                     weight_total);
-               }
-             else
-               {
-                  evas_object_resize(o, target_size, h);
-                  rem_diff += target_size;
-               }
-          }
-     }
-
-   return remaining - rem_diff;
-}
-
-EAPI void
-evas_object_box_layout_horizontal(Evas_Object *o, Evas_Object_Box_Data *priv, void *data __UNUSED__)
-{
-   int pad_inc = 0, sub_pixel = 0;
-   int req_w, global_pad, remaining, top_h = 0;
-   double weight_total = 0.0;
-   int weight_use = 0;
-   int x, y, w, h;
-   int n_children;
-   Evas_Object_Box_Option *opt;
-   Evas_Object_Box_Option **objects;
-   Eina_List *l;
-
-   n_children = eina_list_count(priv->children);
-   if (!n_children)
-     return;
-
-   objects = (Evas_Object_Box_Option **)alloca(sizeof(Evas_Object_Box_Option *) * n_children);
-   if (!objects)
-     return;
-
-   evas_object_geometry_get(o, &x, &y, &w, &h);
-   global_pad = priv->pad.h;
-   req_w = global_pad * (n_children - 1);
-
-   EINA_LIST_FOREACH(priv->children, l, opt)
-     {
-        int padding_l, padding_r;
-        double weight_x;
-
-        _sizing_eval(opt->obj);
-        evas_object_size_hint_weight_get(opt->obj, &weight_x, NULL);
-        evas_object_size_hint_padding_get
-          (opt->obj, &padding_l, &padding_r, NULL, NULL);
-        req_w += padding_l + padding_r;
-
-        if (!weight_x)
-          {
-             int child_w;
-
-             evas_object_geometry_get(opt->obj, NULL, NULL, &child_w, NULL);
-             req_w += child_w;
-          }
-        else
-          {
-             objects[weight_use] = opt;
-             weight_use++;
-             weight_total += weight_x;
-          }
-     }
-
-   remaining = w - req_w;
-
-   if (weight_use)
-     remaining = _evas_object_box_layout_horizontal_weight_apply
-       (priv, objects, weight_use, remaining, weight_total);
-
-   if (priv->align.h >= 0.0)
-     x += remaining * priv->align.h;
-   else if (n_children == 1)
-     x += remaining / 2;
-   else
-     { /* justified */
-        _fixed_point_divide_and_decompose_integer
-            (remaining, n_children - 1, &global_pad, &pad_inc);
-        global_pad += priv->pad.h;
-     }
-
-   EINA_LIST_FOREACH(priv->children, l, opt)
-     {
-        int child_w, child_h, max_h, new_h, off_x, off_y;
-        int padding_l, padding_r, padding_t, padding_b;
-        double align_y;
-
-        evas_object_size_hint_align_get(opt->obj, NULL, &align_y);
-        evas_object_size_hint_padding_get
-          (opt->obj, &padding_l, &padding_r, &padding_t, &padding_b);
-        evas_object_size_hint_max_get(opt->obj, NULL, &max_h);
-
-        evas_object_geometry_get(opt->obj, NULL, NULL, &child_w, &child_h);
-
-        off_x = padding_l;
-        new_h = child_h;
-        if (new_h > top_h) top_h = new_h;
-
-        _layout_set_offset_and_expand_dimension_space_max_bounded
-          (child_h, &new_h, h, max_h, &off_y, align_y, padding_t, padding_b);
-
-        if (new_h != child_h)
-          evas_object_resize(opt->obj, child_w, new_h);
-        evas_object_move(opt->obj, x + off_x, y + off_y);
-
-        x += child_w + padding_l + padding_r + global_pad;
-        sub_pixel += pad_inc;
-        if (sub_pixel >= 1 << 16)
-          {
-             x++;
-             sub_pixel -= 1 << 16;
-          }
-     }
-
-   evas_object_size_hint_min_set(o, req_w, top_h);
-}
-
-static int
-_evas_object_box_layout_vertical_weight_apply(Evas_Object_Box_Data *priv, Evas_Object_Box_Option **objects, int n_objects, int remaining, int weight_total)
-{
-   int rem_diff = 0;
-   int i;
-
-   for (i = 0; i < n_objects; i++)
-     {
-        Evas_Object_Box_Option *opt = objects[i];
-        Evas_Object *o = opt->obj;
-        int w;
-
-        evas_object_geometry_get(o, NULL, NULL, &w, NULL);
-
-        if (remaining <= 0)
-          {
-             int min_h;
-
-             evas_object_size_hint_min_get(o, NULL, &min_h);
-             evas_object_resize(o, w, min_h);
-          }
-        else
-          {
-             double normal_weight, weight_y;
-             int target_size;
-             int max_h;
-
-             evas_object_size_hint_weight_get(o, NULL, &weight_y);
-             normal_weight = weight_y / weight_total;
-             target_size = (int)((double)remaining * normal_weight);
-
-             evas_object_size_hint_max_get(o, NULL, &max_h);
-             if ((max_h != -1) && (target_size > max_h))
-               {
-                  evas_object_resize(o, w, max_h);
-                  rem_diff += max_h;
-                  objects[i] = objects[n_objects - 1];
-                  weight_total -= weight_y;
-                  n_objects--;
-                  return _evas_object_box_layout_vertical_weight_apply
-                    (priv, objects, n_objects, remaining - rem_diff,
-                     weight_total);
-               }
-             else
-               {
-                  evas_object_resize(o, w, target_size);
-                  rem_diff += target_size;
-               }
-          }
-     }
-
-   return remaining - rem_diff;
-}
-
-EAPI void
-evas_object_box_layout_vertical(Evas_Object *o, Evas_Object_Box_Data *priv, void *data __UNUSED__)
-{
-   int pad_inc = 0, sub_pixel = 0;
-   int req_h, global_pad, remaining, top_w = 0;
-   double weight_total = 0.0;
-   int weight_use = 0;
-   int x, y, w, h;
-   int n_children;
-   Evas_Object_Box_Option *opt;
-   Evas_Object_Box_Option **objects;
-   Eina_List *l;
-
-   n_children = eina_list_count(priv->children);
-   if (!n_children)
-     return;
-
-   objects = (Evas_Object_Box_Option **)alloca(sizeof(Evas_Object_Box_Option *) * n_children);
-   if (!objects)
-     return;
-
-   evas_object_geometry_get(o, &x, &y, &w, &h);
-   global_pad = priv->pad.v;
-   req_h = global_pad * (n_children - 1);
-
-   EINA_LIST_FOREACH(priv->children, l, opt)
-     {
-        int padding_t, padding_b;
-        double weight_y;
-
-        _sizing_eval(opt->obj);
-        evas_object_size_hint_weight_get(opt->obj, NULL, &weight_y);
-        evas_object_size_hint_padding_get
-          (opt->obj, NULL, NULL, &padding_t, &padding_b);
-        req_h += padding_t + padding_b;
-
-        if (!weight_y)
-          {
-             int child_h;
-
-             evas_object_geometry_get(opt->obj, NULL, NULL, NULL, &child_h);
-             req_h += child_h;
-          }
-        else
-          {
-             objects[weight_use] = opt;
-             weight_use++;
-             weight_total += weight_y;
-          }
-     }
-
-   remaining = h - req_h;
-
-   if (weight_use)
-     remaining = _evas_object_box_layout_vertical_weight_apply
-       (priv, objects, weight_use, remaining, weight_total);
-
-   if (priv->align.v >= 0.0)
-     y += remaining * priv->align.v;
-   else if (n_children == 1)
-     y += remaining / 2;
-   else
-     { /* justified */
-        _fixed_point_divide_and_decompose_integer
-          (remaining, n_children - 1, &global_pad, &pad_inc);
-        global_pad += priv->pad.v;
-     }
-
-   EINA_LIST_FOREACH(priv->children, l, opt)
-     {
-        int child_w, child_h, max_w, new_w, off_x, off_y;
-        int padding_l, padding_r, padding_t, padding_b;
-        double align_x;
-
-        evas_object_size_hint_align_get(opt->obj, &align_x, NULL);
-        evas_object_size_hint_padding_get
-          (opt->obj, &padding_l, &padding_r, &padding_t, &padding_b);
-        evas_object_size_hint_max_get(opt->obj, &max_w, NULL);
-
-        evas_object_geometry_get(opt->obj, NULL, NULL, &child_w, &child_h);
-
-        off_y = padding_t;
-        new_w = child_w;
-
-        _layout_set_offset_and_expand_dimension_space_max_bounded
-          (child_w, &new_w, w, max_w, &off_x, align_x, padding_l, padding_r);
-
-        if (new_w > top_w) top_w = new_w;
-
-        if (new_w != child_w)
-          evas_object_resize(opt->obj, new_w, child_h);
-        evas_object_move(opt->obj, x + off_x, y + off_y);
-
-        y += child_h + padding_t + padding_b + global_pad;
-        sub_pixel += pad_inc;
-        if (sub_pixel >= 1 << 16)
-          {
-             y++;
-             sub_pixel -= 1 << 16;
-          }
-     }
-
-   evas_object_size_hint_min_set(o, top_w, req_h);
-}
-
-EAPI void
-evas_object_box_layout_homogeneous_horizontal(Evas_Object *o, Evas_Object_Box_Data *priv, void *data __UNUSED__)
-{
-   int cell_sz, share, inc;
-   int sub_pixel = 0;
-   int x, y, w, h;
-   int n_children;
-   Evas_Object_Box_Option *opt;
-   Eina_List *l;
-
-   n_children = eina_list_count(priv->children);
-   if (!n_children)
-     return;
-
-   evas_object_geometry_get(o, &x, &y, &w, &h);
-
-   share = w - priv->pad.h * (n_children - 1);
-   _fixed_point_divide_and_decompose_integer
-     (share, n_children, &cell_sz, &inc);
-
-   EINA_LIST_FOREACH(priv->children, l, opt)
-     {
-        int child_w, child_h, max_h, min_w, max_w, new_w, new_h, off_x, off_y;
-        int padding_l, padding_r, padding_t, padding_b;
-        double align_x, align_y;
-
-        evas_object_size_hint_align_get(opt->obj, &align_x, &align_y);
-        evas_object_size_hint_padding_get
-          (opt->obj, &padding_l, &padding_r, &padding_t, &padding_b);
-        evas_object_size_hint_max_get(opt->obj, &max_w, &max_h);
-        evas_object_size_hint_min_get(opt->obj, &min_w, NULL);
-
-        _sizing_eval(opt->obj);
-        evas_object_geometry_get(opt->obj, NULL, NULL, &child_w, &child_h);
-
-        new_w = child_w;
-        new_h = child_h;
-
-        _layout_set_offset_and_expand_dimension_space_max_bounded
-          (child_h, &new_h, h, max_h, &off_y, align_y, padding_t, padding_b);
-
-        _layout_set_offset_and_change_dimension_min_max_cell_bounded
-          (child_w, &new_w, min_w, max_w, cell_sz, &off_x, align_x,
-           padding_l, padding_r);
-
-        if ((new_w != child_w) || (new_h != child_h))
-          evas_object_resize(opt->obj, new_w, new_h);
-        evas_object_move(opt->obj, x + off_x, y + off_y);
-
-        x += cell_sz + priv->pad.h;
-        sub_pixel += inc;
-        if (sub_pixel >= 1 << 16)
-          {
-             x++;
-             sub_pixel -= 1 << 16;
-          }
-     }
-
-   evas_object_size_hint_min_set(o, w, h);
-}
-
-EAPI void
-evas_object_box_layout_homogeneous_vertical(Evas_Object *o, Evas_Object_Box_Data *priv, void *data __UNUSED__)
-{
-   int cell_sz, share, inc;
-   int sub_pixel = 0;
-   int x, y, w, h;
-   int n_children;
-   Evas_Object_Box_Option *opt;
-   Eina_List *l;
-
-   n_children = eina_list_count(priv->children);
-   if (!n_children)
-     return;
-
-   evas_object_geometry_get(o, &x, &y, &w, &h);
-
-   share = h - priv->pad.v * (n_children - 1);
-   _fixed_point_divide_and_decompose_integer
-     (share, n_children, &cell_sz, &inc);
-
-   EINA_LIST_FOREACH(priv->children, l, opt)
-     {
-        int child_w, child_h, max_w, min_h, max_h, new_w, new_h, off_x, off_y;
-        int padding_l, padding_r, padding_t, padding_b;
-        double align_x, align_y;
-
-        evas_object_size_hint_align_get(opt->obj, &align_x, &align_y);
-        evas_object_size_hint_padding_get
-          (opt->obj, &padding_l, &padding_r, &padding_t, &padding_b);
-        evas_object_size_hint_max_get(opt->obj, &max_w, &max_h);
-        evas_object_size_hint_min_get(opt->obj, NULL, &min_h);
-
-        _sizing_eval(opt->obj);
-        evas_object_geometry_get(opt->obj, NULL, NULL, &child_w, &child_h);
-        new_w = child_w;
-        new_h = child_h;
-
-        _layout_set_offset_and_expand_dimension_space_max_bounded
-          (child_w, &new_w, w, max_w, &off_x, align_x, padding_l, padding_r);
-
-        _layout_set_offset_and_change_dimension_min_max_cell_bounded
-          (child_h, &new_h, min_h, max_h, cell_sz, &off_y, align_y,
-           padding_t, padding_b);
-
-        if ((new_w != child_w) || (new_h != child_h))
-          evas_object_resize(opt->obj, new_w, new_h);
-        evas_object_move(opt->obj, x + off_x, y + off_y);
-
-        y += cell_sz + priv->pad.v;
-        sub_pixel += inc;
-        if (sub_pixel >= 1 << 16)
-          {
-             y++;
-             sub_pixel -= 1 << 16;
-          }
-     }
-
-   evas_object_size_hint_min_set(o, w, h);
-}
-
-EAPI void
-evas_object_box_layout_homogeneous_max_size_horizontal(Evas_Object *o, Evas_Object_Box_Data *priv, void *data __UNUSED__)
-{
-   int remaining, global_pad, pad_inc = 0, sub_pixel = 0;
-   int cell_sz = 0;
-   int x, y, w, h;
-   int top_h = 0;
-   int n_children;
-   Evas_Object_Box_Option *opt;
-   Eina_List *l;
-
-   n_children = eina_list_count(priv->children);
-   if (!n_children)
-     return;
-
-   evas_object_geometry_get(o, &x, &y, &w, &h);
-
-   EINA_LIST_FOREACH(priv->children, l, opt)
-     {
-        int child_w, padding_l, padding_r;
-
-        _sizing_eval(opt->obj);
-        evas_object_size_hint_padding_get
-          (opt->obj, &padding_l, &padding_r, NULL, NULL);
-        evas_object_geometry_get(opt->obj, NULL, NULL, &child_w, NULL);
-        if (child_w + padding_l + padding_r > cell_sz)
-          cell_sz = child_w + padding_l + padding_r;
-     }
-
-   global_pad = priv->pad.h;
-   remaining = w - n_children * cell_sz - global_pad * (n_children - 1);
-
-   if (priv->align.h >= 0.0)
-     x += remaining * priv->align.h;
-   else if (n_children == 1)
-     x += remaining / 2;
-   else
-     { /* justified */
-        _fixed_point_divide_and_decompose_integer
-          (remaining, n_children - 1, &global_pad, &pad_inc);
-        global_pad += priv->pad.h;
-     }
-
-   EINA_LIST_FOREACH(priv->children, l, opt)
-     {
-        int child_w, child_h, min_w, max_w, max_h, new_w, new_h, off_x, off_y;
-        int padding_l, padding_r, padding_t, padding_b;
-        double align_x, align_y;
-
-        evas_object_size_hint_align_get(opt->obj, &align_x, &align_y);
-        evas_object_size_hint_padding_get
-          (opt->obj, &padding_l, &padding_r, &padding_t, &padding_b);
-        evas_object_size_hint_max_get(opt->obj, &max_w, &max_h);
-        evas_object_size_hint_min_get(opt->obj, &min_w, NULL);
-
-        evas_object_geometry_get(opt->obj, NULL, NULL, &child_w, &child_h);
-
-        new_w = child_w;
-        new_h = child_h;
-        if (new_h > top_h) top_h = new_h;
-
-        _layout_set_offset_and_expand_dimension_space_max_bounded
-          (child_h, &new_h, h, max_h, &off_y, align_y, padding_t, padding_b);
-
-        _layout_set_offset_and_change_dimension_min_max_cell_bounded
-          (child_w, &new_w, min_w, max_w, cell_sz, &off_x, align_x,
-           padding_l, padding_r);
-
-        if ((new_w != child_w) || (new_h != child_h))
-          evas_object_resize(opt->obj, new_w, new_h);
-        evas_object_move(opt->obj, x + off_x, y + off_y);
-
-        x += cell_sz + global_pad;
-        sub_pixel += pad_inc;
-        if (sub_pixel >= 1 << 16)
-          {
-             x++;
-             sub_pixel -= 1 << 16;
-          }
-     }
-
-   evas_object_size_hint_min_set(o, x, top_h);
-}
-
-EAPI void
-evas_object_box_layout_homogeneous_max_size_vertical(Evas_Object *o, Evas_Object_Box_Data *priv, void *data __UNUSED__)
-{
-   int remaining, global_pad, pad_inc = 0, sub_pixel = 0;
-   int cell_sz = 0;
-   int x, y, w, h;
-   int top_w = 0;
-   int n_children;
-   Evas_Object_Box_Option *opt;
-   Eina_List *l;
-
-   n_children = eina_list_count(priv->children);
-   if (!n_children)
-     return;
-
-   evas_object_geometry_get(o, &x, &y, &w, &h);
-
-   EINA_LIST_FOREACH(priv->children, l, opt)
-     {
-        int child_h, padding_t, padding_b;
-
-        _sizing_eval(opt->obj);
-        evas_object_size_hint_padding_get
-          (opt->obj, NULL, NULL, &padding_t, &padding_b);
-        evas_object_geometry_get(opt->obj, NULL, NULL, NULL, &child_h);
-        if (child_h + padding_t + padding_b > cell_sz)
-          cell_sz = child_h + padding_t + padding_b;
-     }
-
-   global_pad = priv->pad.v;
-   remaining = h - n_children * cell_sz - global_pad * (n_children - 1);
-
-   if (priv->align.v >= 0.0)
-     y += remaining * priv->align.v;
-   else if (n_children == 1)
-     y += remaining / 2;
-   else
-     { /* justified */
-        _fixed_point_divide_and_decompose_integer
-          (remaining, n_children - 1, &global_pad, &pad_inc);
-        global_pad += priv->pad.v;
-     }
-
-   EINA_LIST_FOREACH(priv->children, l, opt)
-     {
-        int child_w, child_h, max_h, min_h, max_w, new_w, new_h, off_x, off_y;
-        int padding_l, padding_r, padding_t, padding_b;
-        double align_x, align_y;
-
-        evas_object_size_hint_align_get(opt->obj, &align_x, &align_y);
-        evas_object_size_hint_padding_get
-          (opt->obj, &padding_l, &padding_r, &padding_t, &padding_b);
-        evas_object_size_hint_max_get(opt->obj, &max_w, &max_h);
-        evas_object_size_hint_min_get(opt->obj, NULL, &min_h);
-
-        evas_object_geometry_get(opt->obj, NULL, NULL, &child_w, &child_h);
-
-        new_w = child_w;
-        new_h = child_h;
-        if (new_w > top_w) top_w = new_w;
-
-        _layout_set_offset_and_expand_dimension_space_max_bounded
-          (child_w, &new_w, w, max_w, &off_x, align_x, padding_l, padding_r);
-
-        _layout_set_offset_and_change_dimension_min_max_cell_bounded
-          (child_h, &new_h, min_h, max_h, cell_sz, &off_y, align_y,
-           padding_t, padding_b);
-
-        if ((new_w != child_w) || (new_h != child_h))
-          evas_object_resize(opt->obj, new_w, new_h);
-        evas_object_move(opt->obj, x + off_x, y + off_y);
-
-        y += cell_sz + global_pad;
-        sub_pixel += pad_inc;
-        if (sub_pixel >= 1 << 16)
-          {
-             y++;
-             sub_pixel -= 1 << 16;
-          }
-     }
-
-   evas_object_size_hint_min_set(o, top_w, y);
-}
-
-static void
-_evas_object_box_layout_flow_horizontal_row_info_collect(Evas_Object_Box_Data *priv, int box_w, int *row_count, int *row_max_h, int *row_break, int *row_width, int *off_y_ret, int *max_h_ret)
-{
-   int i, remain_w = box_w, start_i = 0;
-   int off_y = 0, max_h = 0, n_rows = 0;
-   Eina_List *l;
-
-   for (i = 0, l = priv->children; l; i++, l = l->next)
-     {
-        Evas_Object_Box_Option *opt = l->data;
-        int padding_l, padding_r, padding_t, padding_b;
-        int child_w, child_h, off_x = 0;
-
-        evas_object_size_hint_padding_get
-          (opt->obj, &padding_l, &padding_r, &padding_t, &padding_b);
-
-        _sizing_eval(opt->obj);
-        evas_object_geometry_get(opt->obj, NULL, NULL, &child_w, &child_h);
-
-        child_w += padding_l + padding_r + priv->pad.h;
-        child_h += padding_t + padding_b;
-
-        remain_w -= child_w;
-        if (remain_w + priv->pad.h >= 0)
-          { /* continue "line" */
-             if (child_h > max_h)
-               max_h = child_h;
-
-             off_x += child_w;
-             row_width[n_rows] += child_w;
-          }
-        else
-          { /* break line */
-             if (i == start_i)
-               { /* obj goes to actual line */
-                  max_h = child_h;
-                  row_width[n_rows] = child_w;
-               }
-             else
-               { /* obj goes to next line */
-                  row_max_h[n_rows] = max_h;
-                  row_break[n_rows] = i - 1;
-                  n_rows++;
-
-                  off_x = child_w;
-                  off_y += max_h;
-                  max_h = child_h;
-
-                  row_width[n_rows] = child_w;
-                  start_i = i;
-
-                  remain_w = box_w - off_x;
-               }
-          }
-     }
-
-   row_break[n_rows] = i - 1;
-   row_max_h[n_rows] = max_h;
-
-   *row_count = n_rows;
-   *off_y_ret = off_y;
-   *max_h_ret = max_h;
-}
-
-EAPI void
-evas_object_box_layout_flow_horizontal(Evas_Object *o, Evas_Object_Box_Data *priv, void *data __UNUSED__)
-{
-   int n_children;
-   int r, row_count = 0;
-   int min_w = 0, min_h = 0;
-   int max_h, inc_y;
-   int remain_y, i;
-   int x, y, w, h;
-   Eina_List *l;
-   int *row_max_h;
-   int *row_break;
-   int *row_width;
-   int offset_y;
-
-   n_children = eina_list_count(priv->children);
-   if (!n_children)
-     return;
-
-   /* *per row* arrays */
-   row_max_h = (int *)alloca(sizeof(int) * n_children);
-   if (!row_max_h)
-     return;
-   row_break = (int *)alloca(sizeof(int) * n_children);
-   if (!row_break)
-     return;
-   row_width = (int *)alloca(sizeof(int) * n_children);
-   if (!row_width)
-     return;
-
-   memset(row_width, 0, sizeof(row_width));
-
-   evas_object_geometry_get(o, &x, &y, &w, &h);
-
-   _evas_object_box_layout_flow_horizontal_row_info_collect
-     (priv, w, &row_count, row_max_h, row_break, row_width, &offset_y, &max_h);
-
-   inc_y = 0;
-   remain_y = h - (offset_y + max_h);
-
-   if (remain_y > 0)
-     {
-        if (priv->align.v >= 0.0)
-          inc_y = priv->align.v * remain_y;
-        else if (row_count == 0)
-          y += remain_y / 2;
-        else /* y-justified */
-          inc_y = remain_y / row_count;
-     }
-
-   inc_y += priv->pad.v;
-
-   for (i = 0, r = 0, l = priv->children; r <= row_count; r++)
-     {
-        int row_justify = 0, just_inc = 0, sub_pixel = 0;
-        int row_size, remain_x;
-
-        row_size = row_break[r] - i;
-        remain_x = (w - row_width[r]);
-
-        if (priv->align.h < 0.0)
-          {
-             if (row_size == 0)
-               x += remain_x / 2;
-             else
-               _fixed_point_divide_and_decompose_integer
-                 (remain_x, row_size, &row_justify, &just_inc);
-          }
-
-        row_justify += priv->pad.h;
-
-        for (; i <= row_break[r]; i++, l = l->next)
-          {
-             Evas_Object_Box_Option *opt = l->data;
-             int off_x, off_y, y_remain;
-             int padding_l, padding_r;
-             int child_w, child_h;
-             double align_y;
-
-             evas_object_size_hint_align_get(opt->obj, NULL, &align_y);
-             evas_object_size_hint_padding_get
-               (opt->obj, &padding_l, &padding_r, NULL, NULL);
-
-             evas_object_geometry_get
-               (opt->obj, NULL, NULL, &child_w, &child_h);
-
-             y_remain = row_max_h[r] - child_h;
-
-             off_x = padding_l;
-             if (priv->align.h >= 0.0)
-               off_x += remain_x * priv->align.h;
-             off_y = y_remain * align_y;
-
-             evas_object_move(opt->obj, x + off_x, y + off_y);
-
-             x += child_w + padding_l + padding_r + row_justify;
-
-             sub_pixel += just_inc;
-             if (sub_pixel >= 1 << 16)
-               {
-                  x++;
-                  sub_pixel -= 1 << 16;
-               }
-          }
-
-        evas_object_geometry_get(o, &x, NULL, NULL, NULL);
-        if (min_w < row_width[r])
-            min_w = row_width[r];
-        min_h += row_max_h[r];
-        y += row_max_h[r] + inc_y;
-     }
-
-   evas_object_size_hint_min_set(o, min_w, min_h);
-}
-
-static void
-_evas_object_box_layout_flow_vertical_col_info_collect(Evas_Object_Box_Data *priv, int box_h, int *col_count, int *col_max_w, int *col_break, int *col_height, int *off_x_ret, int *max_w_ret)
-{
-   int i, remain_h = box_h, start_i = 0;
-   int off_x = 0, max_w = 0, n_cols = 0;
-   Eina_List *l;
-
-   for (i = 0, l = priv->children; l; i++, l = l->next)
-     {
-        Evas_Object_Box_Option *opt = l->data;
-        int padding_l, padding_r, padding_t, padding_b;
-        int child_w, child_h, off_y = 0;
-
-        evas_object_size_hint_padding_get
-          (opt->obj, &padding_l, &padding_r, &padding_t, &padding_b);
-
-        _sizing_eval(opt->obj);
-        evas_object_geometry_get(opt->obj, NULL, NULL, &child_w, &child_h);
-
-        child_w += padding_l + padding_r;
-        child_h += padding_t + padding_b + priv->pad.v;
-
-        remain_h -= child_h;
-        if (remain_h + priv->pad.v >= 0)
-          { /* continue "col" */
-             if (child_w > max_w)
-               max_w = child_w;
-
-             off_y += child_h;
-             col_height[n_cols] += child_h;
-          }
-        else
-          {
-             /* break col */
-             if (i == start_i)
-               { /* obj goes to actual col */
-                  max_w = child_w;
-                  col_height[n_cols] = child_h;
-               }
-             else
-               { /* obj goes to next col */
-                  col_max_w[n_cols] = max_w;
-                  col_break[n_cols] = i - 1;
-                  n_cols++;
-
-                  off_x += max_w;
-                  off_y = child_h;
-                  max_w = child_w;
-
-                  col_height[n_cols] = child_h;
-                  start_i = i;
-
-                  remain_h = box_h - off_y;
-               }
-          }
-     }
-
-   col_break[n_cols] = i - 1;
-   col_max_w[n_cols] = max_w;
-
-   *col_count = n_cols;
-   *off_x_ret = off_x;
-   *max_w_ret = max_w;
-}
-
-EAPI void
-evas_object_box_layout_flow_vertical(Evas_Object *o, Evas_Object_Box_Data *priv, void *data __UNUSED__)
-{
-   int n_children;
-   int c, col_count;
-   int min_w = 0, min_h = 0;
-   int max_w, inc_x;
-   int remain_x, i;
-   int x, y, w, h;
-   Eina_List *l;
-   int *col_max_w;
-   int *col_break;
-   int *col_height;
-   int offset_x;
-
-   n_children = eina_list_count(priv->children);
-   if (!n_children)
-     return;
-
-   /* *per col* arrays */
-   col_max_w = (int *)alloca(sizeof(int) * n_children);
-   if (!col_max_w)
-     return;
-   col_break = (int *)alloca(sizeof(int) * n_children);
-   if (!col_break)
-     return;
-   col_height = (int *)alloca(sizeof(int) * n_children);
-   if (!col_height)
-     return;
-
-   memset(col_height, 0, sizeof(col_height));
-
-   evas_object_geometry_get(o, &x, &y, &w, &h);
-
-   _evas_object_box_layout_flow_vertical_col_info_collect
-     (priv, h, &col_count, col_max_w, col_break, col_height, &offset_x, &max_w);
-
-   inc_x = 0;
-   remain_x = w - (offset_x + max_w);
-
-   if (remain_x > 0)
-     {
-        if (priv->align.h >= 0)
-          inc_x = priv->align.h * remain_x;
-        else if (col_count == 0)
-          x += remain_x / 2;
-        else /* x-justified */
-          inc_x = remain_x / col_count;
-     }
-
-   inc_x += priv->pad.h;
-
-   for (i = 0, c = 0, l = priv->children; c <= col_count; c++)
-     {
-        int col_justify = 0, just_inc = 0, sub_pixel = 0;
-        int col_size, remain_y;
-
-        col_size = col_break[c] - i;
-        remain_y = (h - col_height[c]);
-
-        if (priv->align.v < 0.0)
-          {
-             if (col_size == 0)
-               y += remain_y / 2;
-             else
-               _fixed_point_divide_and_decompose_integer
-                 (remain_y, col_size, &col_justify, &just_inc);
-          }
-
-        col_justify += priv->pad.v;
-
-        for (; i <= col_break[c]; i++, l = l->next)
-          {
-             Evas_Object_Box_Option *opt = l->data;
-             int off_x, off_y, x_remain;
-             int padding_t, padding_b;
-             int child_w, child_h;
-             double align_x;
-
-             evas_object_size_hint_align_get(opt->obj, &align_x, NULL);
-             evas_object_size_hint_padding_get
-               (opt->obj, NULL, NULL, &padding_t, &padding_b);
-
-             evas_object_geometry_get
-               (opt->obj, NULL, NULL, &child_w, &child_h);
-
-             x_remain = col_max_w[c] - child_w;
-
-             off_x = x_remain * align_x;
-             off_y = padding_t;
-             if (priv->align.v >= 0.0)
-               off_y += remain_y * priv->align.v;
-
-             evas_object_move(opt->obj, x + off_x, y + off_y);
-
-             y += child_h + padding_t + padding_b + col_justify;
-
-             sub_pixel += just_inc;
-             if (sub_pixel >= 1 << 16)
-               {
-                  y++;
-                  sub_pixel -= 1 << 16;
-               }
-          }
-
-        evas_object_geometry_get(o, NULL, &y, NULL, NULL);
-        min_w += col_max_w[c];
-        if (min_h < col_height[c])
-            min_h = col_height[c];
-        x += col_max_w[c] + inc_x;
-     }
-
-   evas_object_size_hint_min_set(o, min_w, min_h);
-}
-
-EAPI void
-evas_object_box_layout_stack(Evas_Object *o, Evas_Object_Box_Data *priv, void *data __UNUSED__)
-{
-   Eina_List *l;
-   Evas_Coord ox, oy, ow, oh;
-   Evas_Coord top_w = 0, top_h = 0;
-   Evas_Object_Box_Option *opt;
-   Evas_Object *old_child = NULL;
-
-   evas_object_geometry_get(o, &ox, &oy, &ow, &oh);
-
-   EINA_LIST_FOREACH(priv->children, l, opt)
-     {
-        Evas_Object *child = opt->obj;
-        Evas_Coord max_w, max_h, min_w, min_h, pad_l, pad_r, pad_t, pad_b,
-          child_w, child_h, new_w, new_h, off_x, off_y;
-        double align_x, align_y;
-
-        evas_object_size_hint_align_get(child, &align_x, &align_y);
-        evas_object_size_hint_padding_get
-          (child, &pad_l, &pad_r, &pad_t, &pad_b);
-        evas_object_size_hint_max_get(child, &max_w, &max_h);
-        evas_object_size_hint_min_get(child, &min_w, &min_h);
-
-        _sizing_eval(opt->obj);
-        evas_object_geometry_get(child, NULL, NULL, &child_w, &child_h);
-        new_w = child_w;
-        new_h = child_h;
-        if (new_w > top_w) top_w = new_w;
-        if (new_h > top_h) top_h = new_h;
-
-        _layout_set_offset_and_change_dimension_min_max_cell_bounded
-          (child_w, &new_w, min_w, max_w, ow, &off_x, align_x, pad_l, pad_r);
-        _layout_set_offset_and_change_dimension_min_max_cell_bounded
-          (child_h, &new_h, min_h, max_h, oh, &off_y, align_y, pad_t, pad_b);
-
-        if ((new_w != child_w) || (new_h != child_h))
-          evas_object_resize(child, new_w, new_h);
-        evas_object_move(child, ox + off_x, oy + off_y);
-
-        if (old_child)
-          evas_object_stack_above(child, old_child);
-        old_child = child;
-     }
-
-   evas_object_size_hint_min_set(o, top_w, top_h);
-}
-
-EAPI void
-evas_object_box_align_set(Evas_Object *o, double horizontal, double vertical)
-{
-   EVAS_OBJECT_BOX_DATA_GET_OR_RETURN(o, priv);
-   if (priv->align.h == horizontal && priv->align.v == vertical)
-     return;
-   priv->align.h = horizontal;
-   priv->align.v = vertical;
-   evas_object_smart_changed(o);
-}
-
-EAPI void
-evas_object_box_align_get(const Evas_Object *o, double *horizontal, double *vertical)
-{
-   EVAS_OBJECT_BOX_DATA_GET(o, priv);
-   if (priv)
-     {
-        if (horizontal) *horizontal = priv->align.h;
-        if (vertical) *vertical = priv->align.v;
-     }
-   else
-     {
-        if (horizontal) *horizontal = 0.5;
-        if (vertical) *vertical = 0.5;
-     }
-}
-
-EAPI void
-evas_object_box_padding_set(Evas_Object *o, Evas_Coord horizontal, Evas_Coord vertical)
-{
-   EVAS_OBJECT_BOX_DATA_GET_OR_RETURN(o, priv);
-   if (priv->pad.h == horizontal && priv->pad.v == vertical)
-     return;
-   priv->pad.h = horizontal;
-   priv->pad.v = vertical;
-   evas_object_smart_changed(o);
-}
-
-EAPI void
-evas_object_box_padding_get(const Evas_Object *o, Evas_Coord *horizontal, Evas_Coord *vertical)
-{
-   EVAS_OBJECT_BOX_DATA_GET(o, priv);
-   if (priv)
-     {
-        if (horizontal) *horizontal = priv->pad.h;
-        if (vertical) *vertical = priv->pad.v;
-     }
-   else
-     {
-        if (horizontal) *horizontal = 0;
-        if (vertical) *vertical = 0;
-     }
-}
-
-EAPI Evas_Object_Box_Option *
-evas_object_box_append(Evas_Object *o, Evas_Object *child)
-{
-   Evas_Object_Box_Option *opt;
-   const Evas_Object_Box_Api *api;
-
-   EVAS_OBJECT_BOX_DATA_GET_OR_RETURN_VAL(o, priv, 0);
-   if (!child)
-     return NULL;
-
-   api = priv->api;
-   if ((!api) || (!api->append))
-     return NULL;
-
-   opt = api->append(o, priv, child);
-
-   if (opt)
-     {
-        evas_object_smart_member_add(child, o);
-        evas_object_smart_changed(o);
-        return _evas_object_box_option_callbacks_register(o, priv, opt);
-     }
-
-   return NULL;
-}
-
-EAPI Evas_Object_Box_Option *
-evas_object_box_prepend(Evas_Object *o, Evas_Object *child)
-{
-   Evas_Object_Box_Option *opt;
-   const Evas_Object_Box_Api *api;
-
-   EVAS_OBJECT_BOX_DATA_GET_OR_RETURN_VAL(o, priv, 0);
-   if (!child)
-     return NULL;
-
-   api = priv->api;
-   if ((!api) || (!api->prepend))
-     return NULL;
-
-   opt = api->prepend(o, priv, child);
-
-   if (opt)
-     {
-        evas_object_smart_member_add(child, o);
-        evas_object_smart_changed(o);
-        return _evas_object_box_option_callbacks_register(o, priv, opt);
-     }
-
-   return NULL;
-}
-
-EAPI Evas_Object_Box_Option *
-evas_object_box_insert_before(Evas_Object *o, Evas_Object *child, const Evas_Object *reference)
-{
-   Evas_Object_Box_Option *opt;
-   const Evas_Object_Box_Api *api;
-
-   EVAS_OBJECT_BOX_DATA_GET_OR_RETURN_VAL(o, priv, 0);
-   if (!child)
-     return NULL;
-
-   api = priv->api;
-   if ((!api) || (!api->insert_before))
-     return NULL;
-
-   opt = api->insert_before(o, priv, child, reference);
-
-   if (opt)
-     {
-        evas_object_smart_member_add(child, o);
-        evas_object_smart_changed(o);
-        return _evas_object_box_option_callbacks_register(o, priv, opt);
-     }
-
-   return NULL;
-}
-
-EAPI Evas_Object_Box_Option *
-evas_object_box_insert_after(Evas_Object *o, Evas_Object *child, const Evas_Object *reference)
-{
-   Evas_Object_Box_Option *opt;
-   const Evas_Object_Box_Api *api;
-
-   EVAS_OBJECT_BOX_DATA_GET_OR_RETURN_VAL(o, priv, NULL);
-   if (!child)
-     return NULL;
-
-   api = priv->api;
-   if ((!api) || (!api->insert_after))
-     return NULL;
-
-   opt = api->insert_after(o, priv, child, reference);
-
-   if (opt)
-     {
-        evas_object_smart_member_add(child, o);
-        evas_object_smart_changed(o);
-        return _evas_object_box_option_callbacks_register(o, priv, opt);
-     }
-
-   return NULL;
-}
-
-EAPI Evas_Object_Box_Option *
-evas_object_box_insert_at(Evas_Object *o, Evas_Object *child, unsigned int pos)
-{
-   Evas_Object_Box_Option *opt;
-   const Evas_Object_Box_Api *api;
-
-   EVAS_OBJECT_BOX_DATA_GET_OR_RETURN_VAL(o, priv, 0);
-   if (!child)
-     return NULL;
-
-   api = priv->api;
-   if ((!api) || (!api->insert_at))
-     return NULL;
-
-   opt = api->insert_at(o, priv, child, pos);
-
-   if (opt)
-     {
-        evas_object_smart_member_add(child, o);
-        evas_object_smart_changed(o);
-        return _evas_object_box_option_callbacks_register(o, priv, opt);
-     }
-
-   return NULL;
-}
-
-EAPI Eina_Bool
-evas_object_box_remove(Evas_Object *o, Evas_Object *child)
-{
-   const Evas_Object_Box_Api *api;
-   Evas_Object *obj;
-
-   EVAS_OBJECT_BOX_DATA_GET_OR_RETURN_VAL(o, priv, 0);
-   if (!child) return EINA_FALSE;
-
-   api = priv->api;
-   if ((!api) || (!api->remove))
-     return 0;
-
-   obj = api->remove(o, priv, child);
-
-   if (obj)
-     {
-        _evas_object_box_child_callbacks_unregister(obj);
-        evas_object_smart_member_del(obj);
-        evas_object_smart_changed(o);
-        return EINA_TRUE;
-     }
-
-   return EINA_FALSE;
-}
-
-EAPI Eina_Bool
-evas_object_box_remove_at(Evas_Object *o, unsigned int pos)
-{
-   const Evas_Object_Box_Api *api;
-   Evas_Object *obj;
-
-   EVAS_OBJECT_BOX_DATA_GET_OR_RETURN_VAL(o, priv, 0);
-   api = priv->api;
-   if ((!api) || (!api->remove_at)) return EINA_FALSE;
-
-   obj = api->remove_at(o, priv, pos);
-
-   if (obj)
-     {
-        _evas_object_box_child_callbacks_unregister(obj);
-        evas_object_smart_member_del(obj);
-        evas_object_smart_changed(o);
-        return EINA_TRUE;
-     }
-
-   return EINA_FALSE;
-}
-
-EAPI Eina_Bool
-evas_object_box_remove_all(Evas_Object *o, Eina_Bool clear)
-{
-   const Evas_Object_Box_Api *api;
-
-   EVAS_OBJECT_BOX_DATA_GET_OR_RETURN_VAL(o, priv, 0);
-
-   api = priv->api;
-   if ((!api) || (!api->remove)) return EINA_FALSE;
-
-   evas_object_smart_changed(o);
-
-   while (priv->children)
-     {
-        Evas_Object_Box_Option *opt = priv->children->data;
-        Evas_Object *obj;
-
-        obj = api->remove(o, priv, opt->obj);
-        if (obj)
-          {
-             _evas_object_box_child_callbacks_unregister(obj);
-             evas_object_smart_member_del(obj);
-             if (clear)
-               evas_object_del(obj);
-          }
-        else return EINA_FALSE;
-     }
-
-   return EINA_TRUE;
-}
-
-EAPI Eina_Iterator *
-evas_object_box_iterator_new(const Evas_Object *o)
-{
-   Evas_Object_Box_Iterator *it;
-
-   EVAS_OBJECT_BOX_DATA_GET_OR_RETURN_VAL(o, priv, NULL);
-
-   if (!priv->children) return NULL;
-
-   it = calloc(1, sizeof(Evas_Object_Box_Iterator));
-   if (!it) return NULL;
-
-   EINA_MAGIC_SET(&it->iterator, EINA_MAGIC_ITERATOR);
-
-   it->real_iterator = eina_list_iterator_new(priv->children);
-   it->box = o;
-
-   it->iterator.next = FUNC_ITERATOR_NEXT(_evas_object_box_iterator_next);
-   it->iterator.get_container = FUNC_ITERATOR_GET_CONTAINER(_evas_object_box_iterator_get_container);
-   it->iterator.free = FUNC_ITERATOR_FREE(_evas_object_box_iterator_free);
-
-   return &it->iterator;
-}
-
-EAPI Eina_Accessor *
-evas_object_box_accessor_new(const Evas_Object *o)
-{
-   Evas_Object_Box_Accessor *it;
-
-   EVAS_OBJECT_BOX_DATA_GET_OR_RETURN_VAL(o, priv, NULL);
-
-   if (!priv->children) return NULL;
-
-   it = calloc(1, sizeof(Evas_Object_Box_Accessor));
-   if (!it) return NULL;
-
-   EINA_MAGIC_SET(&it->accessor, EINA_MAGIC_ACCESSOR);
-
-   it->real_accessor = eina_list_accessor_new(priv->children);
-   it->box = o;
-
-   it->accessor.get_at = FUNC_ACCESSOR_GET_AT(_evas_object_box_accessor_get_at);
-   it->accessor.get_container = FUNC_ACCESSOR_GET_CONTAINER(_evas_object_box_accessor_get_container);
-   it->accessor.free = FUNC_ACCESSOR_FREE(_evas_object_box_accessor_free);
-
-   return &it->accessor;
-}
-
-EAPI Eina_List *
-evas_object_box_children_get(const Evas_Object *o)
-{
-   Eina_List *new_list = NULL, *l;
-   Evas_Object_Box_Option *opt;
-
-   EVAS_OBJECT_BOX_DATA_GET_OR_RETURN_VAL(o, priv, NULL);
-
-   EINA_LIST_FOREACH(priv->children, l, opt)
-      new_list = eina_list_append(new_list, opt->obj);
-
-   return new_list;
-}
-
-EAPI const char *
-evas_object_box_option_property_name_get(Evas_Object *o, int property)
-{
-   const Evas_Object_Box_Api *api;
-
-   EVAS_OBJECT_BOX_DATA_GET_OR_RETURN_VAL(o, priv, NULL);
-
-   if (property < 0)
-     return NULL;
-
-   api = priv->api;
-   if ((!api) || (!api->property_name_get))
-     return NULL;
-
-   return api->property_name_get(o, property);
-}
-
-EAPI int
-evas_object_box_option_property_id_get(Evas_Object *o, const char *name)
-{
-   const Evas_Object_Box_Api *api;
-
-   EVAS_OBJECT_BOX_DATA_GET_OR_RETURN_VAL(o, priv, -1);
-
-   if (!name)
-     return -1;
-
-   api = priv->api;
-   if ((!api) || (!api->property_id_get))
-     return -1;
-
-   return api->property_id_get(o, name);
-}
-
-EAPI Eina_Bool
-evas_object_box_option_property_set(Evas_Object *o, Evas_Object_Box_Option *opt, int property, ...)
-{
-   Eina_Bool ret;
-   va_list args;
-
-   va_start(args, property);
-   ret = evas_object_box_option_property_vset(o, opt, property, args);
-   va_end(args);
-
-   return ret;
-}
-
-
-EAPI Eina_Bool
-evas_object_box_option_property_vset(Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args)
-{
-   const Evas_Object_Box_Api *api;
-
-   EVAS_OBJECT_BOX_DATA_GET_OR_RETURN_VAL(o, priv, 0);
-
-   if (!opt) return EINA_FALSE;
-
-   api = priv->api;
-   if ((!api) || (!api->property_set))
-     return EINA_FALSE;
-
-   if (!api->property_set(o, opt, property, args))
-     return EINA_FALSE;
-
-   evas_object_smart_changed(o);
-   return EINA_TRUE;
-}
-
-EAPI Eina_Bool
-evas_object_box_option_property_get(Evas_Object *o, Evas_Object_Box_Option *opt, int property, ...)
-{
-   Eina_Bool ret;
-   va_list args;
-
-   va_start(args, property);
-   ret = evas_object_box_option_property_vget(o, opt, property, args);
-   va_end(args);
-
-   return ret;
-}
-
-EAPI Eina_Bool
-evas_object_box_option_property_vget(Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args)
-{
-   const Evas_Object_Box_Api *api;
-
-   EVAS_OBJECT_BOX_DATA_GET_OR_RETURN_VAL(o, priv, 0);
-
-   if (!opt) return EINA_FALSE;
-
-   api = priv->api;
-   if ((!api) || (!api->property_get))
-     return EINA_FALSE;
-
-   return api->property_get(o, opt, property, args);
-}
diff --git a/libraries/evas/src/lib/canvas/evas_object_grid.c b/libraries/evas/src/lib/canvas/evas_object_grid.c
deleted file mode 100644
index db0f43d..0000000
--- a/libraries/evas/src/lib/canvas/evas_object_grid.c
+++ /dev/null
@@ -1,465 +0,0 @@
-#include "evas_common.h"
-#include <errno.h>
-
-typedef struct _Evas_Object_Grid_Data       Evas_Object_Grid_Data;
-typedef struct _Evas_Object_Grid_Option     Evas_Object_Grid_Option;
-typedef struct _Evas_Object_Grid_Iterator   Evas_Object_Grid_Iterator;
-typedef struct _Evas_Object_Grid_Accessor   Evas_Object_Grid_Accessor;
-
-struct _Evas_Object_Grid_Option
-{
-   Evas_Object *obj;
-   Eina_List *l;
-   int x, y, w, h;
-};
-
-struct _Evas_Object_Grid_Data
-{
-   Evas_Object_Smart_Clipped_Data base;
-   Eina_List *children;
-   struct {
-      int w, h;
-   } size;
-   Eina_Bool is_mirrored : 1;
-};
-
-struct _Evas_Object_Grid_Iterator
-{
-   Eina_Iterator iterator;
-
-   Eina_Iterator *real_iterator;
-   const Evas_Object *grid;
-};
-
-struct _Evas_Object_Grid_Accessor
-{
-   Eina_Accessor accessor;
-
-   Eina_Accessor *real_accessor;
-   const Evas_Object *grid;
-};
-
-#define EVAS_OBJECT_GRID_DATA_GET(o, ptr)                       \
-  Evas_Object_Grid_Data *ptr = evas_object_smart_data_get(o)
-
-#define EVAS_OBJECT_GRID_DATA_GET_OR_RETURN(o, ptr)                     \
-  EVAS_OBJECT_GRID_DATA_GET(o, ptr);                                    \
-  if (!ptr)                                                             \
-    {                                                                   \
-      CRIT("no widget data for object %p (%s)",                         \
-           o, evas_object_type_get(o));                                 \
-       abort();                                                         \
-       return;                                                          \
-    }
-
-#define EVAS_OBJECT_GRID_DATA_GET_OR_RETURN_VAL(o, ptr, val)            \
-  EVAS_OBJECT_GRID_DATA_GET(o, ptr);                                    \
-  if (!ptr)                                                             \
-    {                                                                   \
-       CRIT("No widget data for object %p (%s)",                        \
-               o, evas_object_type_get(o));                             \
-       abort();                                                         \
-       return val;                                                      \
-    }
-
-static const char EVAS_OBJECT_GRID_OPTION_KEY[] = "|EvGd";
-
-static Eina_Bool
-_evas_object_grid_iterator_next(Evas_Object_Grid_Iterator *it, void **data)
-{
-   Evas_Object_Grid_Option *opt;
-
-   if (!eina_iterator_next(it->real_iterator, (void **)&opt))
-     return EINA_FALSE;
-   if (data) *data = opt->obj;
-   return EINA_TRUE;
-}
-
-static Evas_Object *
-_evas_object_grid_iterator_get_container(Evas_Object_Grid_Iterator *it)
-{
-   return (Evas_Object *)it->grid;
-}
-
-static void
-_evas_object_grid_iterator_free(Evas_Object_Grid_Iterator *it)
-{
-   eina_iterator_free(it->real_iterator);
-   free(it);
-}
-
-static Eina_Bool
-_evas_object_grid_accessor_get_at(Evas_Object_Grid_Accessor *it, unsigned int idx, void **data)
-{
-   Evas_Object_Grid_Option *opt = NULL;
-
-   if (!eina_accessor_data_get(it->real_accessor, idx, (void **)&opt))
-     return EINA_FALSE;
-   if (data) *data = opt->obj;
-   return EINA_TRUE;
-}
-
-static Evas_Object *
-_evas_object_grid_accessor_get_container(Evas_Object_Grid_Accessor *it)
-{
-   return (Evas_Object *)it->grid;
-}
-
-static void
-_evas_object_grid_accessor_free(Evas_Object_Grid_Accessor *it)
-{
-   eina_accessor_free(it->real_accessor);
-   free(it);
-}
-
-static Evas_Object_Grid_Option *
-_evas_object_grid_option_get(Evas_Object *o)
-{
-   return evas_object_data_get(o, EVAS_OBJECT_GRID_OPTION_KEY);
-}
-
-static void
-_evas_object_grid_option_set(Evas_Object *o, const Evas_Object_Grid_Option *opt)
-{
-   evas_object_data_set(o, EVAS_OBJECT_GRID_OPTION_KEY, opt);
-}
-
-static Evas_Object_Grid_Option *
-_evas_object_grid_option_del(Evas_Object *o)
-{
-   return evas_object_data_del(o, EVAS_OBJECT_GRID_OPTION_KEY);
-}
-
-static void
-_on_child_del(void *data, Evas *evas __UNUSED__, Evas_Object *child, void *einfo __UNUSED__)
-{
-   Evas_Object *grid = data;
-   evas_object_grid_unpack(grid, child);
-}
-
-static void
-_evas_object_grid_child_connect(Evas_Object *o, Evas_Object *child)
-{
-   evas_object_event_callback_add
-     (child, EVAS_CALLBACK_DEL, _on_child_del, o);
-}
-
-static void
-_evas_object_grid_child_disconnect(Evas_Object *o, Evas_Object *child)
-{
-   evas_object_event_callback_del_full
-     (child, EVAS_CALLBACK_DEL, _on_child_del, o);
-}
-
-EVAS_SMART_SUBCLASS_NEW("Evas_Object_Grid", _evas_object_grid,
-                        Evas_Smart_Class, Evas_Smart_Class,
-                        evas_object_smart_clipped_class_get, NULL)
-
-static void
-_evas_object_grid_smart_add(Evas_Object *o)
-{
-   EVAS_SMART_DATA_ALLOC(o, Evas_Object_Grid_Data)
-
-   priv->size.w = 100;
-   priv->size.h = 100;
-   
-   _evas_object_grid_parent_sc->add(o);
-}
-
-static void
-_evas_object_grid_smart_del(Evas_Object *o)
-{
-   EVAS_OBJECT_GRID_DATA_GET(o, priv);
-   Eina_List *l;
-
-   l = priv->children;
-   while (l)
-     {
-        Evas_Object_Grid_Option *opt = l->data;
-        _evas_object_grid_child_disconnect(o, opt->obj);
-        _evas_object_grid_option_del(opt->obj);
-        free(opt);
-        l = eina_list_remove_list(l, l);
-     }
-   _evas_object_grid_parent_sc->del(o);
-}
-
-static void
-_evas_object_grid_smart_resize(Evas_Object *o, Evas_Coord w, Evas_Coord h)
-{
-   Evas_Coord ow, oh;
-   evas_object_geometry_get(o, NULL, NULL, &ow, &oh);
-   if ((ow == w) && (oh == h)) return;
-   evas_object_smart_changed(o);
-}
-
-static void
-_evas_object_grid_smart_calculate(Evas_Object *o)
-{
-   Eina_List *l;
-   Evas_Object_Grid_Option *opt;
-   Evas_Coord x, y, w, h, vw, vh, t;
-   Eina_Bool mirror;
-   
-   EVAS_OBJECT_GRID_DATA_GET_OR_RETURN(o, priv);
-   if (!priv) return;
-   if (!priv->children) return;
-   evas_object_geometry_get(o, &x, &y, &w, &h);
-   mirror = priv->is_mirrored;
-   vw = priv->size.w;
-   vh = priv->size.h;
-   EINA_LIST_FOREACH(priv->children, l, opt)
-     {
-        Evas_Coord x1, y1, x2, y2;
-        
-        x1 = x + ((w * opt->x) / vw);
-        y1 = y + ((h * opt->y) / vh);
-        x2 = x + ((w * (opt->x + opt->w)) / vw);
-        y2 = y + ((h * (opt->y + opt->h)) / vh);
-        if (mirror)
-          {
-             t = x1; x1 = x2; x2 = t;
-             t = y1; y1 = y2; y2 = t;
-          }
-        evas_object_move(opt->obj, x1, y1);
-        evas_object_resize(opt->obj, x2 - x1, y2 - y1);
-     }
-}
-
-static void
-_evas_object_grid_smart_set_user(Evas_Smart_Class *sc)
-{
-   sc->add = _evas_object_grid_smart_add;
-   sc->del = _evas_object_grid_smart_del;
-   sc->resize = _evas_object_grid_smart_resize;
-   sc->calculate = _evas_object_grid_smart_calculate;
-}
-
-EAPI Evas_Object *
-evas_object_grid_add(Evas *evas)
-{
-   return evas_object_smart_add(evas, _evas_object_grid_smart_class_new());
-}
-
-EAPI Evas_Object *
-evas_object_grid_add_to(Evas_Object *parent)
-{
-   Evas *evas;
-   Evas_Object *o;
-
-   evas = evas_object_evas_get(parent);
-   o = evas_object_grid_add(evas);
-   evas_object_smart_member_add(o, parent);
-   return o;
-}
-
-EAPI void
-evas_object_grid_size_set(Evas_Object *o, int w, int h)
-{
-   EVAS_OBJECT_GRID_DATA_GET_OR_RETURN(o, priv);
-   if ((priv->size.w == w) && (priv->size.h == h)) return;
-   priv->size.w = w;
-   priv->size.h = h;
-   evas_object_smart_changed(o);
-}
-
-EAPI void
-evas_object_grid_size_get(const Evas_Object *o, int *w, int *h)
-{
-   if (w) *w = 0;
-   if (h) *h = 0;
-   EVAS_OBJECT_GRID_DATA_GET_OR_RETURN(o, priv);
-   if (w) *w = priv->size.w;
-   if (h) *h = priv->size.h;
-}
-
-EAPI Eina_Bool
-evas_object_grid_pack(Evas_Object *o, Evas_Object *child, int x, int y, int w, int h)
-{
-   Evas_Object_Grid_Option *opt;
-   Eina_Bool newobj = EINA_FALSE;
-
-   EVAS_OBJECT_GRID_DATA_GET_OR_RETURN_VAL(o, priv, 0);
-
-   opt = _evas_object_grid_option_get(child);
-   if (!opt)
-     {
-        opt = malloc(sizeof(*opt));
-        if (!opt)
-          {
-             ERR("could not allocate grid option data.");
-             return EINA_FALSE;
-          }
-        newobj = EINA_TRUE;
-     }
-
-   opt->x = x;
-   opt->y = y;
-   opt->w = w;
-   opt->h = h;
-
-   if (newobj)
-     {
-        opt->obj = child;
-        priv->children = eina_list_append(priv->children, opt);
-        opt->l = eina_list_last(priv->children);
-        _evas_object_grid_option_set(child, opt);
-        evas_object_smart_member_add(child, o);
-        _evas_object_grid_child_connect(o, child);
-     }
-   // FIXME: we could keep a changed list
-   evas_object_smart_changed(o);
-   return EINA_TRUE;
-}
-
-static void
-_evas_object_grid_remove_opt(Evas_Object_Grid_Data *priv, Evas_Object_Grid_Option *opt)
-{
-   priv->children = eina_list_remove_list(priv->children, opt->l);
-   opt->l = NULL;
-}
-
-EAPI Eina_Bool
-evas_object_grid_unpack(Evas_Object *o, Evas_Object *child)
-{
-   Evas_Object_Grid_Option *opt;
-
-   EVAS_OBJECT_GRID_DATA_GET_OR_RETURN_VAL(o, priv, 0);
-
-   if (o != evas_object_smart_parent_get(child))
-     {
-        ERR("cannot unpack child from incorrect grid!");
-        return EINA_FALSE;
-     }
-
-   opt = _evas_object_grid_option_del(child);
-   if (!opt)
-     {
-        ERR("cannot unpack child with no packing option!");
-        return EINA_FALSE;
-     }
-
-   _evas_object_grid_child_disconnect(o, child);
-   _evas_object_grid_remove_opt(priv, opt);
-   evas_object_smart_member_del(child);
-   free(opt);
-   return EINA_TRUE;
-}
-
-EAPI void
-evas_object_grid_clear(Evas_Object *o, Eina_Bool clear)
-{
-   Evas_Object_Grid_Option *opt;
-
-   EVAS_OBJECT_GRID_DATA_GET_OR_RETURN(o, priv);
-
-   EINA_LIST_FREE(priv->children, opt)
-     {
-        _evas_object_grid_child_disconnect(o, opt->obj);
-        _evas_object_grid_option_del(opt->obj);
-        evas_object_smart_member_del(opt->obj);
-        if (clear)
-          evas_object_del(opt->obj);
-        free(opt);
-     }
-}
-
-EAPI Eina_Bool
-evas_object_grid_pack_get(Evas_Object *o, Evas_Object *child, int *x, int *y, int *w, int *h)
-{
-   Evas_Object_Grid_Option *opt;
-
-   if (x) *x = 0;
-   if (y) *y = 0;
-   if (w) *w = 0;
-   if (h) *h = 0;
-   EVAS_OBJECT_GRID_DATA_GET_OR_RETURN_VAL(o, priv, 0);
-   opt = _evas_object_grid_option_get(child);
-   if (!opt) return 0;
-   if (x) *x = opt->x;
-   if (y) *y = opt->y;
-   if (w) *w = opt->w;
-   if (h) *h = opt->h;
-   return 1;
-}
-
-EAPI Eina_Iterator *
-evas_object_grid_iterator_new(const Evas_Object *o)
-{
-   Evas_Object_Grid_Iterator *it;
-
-   EVAS_OBJECT_GRID_DATA_GET_OR_RETURN_VAL(o, priv, NULL);
-
-   if (!priv->children) return NULL;
-
-   it = calloc(1, sizeof(Evas_Object_Grid_Iterator));
-   if (!it) return NULL;
-
-   EINA_MAGIC_SET(&it->iterator, EINA_MAGIC_ITERATOR);
-
-   it->real_iterator = eina_list_iterator_new(priv->children);
-   it->grid = o;
-
-   it->iterator.next = FUNC_ITERATOR_NEXT(_evas_object_grid_iterator_next);
-   it->iterator.get_container = FUNC_ITERATOR_GET_CONTAINER(_evas_object_grid_iterator_get_container);
-   it->iterator.free = FUNC_ITERATOR_FREE(_evas_object_grid_iterator_free);
-
-   return &it->iterator;
-}
-
-EAPI Eina_Accessor *
-evas_object_grid_accessor_new(const Evas_Object *o)
-{
-   Evas_Object_Grid_Accessor *it;
-
-   EVAS_OBJECT_GRID_DATA_GET_OR_RETURN_VAL(o, priv, NULL);
-
-   if (!priv->children) return NULL;
-
-   it = calloc(1, sizeof(Evas_Object_Grid_Accessor));
-   if (!it) return NULL;
-
-   EINA_MAGIC_SET(&it->accessor, EINA_MAGIC_ACCESSOR);
-
-   it->real_accessor = eina_list_accessor_new(priv->children);
-   it->grid = o;
-
-   it->accessor.get_at = FUNC_ACCESSOR_GET_AT(_evas_object_grid_accessor_get_at);
-   it->accessor.get_container = FUNC_ACCESSOR_GET_CONTAINER(_evas_object_grid_accessor_get_container);
-   it->accessor.free = FUNC_ACCESSOR_FREE(_evas_object_grid_accessor_free);
-
-   return &it->accessor;
-}
-
-EAPI Eina_List *
-evas_object_grid_children_get(const Evas_Object *o)
-{
-   Eina_List *new_list = NULL, *l;
-   Evas_Object_Grid_Option *opt;
-
-   EVAS_OBJECT_GRID_DATA_GET_OR_RETURN_VAL(o, priv, NULL);
-
-   EINA_LIST_FOREACH(priv->children, l, opt)
-      new_list = eina_list_append(new_list, opt->obj);
-
-   return new_list;
-}
-
-EAPI Eina_Bool
-evas_object_grid_mirrored_get(const Evas_Object *obj)
-{
-   EVAS_OBJECT_GRID_DATA_GET_OR_RETURN_VAL(obj, priv, EINA_FALSE);
-   return priv->is_mirrored;
-}
-
-EAPI void
-evas_object_grid_mirrored_set(Evas_Object *obj, Eina_Bool mirrored)
-{
-   EVAS_OBJECT_GRID_DATA_GET_OR_RETURN(obj, priv);
-   mirrored = !!mirrored;
-   if (priv->is_mirrored != mirrored)
-     {
-        priv->is_mirrored = mirrored;
-        _evas_object_grid_smart_calculate(obj);
-     }
-}
diff --git a/libraries/evas/src/lib/canvas/evas_object_image.c b/libraries/evas/src/lib/canvas/evas_object_image.c
deleted file mode 100644
index 4ebea08..0000000
--- a/libraries/evas/src/lib/canvas/evas_object_image.c
+++ /dev/null
@@ -1,3957 +0,0 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"  /* so that EAPI in Evas.h is correctly defined */
-#endif
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <stdlib.h>
-#ifdef HAVE_SYS_MMAN_H
-# include <sys/mman.h>
-#endif
-#include <math.h>
-
-#include "evas_common.h"
-#include "evas_private.h"
-#include "../engines/common/evas_convert_color.h"
-#include "../engines/common/evas_convert_colorspace.h"
-#include "../engines/common/evas_convert_yuv.h"
-
-#define VERBOSE_PROXY_ERROR 1
-
-/* private magic number for image objects */
-static const char o_type[] = "image";
-
-/* private struct for rectangle object internal data */
-typedef struct _Evas_Object_Image      Evas_Object_Image;
-
-struct _Evas_Object_Image
-{
-   DATA32            magic;
-
-   struct {
-      int                  spread;
-      Evas_Coord_Rectangle fill;
-      struct {
-         short         w, h, stride;
-      } image;
-      struct {
-         short         l, r, t, b;
-         unsigned char fill;
-         double        scale;
-      } border;
-
-      Evas_Object   *source;
-      Evas_Map      *defmap;
-      const char    *file;
-      const char    *key;
-      int            frame;
-      Evas_Colorspace cspace;
-
-      unsigned char  smooth_scale : 1;
-      unsigned char  has_alpha :1;
-      unsigned char  opaque :1;
-      unsigned char  opaque_valid :1;
-   } cur, prev;
-
-   int               pixels_checked_out;
-   int               load_error;
-   Eina_List        *pixel_updates;
-
-   struct {
-      unsigned char  scale_down_by;
-      double         dpi;
-      short          w, h;
-      struct {
-         short       x, y, w, h;
-      } region;
-      Eina_Bool  orientation : 1;
-   } load_opts;
-
-   struct {
-      Evas_Object_Image_Pixels_Get_Cb  get_pixels;
-      void                            *get_pixels_data;
-   } func;
-
-   Evas_Video_Surface video;
-
-   const char             *tmpf;
-   int                     tmpf_fd;
-
-   Evas_Image_Scale_Hint   scale_hint;
-   Evas_Image_Content_Hint content_hint;
-
-   void             *engine_data;
-
-   unsigned char     changed : 1;
-   unsigned char     dirty_pixels : 1;
-   unsigned char     filled : 1;
-   unsigned char     proxyrendering : 1;
-   unsigned char     preloading : 1;
-   unsigned char     video_rendering : 1;
-   unsigned char     video_surface : 1;
-   unsigned char     video_visible : 1;
-   unsigned char     created : 1;
-};
-
-/* private methods for image objects */
-static void evas_object_image_unload(Evas_Object *obj, Eina_Bool dirty);
-static void evas_object_image_load(Evas_Object *obj);
-static Evas_Coord evas_object_image_figure_x_fill(Evas_Object *obj, Evas_Coord start, Evas_Coord size, Evas_Coord *size_ret);
-static Evas_Coord evas_object_image_figure_y_fill(Evas_Object *obj, Evas_Coord start, Evas_Coord size, Evas_Coord *size_ret);
-
-static void evas_object_image_init(Evas_Object *obj);
-static void *evas_object_image_new(void);
-static void evas_object_image_render(Evas_Object *obj, void *output, void *context, void *surface, int x, int y);
-static void evas_object_image_free(Evas_Object *obj);
-static void evas_object_image_render_pre(Evas_Object *obj);
-static void evas_object_image_render_post(Evas_Object *obj);
-
-static unsigned int evas_object_image_id_get(Evas_Object *obj);
-static unsigned int evas_object_image_visual_id_get(Evas_Object *obj);
-static void *evas_object_image_engine_data_get(Evas_Object *obj);
-
-static int evas_object_image_is_opaque(Evas_Object *obj);
-static int evas_object_image_was_opaque(Evas_Object *obj);
-static int evas_object_image_is_inside(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
-static int evas_object_image_has_opaque_rect(Evas_Object *obj);
-static int evas_object_image_get_opaque_rect(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-static int evas_object_image_can_map(Evas_Object *obj);
-
-static void *evas_object_image_data_convert_internal(Evas_Object_Image *o, void *data, Evas_Colorspace to_cspace);
-static void evas_object_image_filled_resize_listener(void *data, Evas *e, Evas_Object *obj, void *einfo);
-
-static void _proxy_unset(Evas_Object *proxy);
-static void _proxy_set(Evas_Object *proxy, Evas_Object *src);
-static void _proxy_error(Evas_Object *proxy, void *context, void *output, void *surface, int x, int y);
-
-static void _cleanup_tmpf(Evas_Object *obj);
-
-static const Evas_Object_Func object_func =
-{
-   /* methods (compulsory) */
-   evas_object_image_free,
-     evas_object_image_render,
-     evas_object_image_render_pre,
-     evas_object_image_render_post,
-     evas_object_image_id_get,
-     evas_object_image_visual_id_get,
-     evas_object_image_engine_data_get,
-     /* these are optional. NULL = nothing */
-     NULL,
-     NULL,
-     NULL,
-     NULL,
-     evas_object_image_is_opaque,
-     evas_object_image_was_opaque,
-     evas_object_image_is_inside,
-     NULL,
-     NULL,
-     NULL,
-     evas_object_image_has_opaque_rect,
-     evas_object_image_get_opaque_rect,
-     evas_object_image_can_map
-};
-
-EVAS_MEMPOOL(_mp_obj);
-
-static void
-_evas_object_image_cleanup(Evas_Object *obj, Evas_Object_Image *o)
-{
-   if ((o->preloading) && (o->engine_data))
-     {
-        o->preloading = 0;
-        obj->layer->evas->engine.func->image_data_preload_cancel(obj->layer->evas->engine.data.output,
-                                                                 o->engine_data,
-                                                                 obj);
-     }
-   if (o->tmpf) _cleanup_tmpf(obj);
-   if (o->cur.source) _proxy_unset(obj);
-}
-
-EAPI Evas_Object *
-evas_object_image_add(Evas *e)
-{
-   Evas_Object *obj;
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return NULL;
-   MAGIC_CHECK_END();
-   obj = evas_object_new(e);
-   evas_object_image_init(obj);
-   evas_object_inject(obj, e);
-   o = (Evas_Object_Image *)(obj->object_data);
-   o->cur.cspace = obj->layer->evas->engine.func->image_colorspace_get(obj->layer->evas->engine.data.output,
-                                                                       o->engine_data);
-   return obj;
-}
-
-EAPI Evas_Object *
-evas_object_image_filled_add(Evas *e)
-{
-   Evas_Object *obj;
-   obj = evas_object_image_add(e);
-   evas_object_image_filled_set(obj, 1);
-   return obj;
-}
-
-static void
-_cleanup_tmpf(Evas_Object *obj)
-{
-#ifdef HAVE_SYS_MMAN_H
-   Evas_Object_Image *o;
-
-   o = (Evas_Object_Image *)(obj->object_data);
-   if (!o->tmpf) return;
-#ifdef __linux__
-#else
-   unlink(o->tmpf);
-#endif
-   if (o->tmpf_fd >= 0) close(o->tmpf_fd);
-   eina_stringshare_del(o->tmpf);
-   o->tmpf_fd = -1;
-   o->tmpf = NULL;
-#else
-   (void) obj;
-#endif
-}
-
-static void
-_create_tmpf(Evas_Object *obj, void *data, int size, char *format __UNUSED__)
-{
-#ifdef HAVE_SYS_MMAN_H
-   Evas_Object_Image *o;
-   char buf[4096];
-   void *dst;
-   int fd = -1;
-   
-   o = (Evas_Object_Image *)(obj->object_data);
-#ifdef __linux__
-   snprintf(buf, sizeof(buf), "/dev/shm/.evas-tmpf-%i-%p-%i-XXXXXX", 
-            (int)getpid(), data, (int)size);
-   fd = mkstemp(buf);
-#endif   
-   if (fd < 0)
-     {
-        snprintf(buf, sizeof(buf), "/tmp/.evas-tmpf-%i-%p-%i-XXXXXX", 
-                 (int)getpid(), data, (int)size);
-        fd = mkstemp(buf);
-     }
-   if (fd < 0) return;
-   if (ftruncate(fd, size) < 0)
-     {
-        unlink(buf);
-        close(fd);
-        return;
-     }
-   unlink(buf);
-   
-   eina_mmap_safety_enabled_set(EINA_TRUE);
-   
-   dst = mmap(NULL, size, 
-              PROT_READ | PROT_WRITE, 
-              MAP_SHARED, 
-              fd, 0);
-   if (dst == MAP_FAILED)
-     {
-        close(fd);
-        return;
-     }
-   o->tmpf_fd = fd;
-#ifdef __linux__
-   snprintf(buf, sizeof(buf), "/proc/%li/fd/%i", (long)getpid(), fd);
-#endif
-   o->tmpf = eina_stringshare_add(buf);
-   memcpy(dst, data, size);
-   munmap(dst, size);
-#else
-   (void) obj;
-   (void) data;
-   (void) size;
-   (void) format;
-#endif
-}
-
-EAPI void
-evas_object_image_memfile_set(Evas_Object *obj, void *data, int size, char *format, char *key)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-   _cleanup_tmpf(obj);
-   evas_object_image_file_set(obj, NULL, NULL);
-   // invalidate the cache effectively
-   evas_object_image_alpha_set(obj, !o->cur.has_alpha);
-   evas_object_image_alpha_set(obj, !o->cur.has_alpha);
-
-   if ((size < 1) || (!data)) return;
-
-   _create_tmpf(obj, data, size, format);
-   evas_object_image_file_set(obj, o->tmpf, key);
-   if (!o->engine_data)
-     {
-        ERR("unable to load '%s' from memory", o->tmpf);
-        _cleanup_tmpf(obj);
-        return;
-     }
-}
-
-EAPI void
-evas_object_image_file_set(Evas_Object *obj, const char *file, const char *key)
-{
-   Evas_Object_Image *o;
-   Evas_Image_Load_Opts lo;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-   if ((o->tmpf) && (file != o->tmpf)) _cleanup_tmpf(obj);
-   if ((o->cur.file) && (file) && (!strcmp(o->cur.file, file)))
-     {
-        if ((!o->cur.key) && (!key))
-          return;
-        if ((o->cur.key) && (key) && (!strcmp(o->cur.key, key)))
-          return;
-     }
-/*
- * WTF? why cancel a null image preload? this is just silly (tm)
-   if (!o->engine_data)
-     obj->layer->evas->engine.func->image_data_preload_cancel(obj->layer->evas->engine.data.output,
-                                                              o->engine_data,
-                                                              obj);
- */
-   if (o->cur.source) _proxy_unset(obj);
-   if (o->cur.file) eina_stringshare_del(o->cur.file);
-   if (o->cur.key) eina_stringshare_del(o->cur.key);
-   if (file) o->cur.file = eina_stringshare_add(file);
-   else o->cur.file = NULL;
-   if (key) o->cur.key = eina_stringshare_add(key);
-   else o->cur.key = NULL;
-   o->prev.file = NULL;
-   o->prev.key = NULL;
-   if (o->engine_data)
-     {
-        if (o->preloading)
-          {
-             o->preloading = 0;
-             obj->layer->evas->engine.func->image_data_preload_cancel(obj->layer->evas->engine.data.output,
-                                                                      o->engine_data,
-                                                                      obj);
-          }
-        obj->layer->evas->engine.func->image_free(obj->layer->evas->engine.data.output,
-                                                  o->engine_data);
-     }
-   o->load_error = EVAS_LOAD_ERROR_NONE;
-   lo.scale_down_by = o->load_opts.scale_down_by;
-   lo.dpi = o->load_opts.dpi;
-   lo.w = o->load_opts.w;
-   lo.h = o->load_opts.h;
-   lo.region.x = o->load_opts.region.x;
-   lo.region.y = o->load_opts.region.y;
-   lo.region.w = o->load_opts.region.w;
-   lo.region.h = o->load_opts.region.h;
-   lo.orientation = o->load_opts.orientation;
-   o->engine_data = obj->layer->evas->engine.func->image_load(obj->layer->evas->engine.data.output,
-                                                              o->cur.file,
-                                                              o->cur.key,
-                                                              &o->load_error,
-                                                              &lo);
-   if (o->engine_data)
-     {
-        int w, h;
-        int stride;
-
-        obj->layer->evas->engine.func->image_size_get(obj->layer->evas->engine.data.output,
-                                                      o->engine_data, &w, &h);
-        if (obj->layer->evas->engine.func->image_stride_get)
-          obj->layer->evas->engine.func->image_stride_get(obj->layer->evas->engine.data.output,
-                                                          o->engine_data, &stride);
-        else
-          stride = w * 4;
-        o->cur.has_alpha = obj->layer->evas->engine.func->image_alpha_get(obj->layer->evas->engine.data.output,
-                                                                          o->engine_data);
-        o->cur.cspace = obj->layer->evas->engine.func->image_colorspace_get(obj->layer->evas->engine.data.output,
-                                                                            o->engine_data);
-        o->cur.image.w = w;
-        o->cur.image.h = h;
-        o->cur.image.stride = stride;
-     }
-   else
-     {
-        if (o->load_error == EVAS_LOAD_ERROR_NONE)
-          o->load_error = EVAS_LOAD_ERROR_GENERIC;
-        o->cur.has_alpha = 1;
-        o->cur.cspace = EVAS_COLORSPACE_ARGB8888;
-        o->cur.image.w = 0;
-        o->cur.image.h = 0;
-        o->cur.image.stride = 0;
-     }
-   o->changed = 1;
-   evas_object_change(obj);
-}
-
-EAPI void
-evas_object_image_file_get(const Evas_Object *obj, const char **file, const char **key)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   if (file) *file = NULL;
-   if (key) *key = NULL;
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   if (file) *file = NULL;
-   if (key) *key = NULL;
-   return;
-   MAGIC_CHECK_END();
-   if (file) *file = o->cur.file;
-   if (key) *key = o->cur.key;
-}
-
-EAPI Eina_Bool
-evas_object_image_source_set(Evas_Object *obj, Evas_Object *src)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-   o = obj->object_data;
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-
-   if (src == obj) return EINA_FALSE;
-   if (o->cur.source == src) return EINA_TRUE;
-
-   _evas_object_image_cleanup(obj, o);
-   /* Kill the image if any */
-   if (o->cur.file || o->cur.key)
-      evas_object_image_file_set(obj, NULL, NULL);
-
-   if (src)
-     {
-        _proxy_set(obj, src);
-     }
-
-   return EINA_TRUE;
-}
-
-
-EAPI Evas_Object *
-evas_object_image_source_get(Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   o = obj->object_data;
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return NULL;
-   MAGIC_CHECK_END();
-
-   return o->cur.source;
-}
-
-EAPI Eina_Bool
-evas_object_image_source_unset(Evas_Object *obj)
-{
-   return evas_object_image_source_set(obj, NULL);
-}
-
-EAPI void
-evas_object_image_border_set(Evas_Object *obj, int l, int r, int t, int b)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-   if (l < 0) l = 0;
-   if (r < 0) r = 0;
-   if (t < 0) t = 0;
-   if (b < 0) b = 0;
-   if ((o->cur.border.l == l) &&
-       (o->cur.border.r == r) &&
-       (o->cur.border.t == t) &&
-       (o->cur.border.b == b)) return;
-   o->cur.border.l = l;
-   o->cur.border.r = r;
-   o->cur.border.t = t;
-   o->cur.border.b = b;
-   o->cur.opaque_valid = 0;
-   o->changed = 1;
-   evas_object_change(obj);
-}
-
-EAPI void
-evas_object_image_border_get(const Evas_Object *obj, int *l, int *r, int *t, int *b)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   if (l) *l = 0;
-   if (r) *r = 0;
-   if (t) *t = 0;
-   if (b) *b = 0;
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   if (l) *l = 0;
-   if (r) *r = 0;
-   if (t) *t = 0;
-   if (b) *b = 0;
-   return;
-   MAGIC_CHECK_END();
-   if (l) *l = o->cur.border.l;
-   if (r) *r = o->cur.border.r;
-   if (t) *t = o->cur.border.t;
-   if (b) *b = o->cur.border.b;
-}
-
-EAPI void
-evas_object_image_border_center_fill_set(Evas_Object *obj, Evas_Border_Fill_Mode fill)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-   if (fill == o->cur.border.fill) return;
-   o->cur.border.fill = fill;
-   o->changed = 1;
-   evas_object_change(obj);
-}
-
-EAPI Evas_Border_Fill_Mode
-evas_object_image_border_center_fill_get(const Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return 0;
-   MAGIC_CHECK_END();
-   return o->cur.border.fill;
-}
-
-EAPI void
-evas_object_image_filled_set(Evas_Object *obj, Eina_Bool setting)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-
-   setting = !!setting;
-   if (o->filled == setting) return;
-
-   o->filled = setting;
-   if (!o->filled)
-     evas_object_event_callback_del(obj, EVAS_CALLBACK_RESIZE, evas_object_image_filled_resize_listener);
-   else
-     {
-        Evas_Coord w, h;
-
-        evas_object_geometry_get(obj, NULL, NULL, &w, &h);
-        evas_object_image_fill_set(obj, 0, 0, w, h);
-
-        evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, evas_object_image_filled_resize_listener, NULL);
-     }
-}
-
-EAPI Eina_Bool
-evas_object_image_filled_get(const Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return 0;
-   MAGIC_CHECK_END();
-
-   return o->filled;
-}
-
-EAPI void
-evas_object_image_border_scale_set(Evas_Object *obj, double scale)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-   if (scale == o->cur.border.scale) return;
-   o->cur.border.scale = scale;
-   o->changed = 1;
-   evas_object_change(obj);
-}
-
-EAPI double
-evas_object_image_border_scale_get(const Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 1.0;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return 1.0;
-   MAGIC_CHECK_END();
-   return o->cur.border.scale;
-}
-
-EAPI void
-evas_object_image_fill_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
-{
-   Evas_Object_Image *o;
-
-   if (w < 0) w = -w;
-   if (h < 0) h = -h;
-   if (w == 0) return;
-   if (h == 0) return;
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-   if ((o->cur.fill.x == x) &&
-       (o->cur.fill.y == y) &&
-       (o->cur.fill.w == w) &&
-       (o->cur.fill.h == h)) return;
-   o->cur.fill.x = x;
-   o->cur.fill.y = y;
-   o->cur.fill.w = w;
-   o->cur.fill.h = h;
-   o->cur.opaque_valid = 0;   
-   o->changed = 1;
-   evas_object_change(obj);
-}
-
-EAPI void
-evas_object_image_fill_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   if (x) *x = 0;
-   if (y) *y = 0;
-   if (w) *w = 0;
-   if (h) *h = 0;
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   if (x) *x = 0;
-   if (y) *y = 0;
-   if (w) *w = 0;
-   if (h) *h = 0;
-   return;
-   MAGIC_CHECK_END();
-   if (x) *x = o->cur.fill.x;
-   if (y) *y = o->cur.fill.y;
-   if (w) *w = o->cur.fill.w;
-   if (h) *h = o->cur.fill.h;
-}
-
-
-EAPI void
-evas_object_image_fill_spread_set(Evas_Object *obj, Evas_Fill_Spread spread)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-   if (spread == (Evas_Fill_Spread)o->cur.spread) return;
-   o->cur.spread = spread;
-   o->changed = 1;
-   evas_object_change(obj);
-}
-
-EAPI Evas_Fill_Spread
-evas_object_image_fill_spread_get(const Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EVAS_TEXTURE_REPEAT;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return EVAS_TEXTURE_REPEAT;
-   MAGIC_CHECK_END();
-   return (Evas_Fill_Spread)o->cur.spread;
-}
-
-EAPI void
-evas_object_image_size_set(Evas_Object *obj, int w, int h)
-{
-   Evas_Object_Image *o;
-   int stride = 0;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-   _evas_object_image_cleanup(obj, o);
-   if (w < 1) w = 1;
-   if (h < 1) h = 1;
-   if (w > 32768) return;
-   if (h > 32768) return;
-   if ((w == o->cur.image.w) &&
-       (h == o->cur.image.h)) return;
-   o->cur.image.w = w;
-   o->cur.image.h = h;
-   if (o->engine_data)
-      o->engine_data = obj->layer->evas->engine.func->image_size_set(obj->layer->evas->engine.data.output,
-                                                                     o->engine_data,
-                                                                     w, h);
-   else
-      o->engine_data = obj->layer->evas->engine.func->image_new_from_copied_data
-      (obj->layer->evas->engine.data.output, w, h, NULL, o->cur.has_alpha,
-          o->cur.cspace);
-
-   if (o->engine_data)
-     {
-        if (obj->layer->evas->engine.func->image_scale_hint_set)
-           obj->layer->evas->engine.func->image_scale_hint_set
-           (obj->layer->evas->engine.data.output,
-               o->engine_data, o->scale_hint);
-        if (obj->layer->evas->engine.func->image_content_hint_set)
-           obj->layer->evas->engine.func->image_content_hint_set
-           (obj->layer->evas->engine.data.output,
-               o->engine_data, o->content_hint);
-        if (obj->layer->evas->engine.func->image_stride_get)
-           obj->layer->evas->engine.func->image_stride_get
-           (obj->layer->evas->engine.data.output,
-               o->engine_data, &stride);
-        else
-           stride = w * 4;
-     }
-   else
-      stride = w * 4;
-   o->cur.image.stride = stride;
-
-/* FIXME - in engine call above
-   if (o->engine_data)
-     o->engine_data = obj->layer->evas->engine.func->image_alpha_set(obj->layer->evas->engine.data.output,
-                                                                     o->engine_data,
-                                                                     o->cur.has_alpha);
-*/
-   EVAS_OBJECT_IMAGE_FREE_FILE_AND_KEY(o);
-   o->changed = 1;
-   evas_object_change(obj);
-}
-
-EAPI void
-evas_object_image_size_get(const Evas_Object *obj, int *w, int *h)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   if (w) *w = 0;
-   if (h) *h = 0;
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   if (w) *w = 0;
-   if (h) *h = 0;
-   return;
-   MAGIC_CHECK_END();
-   if (w) *w = o->cur.image.w;
-   if (h) *h = o->cur.image.h;
-}
-
-EAPI int
-evas_object_image_stride_get(const Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return 0;
-   MAGIC_CHECK_END();
-   return o->cur.image.stride;
-}
-
-EAPI Evas_Load_Error
-evas_object_image_load_error_get(const Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return 0;
-   MAGIC_CHECK_END();
-   return o->load_error;
-}
-
-EAPI void *
-evas_object_image_data_convert(Evas_Object *obj, Evas_Colorspace to_cspace)
-{
-   Evas_Object_Image *o;
-   DATA32 *data;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return NULL;
-   MAGIC_CHECK_END();
-   if ((o->preloading) && (o->engine_data))
-     {
-        o->preloading = 0;
-        obj->layer->evas->engine.func->image_data_preload_cancel(obj->layer->evas->engine.data.output,
-                                                                 o->engine_data,
-                                                                 obj);
-     }
-   if (!o->engine_data) return NULL;
-   if (o->video_surface)
-     o->video.update_pixels(o->video.data, obj, &o->video);
-   if (o->cur.cspace == to_cspace) return NULL;
-   data = NULL;
-   o->engine_data = obj->layer->evas->engine.func->image_data_get(obj->layer->evas->engine.data.output,
-                                                                  o->engine_data,
-                                                                  0,
-                                                                  &data,
-                                                                  &o->load_error);
-   return evas_object_image_data_convert_internal(o, data, to_cspace);
-}
-
-EAPI void
-evas_object_image_data_set(Evas_Object *obj, void *data)
-{
-   Evas_Object_Image *o;
-   void *p_data;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-   _evas_object_image_cleanup(obj, o);
-#ifdef EVAS_FRAME_QUEUING
-   if (o->engine_data)
-     evas_common_pipe_op_image_flush(o->engine_data);
-#endif
-   p_data = o->engine_data;
-   if (data)
-     {
-        if (o->engine_data)
-          o->engine_data = obj->layer->evas->engine.func->image_data_put(obj->layer->evas->engine.data.output,
-                                                                         o->engine_data,
-                                                                         data);
-        else
-          o->engine_data = obj->layer->evas->engine.func->image_new_from_data(obj->layer->evas->engine.data.output,
-                                                                              o->cur.image.w,
-                                                                              o->cur.image.h,
-                                                                              data,
-                                                                              o->cur.has_alpha,
-                                                                              o->cur.cspace);
-        if (o->engine_data)
-          {
-             int stride = 0;
-             
-             if (obj->layer->evas->engine.func->image_scale_hint_set)
-                obj->layer->evas->engine.func->image_scale_hint_set
-                (obj->layer->evas->engine.data.output,
-                    o->engine_data, o->scale_hint);
-             if (obj->layer->evas->engine.func->image_content_hint_set)
-                obj->layer->evas->engine.func->image_content_hint_set
-                (obj->layer->evas->engine.data.output,
-                    o->engine_data, o->content_hint); 
-             if (obj->layer->evas->engine.func->image_stride_get)
-                obj->layer->evas->engine.func->image_stride_get
-                (obj->layer->evas->engine.data.output,
-                    o->engine_data, &stride);
-             else
-                stride = o->cur.image.w * 4;
-             o->cur.image.stride = stride;
-         }
-     }
-   else
-     {
-        if (o->engine_data)
-          obj->layer->evas->engine.func->image_free(obj->layer->evas->engine.data.output,
-                                                    o->engine_data);
-        o->load_error = EVAS_LOAD_ERROR_NONE;
-        o->cur.image.w = 0;
-        o->cur.image.h = 0;
-        o->cur.image.stride = 0;
-        o->engine_data = NULL;
-     }
-/* FIXME - in engine call above
-   if (o->engine_data)
-     o->engine_data = obj->layer->evas->engine.func->image_alpha_set(obj->layer->evas->engine.data.output,
-                                                                     o->engine_data,
-                                                                     o->cur.has_alpha);
-*/
-   if (o->pixels_checked_out > 0) o->pixels_checked_out--;
-   if (p_data != o->engine_data)
-     {
-        EVAS_OBJECT_IMAGE_FREE_FILE_AND_KEY(o);
-        o->pixels_checked_out = 0;
-     }
-   o->changed = 1;
-   evas_object_change(obj);
-}
-
-EAPI void *
-evas_object_image_data_get(const Evas_Object *obj, Eina_Bool for_writing)
-{
-   Evas_Object_Image *o;
-   DATA32 *data;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return NULL;
-   MAGIC_CHECK_END();
-   if (!o->engine_data) return NULL;
-#ifdef EVAS_FRAME_QUEUING
-   evas_common_pipe_op_image_flush(o->engine_data);
-#endif
-
-   data = NULL;
-   if (obj->layer->evas->engine.func->image_scale_hint_set)
-      obj->layer->evas->engine.func->image_scale_hint_set
-      (obj->layer->evas->engine.data.output,
-          o->engine_data, o->scale_hint);
-   if (obj->layer->evas->engine.func->image_content_hint_set)
-      obj->layer->evas->engine.func->image_content_hint_set
-      (obj->layer->evas->engine.data.output,
-          o->engine_data, o->content_hint);
-   o->engine_data = obj->layer->evas->engine.func->image_data_get(obj->layer->evas->engine.data.output,
-                                                                  o->engine_data,
-                                                                  for_writing,
-                                                                  &data,
-                                                                  &o->load_error);
-
-   /* if we fail to get engine_data, we have to return NULL */
-   if (!o->engine_data) return NULL;
-
-   if (o->engine_data)
-     {
-        int stride = 0;
-
-        if (obj->layer->evas->engine.func->image_stride_get)
-           obj->layer->evas->engine.func->image_stride_get
-           (obj->layer->evas->engine.data.output,
-               o->engine_data, &stride);
-        else
-           stride = o->cur.image.w * 4;
-        o->cur.image.stride = stride;
-     }
-   o->pixels_checked_out++;
-   if (for_writing)
-     {
-        EVAS_OBJECT_IMAGE_FREE_FILE_AND_KEY(o);
-     }
-
-   return data;
-}
-
-EAPI void
-evas_object_image_preload(Evas_Object *obj, Eina_Bool cancel)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return ;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return ;
-   MAGIC_CHECK_END();
-   if (!o->engine_data)
-     {
-        o->preloading = 1;
-        evas_object_inform_call_image_preloaded(obj);
-        return;
-     }
-   // FIXME: if already busy preloading, then dont request again until
-   // preload done
-   if (cancel)
-     {
-        if (o->preloading)
-          {
-             o->preloading = 0;
-             obj->layer->evas->engine.func->image_data_preload_cancel(obj->layer->evas->engine.data.output,
-                                                                      o->engine_data,
-                                                                      obj);
-          }
-     }
-   else
-     {
-        if (!o->preloading)
-          {
-             o->preloading = 1;
-             obj->layer->evas->engine.func->image_data_preload_request(obj->layer->evas->engine.data.output,
-                                                                       o->engine_data,
-                                                                       obj);
-          }
-     }
-}
-
-EAPI void
-evas_object_image_data_copy_set(Evas_Object *obj, void *data)
-{
-   Evas_Object_Image *o;
-
-   if (!data) return;
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-   _evas_object_image_cleanup(obj, o);
-   if ((o->cur.image.w <= 0) ||
-       (o->cur.image.h <= 0)) return;
-   if (o->engine_data)
-     obj->layer->evas->engine.func->image_free(obj->layer->evas->engine.data.output,
-                                               o->engine_data);
-   o->engine_data = obj->layer->evas->engine.func->image_new_from_copied_data(obj->layer->evas->engine.data.output,
-                                                                              o->cur.image.w,
-                                                                              o->cur.image.h,
-                                                                              data,
-                                                                              o->cur.has_alpha,
-                                                                              o->cur.cspace);
-   if (o->engine_data)
-     {
-        int stride = 0;
-
-        o->engine_data = obj->layer->evas->engine.func->image_alpha_set(obj->layer->evas->engine.data.output,
-                                                                        o->engine_data,
-                                                                        o->cur.has_alpha);
-        if (obj->layer->evas->engine.func->image_scale_hint_set)
-           obj->layer->evas->engine.func->image_scale_hint_set
-           (obj->layer->evas->engine.data.output,
-               o->engine_data, o->scale_hint);
-        if (obj->layer->evas->engine.func->image_content_hint_set)
-           obj->layer->evas->engine.func->image_content_hint_set
-           (obj->layer->evas->engine.data.output,
-               o->engine_data, o->content_hint);
-        if (obj->layer->evas->engine.func->image_stride_get)
-           obj->layer->evas->engine.func->image_stride_get
-           (obj->layer->evas->engine.data.output,
-               o->engine_data, &stride);
-        else
-           stride = o->cur.image.w * 4;
-        o->cur.image.stride = stride;
-     }
-   o->pixels_checked_out = 0;
-   EVAS_OBJECT_IMAGE_FREE_FILE_AND_KEY(o);
-}
-
-EAPI void
-evas_object_image_data_update_add(Evas_Object *obj, int x, int y, int w, int h)
-{
-   Evas_Object_Image *o;
-   Eina_Rectangle *r;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-   RECTS_CLIP_TO_RECT(x, y, w, h, 0, 0, o->cur.image.w, o->cur.image.h);
-   if ((w <= 0)  || (h <= 0)) return;
-   NEW_RECT(r, x, y, w, h);
-   if (r) o->pixel_updates = eina_list_append(o->pixel_updates, r);
-   o->changed = 1;
-   evas_object_change(obj);
-}
-
-EAPI void
-evas_object_image_alpha_set(Evas_Object *obj, Eina_Bool has_alpha)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-   if ((o->preloading) && (o->engine_data))
-     {
-        o->preloading = 0;
-        obj->layer->evas->engine.func->image_data_preload_cancel(obj->layer->evas->engine.data.output,
-                                                                 o->engine_data,
-                                                                 obj);
-     }
-   if (((has_alpha) && (o->cur.has_alpha)) ||
-       ((!has_alpha) && (!o->cur.has_alpha)))
-     return;
-   o->cur.has_alpha = has_alpha;
-   if (o->engine_data)
-     {
-        int stride = 0;
-
-#ifdef EVAS_FRAME_QUEUING
-        evas_common_pipe_op_image_flush(o->engine_data);
-#endif
-        o->engine_data = obj->layer->evas->engine.func->image_alpha_set(obj->layer->evas->engine.data.output,
-                                                                     o->engine_data,
-                                                                     o->cur.has_alpha);
-        if (obj->layer->evas->engine.func->image_scale_hint_set)
-           obj->layer->evas->engine.func->image_scale_hint_set
-           (obj->layer->evas->engine.data.output,
-               o->engine_data, o->scale_hint);
-        if (obj->layer->evas->engine.func->image_content_hint_set)
-           obj->layer->evas->engine.func->image_content_hint_set
-           (obj->layer->evas->engine.data.output,
-               o->engine_data, o->content_hint);
-        if (obj->layer->evas->engine.func->image_stride_get)
-           obj->layer->evas->engine.func->image_stride_get
-           (obj->layer->evas->engine.data.output,
-               o->engine_data, &stride);
-        else
-           stride = o->cur.image.w * 4;
-        o->cur.image.stride = stride;
-     }
-   evas_object_image_data_update_add(obj, 0, 0, o->cur.image.w, o->cur.image.h);
-   EVAS_OBJECT_IMAGE_FREE_FILE_AND_KEY(o);
-}
-
-
-EAPI Eina_Bool
-evas_object_image_alpha_get(const Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return 0;
-   MAGIC_CHECK_END();
-   return o->cur.has_alpha;
-}
-
-EAPI void
-evas_object_image_smooth_scale_set(Evas_Object *obj, Eina_Bool smooth_scale)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-   if (((smooth_scale) && (o->cur.smooth_scale)) ||
-       ((!smooth_scale) && (!o->cur.smooth_scale)))
-     return;
-   o->cur.smooth_scale = smooth_scale;
-   o->changed = 1;
-   evas_object_change(obj);
-}
-
-EAPI Eina_Bool
-evas_object_image_smooth_scale_get(const Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return 0;
-   MAGIC_CHECK_END();
-   return o->cur.smooth_scale;
-}
-
-EAPI void
-evas_object_image_reload(Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-   if ((o->preloading) && (o->engine_data))
-     {
-        o->preloading = 0;
-        obj->layer->evas->engine.func->image_data_preload_cancel(obj->layer->evas->engine.data.output,
-                                                                 o->engine_data,
-                                                                 obj);
-     }
-   if ((!o->cur.file) ||
-       (o->pixels_checked_out > 0)) return;
-   if (o->engine_data)
-     o->engine_data = obj->layer->evas->engine.func->image_dirty_region(obj->layer->evas->engine.data.output, o->engine_data, 0, 0, o->cur.image.w, o->cur.image.h);
-   evas_object_image_unload(obj, 1);
-   evas_object_inform_call_image_unloaded(obj);
-   evas_object_image_load(obj);
-   o->prev.file = NULL;
-   o->prev.key = NULL;
-   o->changed = 1;
-   evas_object_change(obj);
-}
-
-EAPI Eina_Bool
-evas_object_image_save(const Evas_Object *obj, const char *file, const char *key, const char *flags)
-{
-   Evas_Object_Image *o;
-   DATA32 *data = NULL;
-   int quality = 80, compress = 9, ok = 0;
-   RGBA_Image *im;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return 0;
-   MAGIC_CHECK_END();
-
-   if (!o->engine_data) return 0;
-   o->engine_data = obj->layer->evas->engine.func->image_data_get(obj->layer->evas->engine.data.output,
-                                                                  o->engine_data,
-                                                                  0,
-                                                                  &data,
-                                                                  &o->load_error);
-   if (flags)
-     {
-        char *p, *pp;
-        char *tflags;
-
-        tflags = alloca(strlen(flags) + 1);
-        strcpy(tflags, flags);
-        p = tflags;
-        while (p)
-          {
-             pp = strchr(p, ' ');
-             if (pp) *pp = 0;
-             sscanf(p, "quality=%i", &quality);
-             sscanf(p, "compress=%i", &compress);
-             if (pp) p = pp + 1;
-             else break;
-          }
-     }
-   im = (RGBA_Image*) evas_cache_image_data(evas_common_image_cache_get(),
-                                            o->cur.image.w,
-                                            o->cur.image.h,
-                                            data,
-                                            o->cur.has_alpha,
-                                            EVAS_COLORSPACE_ARGB8888);
-   if (im)
-     {
-        if (o->cur.cspace == EVAS_COLORSPACE_ARGB8888)
-          im->image.data = data;
-        else
-          im->image.data = evas_object_image_data_convert_internal(o,
-                                                                   data,
-                                                                   EVAS_COLORSPACE_ARGB8888);
-        if (im->image.data)
-          {
-             ok = evas_common_save_image_to_file(im, file, key, quality, compress);
-
-             if (o->cur.cspace != EVAS_COLORSPACE_ARGB8888)
-               free(im->image.data);
-          }
-
-        evas_cache_image_drop(&im->cache_entry);
-     }
-   return ok;
-}
-
-EAPI Eina_Bool
-evas_object_image_pixels_import(Evas_Object *obj, Evas_Pixel_Import_Source *pixels)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return 0;
-   MAGIC_CHECK_END();
-   _evas_object_image_cleanup(obj, o);
-   if ((pixels->w != o->cur.image.w) || (pixels->h != o->cur.image.h)) return 0;
-   switch (pixels->format)
-     {
-#if 0
-      case EVAS_PIXEL_FORMAT_ARGB32:
-          {
-             if (o->engine_data)
-               {
-                  DATA32 *image_pixels = NULL;
-
-                  o->engine_data =
-                    obj->layer->evas->engine.func->image_data_get(obj->layer->evas->engine.data.output,
-                                                                  o->engine_data,
-                                                                  1,
-                                                                  &image_pixels,
-                                                                  &o->load_error);
-/* FIXME: need to actualyl support this */
-/*                memcpy(image_pixels, pixels->rows, o->cur.image.w * o->cur.image.h * 4);*/
-                  if (o->engine_data)
-                    o->engine_data =
-                    obj->layer->evas->engine.func->image_data_put(obj->layer->evas->engine.data.output,
-                                                                  o->engine_data,
-                                                                  image_pixels);
-                  if (o->engine_data)
-                    o->engine_data =
-                    obj->layer->evas->engine.func->image_alpha_set(obj->layer->evas->engine.data.output,
-                                                                   o->engine_data,
-                                                                   o->cur.has_alpha);
-                  o->changed = 1;
-                  evas_object_change(obj);
-               }
-          }
-        break;
-#endif
-#ifdef BUILD_CONVERT_YUV
-      case EVAS_PIXEL_FORMAT_YUV420P_601:
-          {
-             if (o->engine_data)
-               {
-                  DATA32 *image_pixels = NULL;
-
-                  o->engine_data =
-                    obj->layer->evas->engine.func->image_data_get(obj->layer->evas->engine.data.output,
-                                                                  o->engine_data,
-                                                                  1,
-                                                                  &image_pixels,
-                                                                  &o->load_error);
-                  if (image_pixels)
-                    evas_common_convert_yuv_420p_601_rgba((DATA8 **) pixels->rows,
-                                                          (DATA8 *) image_pixels,
-                                                          o->cur.image.w,
-                                                          o->cur.image.h);
-                  if (o->engine_data)
-                    o->engine_data =
-                    obj->layer->evas->engine.func->image_data_put(obj->layer->evas->engine.data.output,
-                                                                  o->engine_data,
-                                                                  image_pixels);
-                  if (o->engine_data)
-                    o->engine_data =
-                    obj->layer->evas->engine.func->image_alpha_set(obj->layer->evas->engine.data.output,
-                                                                   o->engine_data,
-                                                                   o->cur.has_alpha);
-                  o->changed = 1;
-                  evas_object_change(obj);
-               }
-          }
-        break;
-#endif
-      default:
-        return 0;
-        break;
-     }
-   return 1;
-}
-
-EAPI void
-evas_object_image_pixels_get_callback_set(Evas_Object *obj, Evas_Object_Image_Pixels_Get_Cb func, void *data)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-   o->func.get_pixels = func;
-   o->func.get_pixels_data = data;
-}
-
-EAPI void
-evas_object_image_pixels_dirty_set(Evas_Object *obj, Eina_Bool dirty)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-   if (dirty) o->dirty_pixels = 1;
-   else o->dirty_pixels = 0;
-   o->changed = 1;
-   evas_object_change(obj);
-}
-
-EAPI Eina_Bool
-evas_object_image_pixels_dirty_get(const Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return 0;
-   MAGIC_CHECK_END();
-   if (o->dirty_pixels) return 1;
-   return 0;
-}
-
-EAPI void
-evas_object_image_load_dpi_set(Evas_Object *obj, double dpi)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-   if (dpi == o->load_opts.dpi) return;
-   o->load_opts.dpi = dpi;
-   if (o->cur.file)
-     {
-        evas_object_image_unload(obj, 0);
-        evas_object_inform_call_image_unloaded(obj);
-        evas_object_image_load(obj);
-        o->changed = 1;
-        evas_object_change(obj);
-     }
-}
-
-EAPI double
-evas_object_image_load_dpi_get(const Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0.0;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return 0.0;
-   MAGIC_CHECK_END();
-   return o->load_opts.dpi;
-}
-
-EAPI void
-evas_object_image_load_size_set(Evas_Object *obj, int w, int h)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-   if ((o->load_opts.w == w) && (o->load_opts.h == h)) return;
-   o->load_opts.w = w;
-   o->load_opts.h = h;
-   if (o->cur.file)
-     {
-        evas_object_image_unload(obj, 0);
-        evas_object_inform_call_image_unloaded(obj);
-        evas_object_image_load(obj);
-        o->changed = 1;
-        evas_object_change(obj);
-     }
-}
-
-EAPI void
-evas_object_image_load_size_get(const Evas_Object *obj, int *w, int *h)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-   if (w) *w = o->load_opts.w;
-   if (h) *h = o->load_opts.h;
-}
-
-EAPI void
-evas_object_image_load_scale_down_set(Evas_Object *obj, int scale_down)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-   if (o->load_opts.scale_down_by == scale_down) return;
-   o->load_opts.scale_down_by = scale_down;
-   if (o->cur.file)
-     {
-        evas_object_image_unload(obj, 0);
-        evas_object_inform_call_image_unloaded(obj);
-        evas_object_image_load(obj);
-        o->changed = 1;
-        evas_object_change(obj);
-     }
-}
-
-EAPI int
-evas_object_image_load_scale_down_get(const Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return 0;
-   MAGIC_CHECK_END();
-   return o->load_opts.scale_down_by;
-}
-
-EAPI void
-evas_object_image_load_region_set(Evas_Object *obj, int x, int y, int w, int h)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-   if ((o->load_opts.region.x == x) && (o->load_opts.region.y == y) &&
-       (o->load_opts.region.w == w) && (o->load_opts.region.h == h)) return;
-   o->load_opts.region.x = x;
-   o->load_opts.region.y = y;
-   o->load_opts.region.w = w;
-   o->load_opts.region.h = h;
-   if (o->cur.file)
-     {
-        evas_object_image_unload(obj, 0);
-        evas_object_inform_call_image_unloaded(obj);
-        evas_object_image_load(obj);
-        o->changed = 1;
-        evas_object_change(obj);
-     }
-}
-
-EAPI void
-evas_object_image_load_region_get(const Evas_Object *obj, int *x, int *y, int *w, int *h)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-   if (x) *x = o->load_opts.region.x;
-   if (y) *y = o->load_opts.region.y;
-   if (w) *w = o->load_opts.region.w;
-   if (h) *h = o->load_opts.region.h;
-}
-
-EAPI void
-evas_object_image_load_orientation_set(Evas_Object *obj, Eina_Bool enable)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-   o->load_opts.orientation = !!enable;
-}
-
-EAPI Eina_Bool
-evas_object_image_load_orientation_get(const Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-   return o->load_opts.orientation;
-}
-
-EAPI void
-evas_object_image_colorspace_set(Evas_Object *obj, Evas_Colorspace cspace)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-
-   _evas_object_image_cleanup(obj, o);
-#ifdef EVAS_FRAME_QUEUING
-   if ((Evas_Colorspace)o->cur.cspace != cspace)
-     {
-        if (o->engine_data)
-          evas_common_pipe_op_image_flush(o->engine_data);
-     }
-#endif
-
-   o->cur.cspace = cspace;
-   if (o->engine_data)
-     obj->layer->evas->engine.func->image_colorspace_set(obj->layer->evas->engine.data.output,
-                                                         o->engine_data,
-                                                         cspace);
-}
-
-EAPI Evas_Colorspace
-evas_object_image_colorspace_get(const Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EVAS_COLORSPACE_ARGB8888;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return EVAS_COLORSPACE_ARGB8888;
-   MAGIC_CHECK_END();
-   return o->cur.cspace;
-}
-
-EAPI void
-evas_object_image_video_surface_set(Evas_Object *obj, Evas_Video_Surface *surf)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-   _evas_object_image_cleanup(obj, o);
-   if (o->video_surface)
-     {
-        o->video_surface = 0;
-        obj->layer->evas->video_objects = eina_list_remove(obj->layer->evas->video_objects, obj);
-     }
-
-   if (surf)
-     {
-        if (surf->version != EVAS_VIDEO_SURFACE_VERSION) return ;
-
-        if (!surf->update_pixels ||
-            !surf->move ||
-            !surf->resize ||
-            !surf->hide ||
-            !surf->show)
-          return ;
-
-        o->created = EINA_TRUE;
-        o->video_surface = 1;
-        o->video = *surf;
-
-        obj->layer->evas->video_objects = eina_list_append(obj->layer->evas->video_objects, obj);
-     }
-   else
-     {
-        o->video_surface = 0;
-        o->video.update_pixels = NULL;
-        o->video.move = NULL;
-        o->video.resize = NULL;
-        o->video.hide = NULL;
-        o->video.show = NULL;
-        o->video.data = NULL;
-     }
-}
-
-EAPI const Evas_Video_Surface *
-evas_object_image_video_surface_get(const Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return NULL;
-   MAGIC_CHECK_END();
-   if (!o->video_surface) return NULL;
-   return &o->video;
-}
-
-EAPI void
-evas_object_image_native_surface_set(Evas_Object *obj, Evas_Native_Surface *surf)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-   _evas_object_image_cleanup(obj, o);
-   if (!obj->layer->evas->engine.func->image_native_set) return;
-   if ((surf) &&
-       ((surf->version < 2) ||
-        (surf->version > EVAS_NATIVE_SURFACE_VERSION))) return;
-   o->engine_data = 
-      obj->layer->evas->engine.func->image_native_set(obj->layer->evas->engine.data.output,
-                                                      o->engine_data,
-                                                      surf);
-}
-
-EAPI Evas_Native_Surface *
-evas_object_image_native_surface_get(const Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return NULL;
-   MAGIC_CHECK_END();
-   if (!obj->layer->evas->engine.func->image_native_get) return NULL;
-   return obj->layer->evas->engine.func->image_native_get(obj->layer->evas->engine.data.output,
-                                                          o->engine_data);
-}
-
-EAPI void
-evas_object_image_scale_hint_set(Evas_Object *obj, Evas_Image_Scale_Hint hint)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-   if (o->scale_hint == hint) return;
-#ifdef EVAS_FRAME_QUEUING
-   if (o->engine_data)
-      evas_common_pipe_op_image_flush(o->engine_data);
-#endif
-   o->scale_hint = hint;
-   if (o->engine_data)
-     {
-        int stride = 0;
-        
-        if (obj->layer->evas->engine.func->image_scale_hint_set)
-           obj->layer->evas->engine.func->image_scale_hint_set
-           (obj->layer->evas->engine.data.output,
-               o->engine_data, o->scale_hint);
-        if (obj->layer->evas->engine.func->image_stride_get)
-           obj->layer->evas->engine.func->image_stride_get
-           (obj->layer->evas->engine.data.output,
-               o->engine_data, &stride);
-        else
-           stride = o->cur.image.w * 4;
-        o->cur.image.stride = stride;
-     }
-}
-
-EAPI Evas_Image_Scale_Hint
-evas_object_image_scale_hint_get(const Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EVAS_IMAGE_SCALE_HINT_NONE;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return EVAS_IMAGE_SCALE_HINT_NONE;
-   MAGIC_CHECK_END();
-   return o->scale_hint;
-}
-
-EAPI void
-evas_object_image_content_hint_set(Evas_Object *obj, Evas_Image_Content_Hint hint)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-   if (o->content_hint == hint) return;
-#ifdef EVAS_FRAME_QUEUING
-   if (o->engine_data)
-      evas_common_pipe_op_image_flush(o->engine_data);
-#endif
-   o->content_hint = hint;
-   if (o->engine_data)
-     {
-        int stride = 0;
-        
-        if (obj->layer->evas->engine.func->image_content_hint_set)
-           obj->layer->evas->engine.func->image_content_hint_set
-           (obj->layer->evas->engine.data.output,
-               o->engine_data, o->content_hint);
-        if (obj->layer->evas->engine.func->image_stride_get)
-           obj->layer->evas->engine.func->image_stride_get
-           (obj->layer->evas->engine.data.output,
-               o->engine_data, &stride);
-        else
-           stride = o->cur.image.w * 4;
-        o->cur.image.stride = stride;
-     }
-}
-
-EAPI void
-evas_object_image_alpha_mask_set(Evas_Object *obj, Eina_Bool ismask)
-{
-   Evas_Object_Image *o;
-
-   if (!ismask) return;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-
-   /* Convert to A8 if not already */
-
-   /* done */
-
-}
-
-#define FRAME_MAX 1024
-EAPI Evas_Image_Content_Hint
-evas_object_image_content_hint_get(const Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EVAS_IMAGE_CONTENT_HINT_NONE;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return EVAS_IMAGE_CONTENT_HINT_NONE;
-   MAGIC_CHECK_END();
-   return o->content_hint;
-}
-
-EAPI Eina_Bool
-evas_object_image_region_support_get(const Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *) (obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-
-   return obj->layer->evas->engine.func->image_can_region_get(
-      obj->layer->evas->engine.data.output,
-      o->engine_data);
-}
-
-/* animated feature */
-EAPI Eina_Bool
-evas_object_image_animated_get(const Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-
-   if (obj->layer->evas->engine.func->image_animated_get)
-     return obj->layer->evas->engine.func->image_animated_get(obj->layer->evas->engine.data.output, o->engine_data);
-   return EINA_FALSE;
-}
-
-EAPI int
-evas_object_image_animated_frame_count_get(const Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return -1;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return -1;
-   MAGIC_CHECK_END();
-
-   if (!evas_object_image_animated_get(obj)) return -1;
-   if (obj->layer->evas->engine.func->image_animated_frame_count_get)
-     return obj->layer->evas->engine.func->image_animated_frame_count_get(obj->layer->evas->engine.data.output, o->engine_data);
-   return -1;
-}
-
-EAPI Evas_Image_Animated_Loop_Hint
-evas_object_image_animated_loop_type_get(const Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EVAS_IMAGE_ANIMATED_HINT_NONE;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return EVAS_IMAGE_ANIMATED_HINT_NONE;
-   MAGIC_CHECK_END();
-
-   if (!evas_object_image_animated_get(obj)) return EVAS_IMAGE_ANIMATED_HINT_NONE;
-
-   if (obj->layer->evas->engine.func->image_animated_loop_type_get)
-     return obj->layer->evas->engine.func->image_animated_loop_type_get(obj->layer->evas->engine.data.output, o->engine_data);
-   return EVAS_IMAGE_ANIMATED_HINT_NONE;
-}
-
-EAPI int
-evas_object_image_animated_loop_count_get(const Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return -1;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return -1;
-   MAGIC_CHECK_END();
-
-   if (!evas_object_image_animated_get(obj)) return -1;
-
-   if (obj->layer->evas->engine.func->image_animated_loop_count_get)
-     return obj->layer->evas->engine.func->image_animated_loop_count_get(obj->layer->evas->engine.data.output, o->engine_data);
-   return -1;
-}
-
-EAPI double
-evas_object_image_animated_frame_duration_get(const Evas_Object *obj, int start_frame, int frame_num)
-{
-   Evas_Object_Image *o;
-   int frame_count = 0;
-
-   if (start_frame < 1) return -1;
-   if (frame_num < 0) return -1;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return -1;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return -1;
-   MAGIC_CHECK_END();
-
-   if (!evas_object_image_animated_get(obj)) return -1;
-
-   if (!obj->layer->evas->engine.func->image_animated_frame_count_get) return -1;
-
-   frame_count = obj->layer->evas->engine.func->image_animated_frame_count_get(obj->layer->evas->engine.data.output, o->engine_data);
-
-   if ((start_frame + frame_num) > frame_count) return -1;
-   if (obj->layer->evas->engine.func->image_animated_frame_duration_get)
-     return obj->layer->evas->engine.func->image_animated_frame_duration_get(obj->layer->evas->engine.data.output, o->engine_data, start_frame, frame_num);
-   return -1;
-}
-
-EAPI void
-evas_object_image_animated_frame_set(Evas_Object *obj, int frame_index)
-{
-   Evas_Object_Image *o;
-   int frame_count = 0;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-
-   if (!o->cur.file) return;
-   if (o->cur.frame == frame_index) return;
-
-   if (!evas_object_image_animated_get(obj)) return;
-
-   frame_count = evas_object_image_animated_frame_count_get(obj);
-
-   /* limit the size of frame to FRAME_MAX */
-   if ((frame_count > FRAME_MAX) || (frame_count < 0) || (frame_index > frame_count))
-     return;
-
-   if (!obj->layer->evas->engine.func->image_animated_frame_set) return;
-   if (!obj->layer->evas->engine.func->image_animated_frame_set(obj->layer->evas->engine.data.output, o->engine_data, frame_index))
-     return;
-
-   o->prev.frame = o->cur.frame;
-   o->cur.frame = frame_index;
-
-   o->changed = 1;
-   evas_object_change(obj);
-
-}
-
-EAPI void
-evas_image_cache_flush(Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   e->engine.func->image_cache_flush(e->engine.data.output);
-}
-
-EAPI void
-evas_image_cache_reload(Evas *e)
-{
-   Evas_Layer *layer;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   evas_image_cache_flush(e);
-   EINA_INLIST_FOREACH(e->layers, layer)
-     {
-        Evas_Object *obj;
-
-        EINA_INLIST_FOREACH(layer->objects, obj)
-          {
-             Evas_Object_Image *o;
-
-             o = (Evas_Object_Image *)(obj->object_data);
-             if (o->magic == MAGIC_OBJ_IMAGE)
-               {
-                  evas_object_image_unload(obj, 1);
-                  evas_object_inform_call_image_unloaded(obj);
-               }
-          }
-     }
-   evas_image_cache_flush(e);
-   EINA_INLIST_FOREACH(e->layers, layer)
-     {
-        Evas_Object *obj;
-
-        EINA_INLIST_FOREACH(layer->objects, obj)
-          {
-             Evas_Object_Image *o;
-
-             o = (Evas_Object_Image *)(obj->object_data);
-             if (o->magic == MAGIC_OBJ_IMAGE)
-               {
-                  evas_object_image_load(obj);
-                  o->changed = 1;
-                  evas_object_change(obj);
-               }
-          }
-     }
-   evas_image_cache_flush(e);
-}
-
-EAPI void
-evas_image_cache_set(Evas *e, int size)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   if (size < 0) size = 0;
-   e->engine.func->image_cache_set(e->engine.data.output, size);
-}
-
-EAPI int
-evas_image_cache_get(const Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return 0;
-   MAGIC_CHECK_END();
-
-   return e->engine.func->image_cache_get(e->engine.data.output);
-}
-
-EAPI Eina_Bool
-evas_image_max_size_get(const Evas *e, int *maxw, int *maxh)
-{
-   int w = 0, h = 0;
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-   
-   if (maxw) *maxw = 0xffff;
-   if (maxh) *maxh = 0xffff;
-   if (!e->engine.func->image_max_size_get) return EINA_FALSE;
-   e->engine.func->image_max_size_get(e->engine.data.output, &w, &h);
-   if (maxw) *maxw = w;
-   if (maxh) *maxh = h;
-   return EINA_TRUE;
-}
-
-/* all nice and private */
-static void
-_proxy_unset(Evas_Object *proxy)
-{
-   Evas_Object_Image *o;
-
-   o = proxy->object_data;
-   if (!o->cur.source) return;
-
-   o->cur.source->proxy.proxies = eina_list_remove(o->cur.source->proxy.proxies, proxy);
-
-   o->cur.source = NULL;
-   if (o->cur.defmap)
-     {
-        evas_map_free(o->cur.defmap);
-        o->cur.defmap = NULL;
-     }
-}
-
-
-static void
-_proxy_set(Evas_Object *proxy, Evas_Object *src)
-{
-   Evas_Object_Image *o;
-
-   o = proxy->object_data;
-
-   evas_object_image_file_set(proxy, NULL, NULL);
-
-   o->cur.source = src;
-
-   src->proxy.proxies = eina_list_append(src->proxy.proxies, proxy);
-   src->proxy.redraw = EINA_TRUE;
-}
-
-/* Some moron just set a proxy on a proxy.
- * Give them some pixels.  A random color
- */
-static void
-_proxy_error(Evas_Object *proxy, void *context, void *output, void *surface,
-             int x, int y)
-{
-   Evas_Func *func;
-   int r = rand() % 255;
-   int g = rand() % 255;
-   int b = rand() % 255;
-   
-   /* XXX: Eina log error or something I'm sure
-    * If it bugs you, just fix it.  Don't tell me */
-   if (VERBOSE_PROXY_ERROR) printf("Err: Argh! Recursive proxies.\n");
-   
-   func = proxy->layer->evas->engine.func;
-   func->context_color_set(output, context, r, g, b, 255);
-   func->context_multiplier_unset(output, context);
-   func->context_render_op_set(output, context, proxy->cur.render_op);
-   func->rectangle_draw(output, context, surface, proxy->cur.geometry.x + x,
-                        proxy->cur.geometry.y + y,
-                        proxy->cur.geometry.w,
-                        proxy->cur.geometry.h);
-   return;
-}
-
-/*
-static void
-_proxy_subrender_recurse(Evas_Object *obj, Evas_Object *clip, void *output, void *surface, void *ctx, int x, int y)
-{
-   Evas_Object *obj2;
-   Evas *e = obj->layer->evas;
-   
-   if (obj->clip.clipees) return;
-   if (!obj->cur.visible) return;
-   if ((!clip) || (clip != obj->cur.clipper))
-     {
-        if (!obj->cur.cache.clip.visible) return;
-        if ((obj->cur.cache.clip.a == 0) &&
-            (obj->cur.render_op == EVAS_RENDER_BLEND)) return;
-     }
-   if ((obj->func->is_visible) && (!obj->func->is_visible(obj))) return;
-   
-   if (!obj->pre_render_done)
-      obj->func->render_pre(obj);
-   ctx = e->engine.func->context_new(output);
-   if (obj->smart.smart)
-     {
-        EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(obj), obj2)
-          {
-             _proxy_subrender_recurse(obj2, clip, output, surface, ctx, x, y);
-          }
-     }
-   else
-     {
-        obj->func->render(obj, output, ctx, surface, x, y);
-     }
-   e->engine.func->context_free(output, ctx);
-}
-*/
-
-/**
- * Render the source object when a proxy is set.
- *
- * Used to force a draw if necessary, else just makes sures it's available.
- */
-static void
-_proxy_subrender(Evas *e, Evas_Object *source)
-{
-   void *ctx;
-/*   Evas_Object *obj2, *clip;*/
-   int w, h;
-
-   if (!source) return;
-
-   w = source->cur.geometry.w;
-   h = source->cur.geometry.h;
-
-   source->proxy.redraw = EINA_FALSE;
-
-   /* We need to redraw surface then */
-   if ((source->proxy.surface) && 
-       ((source->proxy.w != w) || (source->proxy.h != h)))
-     {
-        e->engine.func->image_map_surface_free(e->engine.data.output,
-                                               source->proxy.surface);
-        source->proxy.surface = NULL;
-     }
-   
-   /* FIXME: Hardcoded alpha 'on' */
-   /* FIXME (cont): Should see if the object has alpha */
-   if (!source->proxy.surface)
-     {
-        source->proxy.surface = e->engine.func->image_map_surface_new
-           (e->engine.data.output, w, h, 1);
-        source->proxy.w = w;
-        source->proxy.h = h;
-     }
-
-   ctx = e->engine.func->context_new(e->engine.data.output);
-   e->engine.func->context_color_set(e->engine.data.output, ctx, 0, 0, 0, 0);
-   e->engine.func->context_render_op_set(e->engine.data.output, ctx, EVAS_RENDER_COPY);
-   e->engine.func->rectangle_draw(e->engine.data.output, ctx,
-                                  source->proxy.surface, 0, 0, w, h);
-   e->engine.func->context_free(e->engine.data.output, ctx);
-   
-   ctx = e->engine.func->context_new(e->engine.data.output);
-   evas_render_mapped(e, source, ctx, source->proxy.surface,
-                      -source->cur.geometry.x,
-                      -source->cur.geometry.y,
-                      1, 0, 0, e->output.w, e->output.h);
-   e->engine.func->context_free(e->engine.data.output, ctx);
-   source->proxy.surface = e->engine.func->image_dirty_region
-      (e->engine.data.output, source->proxy.surface, 0, 0, w, h);
-/*   
-   ctx = e->engine.func->context_new(e->engine.data.output);
-   if (source->smart.smart)
-     {
-        clip = evas_object_smart_clipped_clipper_get(source);
-        EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(source), obj2)
-          {
-             _proxy_subrender_recurse(obj2, clip, e->engine.data.output,
-                                      source->proxy.surface,
-                                      ctx,
-                                      -source->cur.geometry.x,
-                                      -source->cur.geometry.y);
-          }
-     }
-   else
-     {
-        if (!source->pre_render_done)
-           source->func->render_pre(source);
-        source->func->render(source, e->engine.data.output, ctx,
-                             source->proxy.surface,
-                             -source->cur.geometry.x,
-                             -source->cur.geometry.y);
-     }
-   
-   e->engine.func->context_free(e->engine.data.output, ctx);
-   source->proxy.surface = e->engine.func->image_dirty_region
-      (e->engine.data.output, source->proxy.surface, 0, 0, w, h);
- */
-}
-
-#if 0 // filtering disabled
-/*
- *
- * Note that this is similar to proxy_subrender_recurse.  It should be
- * possible to merge I guess
- */
-static void
-image_filter_draw_under_recurse(Evas *e, Evas_Object *obj, Evas_Object *stop,
-                                void *output, void *ctx, void *surface,
-                                int x, int y)
-{
-   Evas_Object *obj2;
-   
-   if (obj->clip.clipees) return;
-   /* FIXME: Doing bounding box test */
-   if (!evas_object_is_in_output_rect(obj, stop->cur.geometry.x,
-                                      stop->cur.geometry.y,
-                                      stop->cur.geometry.w,
-                                      stop->cur.geometry.h))
-      return;
-   
-   if (!evas_object_is_visible(obj)) return;
-   obj->pre_render_done = 1;
-   ctx = e->engine.func->context_new(output);
-   
-   if (obj->smart.smart)
-     {
-        EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(obj), obj2)
-          {
-             if (obj2 == stop) return;
-             image_filter_draw_under_recurse(e, obj2, stop, output, surface, 
-                                             ctx, x, y);
-          }
-     }
-   else
-      obj->func->render(obj, output, ctx, surface, x ,y);
-   e->engine.func->context_free(output, ctx);
-}
-
-/*
- * Draw all visible objects intersecting an object which are _beneath_ it.
- */
-static void
-image_filter_draw_under(Evas *e, Evas_Object *stop, void *output, void *ctx, void *surface, int dx, int dy)
-{
-   Evas_Layer *lay;
-   int x, y;
-   
-   x = stop->cur.geometry.x - dx;
-   y = stop->cur.geometry.y - dy;
-   
-   EINA_INLIST_FOREACH(e->layers, lay)
-     {
-        Evas_Object *obj;
-        EINA_INLIST_FOREACH(lay->objects, obj)
-          {
-             if (obj->delete_me) continue;
-             if (obj == stop) return;
-             /* FIXME: Do bounding box check */
-             image_filter_draw_under_recurse(e, obj, stop, output, ctx, 
-                                             surface, -x, -y);
-          }
-     }
-   e->engine.func->image_dirty_region(output, surface, 0, 0, 300, 300);
-   e->engine.func->output_flush(output);
-}
-
-/*
- * Update the filtered object.
- *
- * Creates a new context, and renders stuff (filtered) onto that.
- */
-Filtered_Image *
-image_filter_update(Evas *e, Evas_Object *obj, void *src, int imagew, int imageh, int *outw, int *outh)
-{
-   int w, h;
-   void *ctx;
-   Evas_Filter_Info *info;
-   void *surface;
-   Eina_Bool alpha;
-   
-   info = obj->filter;
-   
-   if (info->mode == EVAS_FILTER_MODE_BELOW)
-     {
-        w = obj->cur.geometry.w;
-        h = obj->cur.geometry.h;
-        evas_filter_get_size(info, w, h, &imagew, &imageh, EINA_TRUE);
-        alpha = EINA_FALSE;
-     }
-   else
-     {
-        evas_filter_get_size(info, imagew, imageh, &w, &h, EINA_FALSE);
-        alpha = e->engine.func->image_alpha_get(e->engine.data.output, src);
-     }
-   
-   /* Certain filters may make alpha images anyway */
-   if (alpha == EINA_FALSE) alpha = evas_filter_always_alpha(info);
-   
-   surface = e->engine.func->image_map_surface_new(e->engine.data.output, w, h,
-                                                   alpha);
-   
-   if (info->mode == EVAS_FILTER_MODE_BELOW)
-     {
-        void *subsurface;
-        int disw, dish;
-        int dx, dy;
-        disw = obj->cur.geometry.w;
-        dish = obj->cur.geometry.h;
-        dx = (imagew - w) >> 1;
-        dy = (imageh - h) >> 1;
-        subsurface = e->engine.func->image_map_surface_new
-           (e->engine.data.output, imagew, imageh, 1);
-        ctx = e->engine.func->context_new(e->engine.data.output);
-        e->engine.func->context_color_set(e->engine.data.output, ctx, 0, 255, 0, 255);
-        e->engine.func->context_render_op_set(e->engine.data.output, ctx, EVAS_RENDER_COPY);
-        e->engine.func->rectangle_draw(e->engine.data.output, ctx,
-                                       subsurface, 0, 0, imagew, imageh);
-        
-        image_filter_draw_under(e, obj, e->engine.data.output, ctx,
-                                subsurface, dx, dy);
-        
-        e->engine.func->context_free(e->engine.data.output, ctx);
-        
-        ctx = e->engine.func->context_new(e->engine.data.output);
-        
-        e->engine.func->image_draw_filtered(e->engine.data.output,
-                                            ctx, surface, subsurface, info);
-        
-        e->engine.func->context_free(e->engine.data.output, ctx);
-        
-        e->engine.func->image_map_surface_free(e->engine.data.output,
-                                               subsurface);
-     }
-   else
-     {
-        ctx = e->engine.func->context_new(e->engine.data.output);
-        e->engine.func->image_draw_filtered(e->engine.data.output,
-                                            ctx, surface, src, info);
-        e->engine.func->context_free(e->engine.data.output, ctx);
-     }
-   
-   e->engine.func->image_dirty_region(e->engine.data.output, surface, 
-                                      0, 0, w, h);
-   if (outw) *outw = w;
-   if (outh) *outh = h;
-   return e->engine.func->image_filtered_save(src, surface,
-                                              obj->filter->key,
-                                              obj->filter->len);
-}
-#endif
-
-static void
-evas_object_image_unload(Evas_Object *obj, Eina_Bool dirty)
-{
-   Evas_Object_Image *o;
-   
-   o = (Evas_Object_Image *)(obj->object_data);
-   
-   if ((!o->cur.file) ||
-       (o->pixels_checked_out > 0)) return;
-   if (dirty)
-     {
-        if (o->engine_data)
-           o->engine_data = obj->layer->evas->engine.func->image_dirty_region
-           (obj->layer->evas->engine.data.output,
-               o->engine_data,
-               0, 0,
-               o->cur.image.w, o->cur.image.h);
-     }
-   if (o->engine_data)
-     {
-        if (o->preloading)
-          {
-             o->preloading = 0;
-             obj->layer->evas->engine.func->image_data_preload_cancel(obj->layer->evas->engine.data.output,
-                                                                      o->engine_data,
-                                                                      obj);
-          }
-        obj->layer->evas->engine.func->image_free(obj->layer->evas->engine.data.output,
-                                                  o->engine_data);
-     }
-   o->engine_data = NULL;
-   o->load_error = EVAS_LOAD_ERROR_NONE;
-   o->cur.has_alpha = 1;
-   o->cur.cspace = EVAS_COLORSPACE_ARGB8888;
-   o->cur.image.w = 0;
-   o->cur.image.h = 0;
-   o->cur.image.stride = 0;
-}
-
-static void
-evas_object_image_load(Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-   Evas_Image_Load_Opts lo;
-
-   o = (Evas_Object_Image *)(obj->object_data);
-   if (o->engine_data) return;
-
-   lo.scale_down_by = o->load_opts.scale_down_by;
-   lo.dpi = o->load_opts.dpi;
-   lo.w = o->load_opts.w;
-   lo.h = o->load_opts.h;
-   lo.region.x = o->load_opts.region.x;
-   lo.region.y = o->load_opts.region.y;
-   lo.region.w = o->load_opts.region.w;
-   lo.region.h = o->load_opts.region.h;
-   lo.orientation = o->load_opts.orientation;
-   o->engine_data = obj->layer->evas->engine.func->image_load
-      (obj->layer->evas->engine.data.output,
-          o->cur.file,
-          o->cur.key,
-          &o->load_error,
-          &lo);
-   if (o->engine_data)
-     {
-        int w, h;
-        int stride = 0;
-
-        obj->layer->evas->engine.func->image_size_get
-           (obj->layer->evas->engine.data.output,
-               o->engine_data, &w, &h);
-        if (obj->layer->evas->engine.func->image_stride_get)
-          obj->layer->evas->engine.func->image_stride_get
-           (obj->layer->evas->engine.data.output,
-               o->engine_data, &stride);
-        else
-          stride = w * 4;
-        o->cur.has_alpha = obj->layer->evas->engine.func->image_alpha_get
-           (obj->layer->evas->engine.data.output,
-               o->engine_data);
-        o->cur.cspace = obj->layer->evas->engine.func->image_colorspace_get
-           (obj->layer->evas->engine.data.output,
-               o->engine_data);
-        o->cur.image.w = w;
-        o->cur.image.h = h;
-        o->cur.image.stride = stride;
-     }
-   else
-     {
-        o->load_error = EVAS_LOAD_ERROR_GENERIC;
-     }
-}
-
-static Evas_Coord
-evas_object_image_figure_x_fill(Evas_Object *obj, Evas_Coord start, Evas_Coord size, Evas_Coord *size_ret)
-{
-   Evas_Coord w;
-
-   w = ((size * obj->layer->evas->output.w) /
-        (Evas_Coord)obj->layer->evas->viewport.w);
-   if (size <= 0) size = 1;
-   if (start > 0)
-     {
-        while (start - size > 0) start -= size;
-     }
-   else if (start < 0)
-     {
-        while (start < 0) start += size;
-     }
-   start = ((start * obj->layer->evas->output.w) /
-            (Evas_Coord)obj->layer->evas->viewport.w);
-   *size_ret = w;
-   return start;
-}
-
-static Evas_Coord
-evas_object_image_figure_y_fill(Evas_Object *obj, Evas_Coord start, Evas_Coord size, Evas_Coord *size_ret)
-{
-   Evas_Coord h;
-
-   h = ((size * obj->layer->evas->output.h) /
-        (Evas_Coord)obj->layer->evas->viewport.h);
-   if (size <= 0) size = 1;
-   if (start > 0)
-     {
-        while (start - size > 0) start -= size;
-     }
-   else if (start < 0)
-     {
-        while (start < 0) start += size;
-     }
-   start = ((start * obj->layer->evas->output.h) /
-            (Evas_Coord)obj->layer->evas->viewport.h);
-   *size_ret = h;
-   return start;
-}
-
-static void
-evas_object_image_init(Evas_Object *obj)
-{
-   /* alloc image ob, setup methods and default values */
-   obj->object_data = evas_object_image_new();
-   /* set up default settings for this kind of object */
-   obj->cur.color.r = 255;
-   obj->cur.color.g = 255;
-   obj->cur.color.b = 255;
-   obj->cur.color.a = 255;
-   obj->cur.geometry.x = 0;
-   obj->cur.geometry.y = 0;
-   obj->cur.geometry.w = 0;
-   obj->cur.geometry.h = 0;
-   obj->cur.layer = 0;
-   obj->cur.anti_alias = 0;
-   obj->cur.render_op = EVAS_RENDER_BLEND;
-   /* set up object-specific settings */
-   obj->prev = obj->cur;
-   /* set up methods (compulsory) */
-   obj->func = &object_func;
-   obj->type = o_type;
-}
-
-static void *
-evas_object_image_new(void)
-{
-   Evas_Object_Image *o;
-
-   /* alloc obj private data */
-   EVAS_MEMPOOL_INIT(_mp_obj, "evas_object_image", Evas_Object_Image, 256, NULL);
-   o = EVAS_MEMPOOL_ALLOC(_mp_obj, Evas_Object_Image);
-   if (!o) return NULL;
-   EVAS_MEMPOOL_PREP(_mp_obj, o, Evas_Object_Image);
-   o->magic = MAGIC_OBJ_IMAGE;
-   o->cur.fill.w = 0;
-   o->cur.fill.h = 0;
-   o->cur.smooth_scale = 1;
-   o->cur.border.fill = 1;
-   o->cur.border.scale = 1.0;
-   o->cur.cspace = EVAS_COLORSPACE_ARGB8888;
-   o->cur.spread = EVAS_TEXTURE_REPEAT;
-   o->cur.opaque_valid = 0;
-   o->cur.source = NULL;
-   o->prev = o->cur;
-   o->tmpf_fd = -1;
-   return o;
-}
-
-static void
-evas_object_image_free(Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-   Eina_Rectangle *r;
-
-   /* frees private object data. very simple here */
-   o = (Evas_Object_Image *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return;
-   MAGIC_CHECK_END();
-   /* free obj */
-   _cleanup_tmpf(obj);
-   if (o->cur.file) eina_stringshare_del(o->cur.file);
-   if (o->cur.key) eina_stringshare_del(o->cur.key);
-   if (o->cur.source) _proxy_unset(obj);
-   if (o->engine_data)
-     {
-        if (o->preloading)
-          {
-             o->preloading = 0;
-             obj->layer->evas->engine.func->image_data_preload_cancel(obj->layer->evas->engine.data.output,
-                                                                      o->engine_data,
-                                                                      obj);
-          }
-        obj->layer->evas->engine.func->image_free(obj->layer->evas->engine.data.output,
-                                                  o->engine_data);
-     }
-   if (o->video_surface)
-     {
-        o->video_surface = 0;
-        obj->layer->evas->video_objects = eina_list_remove(obj->layer->evas->video_objects, obj);
-     }
-   o->engine_data = NULL;
-   o->magic = 0;
-   EINA_LIST_FREE(o->pixel_updates, r)
-     eina_rectangle_free(r);
-   EVAS_MEMPOOL_FREE(_mp_obj, o);
-}
-
-static void
-evas_object_image_render(Evas_Object *obj, void *output, void *context, void *surface, int x, int y)
-{
-   Evas_Object_Image *o;
-   int imagew, imageh, uvw, uvh;
-   void *pixels;
-
-   /* render object to surface with context, and offset by x,y */
-   o = (Evas_Object_Image *)(obj->object_data);
-
-   if ((o->cur.fill.w < 1) || (o->cur.fill.h < 1))
-     return; /* no error message, already printed in pre_render */
-
-   /* Proxy sanity */
-   if (o->proxyrendering)
-     {
-        _proxy_error(obj, context, output, surface, x, y);
-        return;
-     }
-
-   /* We are displaying the overlay */
-   if (o->video_visible)
-     {
-        /* Create a transparent rectangle */
-        obj->layer->evas->engine.func->context_color_set(output,
-                                                         context,
-                                                         0, 0, 0, 0);
-        obj->layer->evas->engine.func->context_multiplier_unset(output,
-                                                                context);
-        obj->layer->evas->engine.func->context_render_op_set(output, context,
-                                                             EVAS_RENDER_COPY);
-        obj->layer->evas->engine.func->rectangle_draw(output,
-                                                      context,
-                                                      surface,
-                                                      obj->cur.geometry.x + x,
-                                                      obj->cur.geometry.y + y,
-                                                      obj->cur.geometry.w,
-                                                      obj->cur.geometry.h);
-
-        return ;
-     }
-
-   obj->layer->evas->engine.func->context_color_set(output,
-                                                    context,
-                                                    255, 255, 255, 255);
-
-   if ((obj->cur.cache.clip.r == 255) &&
-       (obj->cur.cache.clip.g == 255) &&
-       (obj->cur.cache.clip.b == 255) &&
-       (obj->cur.cache.clip.a == 255))
-     {
-        obj->layer->evas->engine.func->context_multiplier_unset(output,
-                                                                context);
-     }
-   else
-     obj->layer->evas->engine.func->context_multiplier_set(output,
-                                                           context,
-                                                           obj->cur.cache.clip.r,
-                                                           obj->cur.cache.clip.g,
-                                                           obj->cur.cache.clip.b,
-                                                           obj->cur.cache.clip.a);
-
-   obj->layer->evas->engine.func->context_render_op_set(output, context,
-                                                        obj->cur.render_op);
-
-   if (!o->cur.source)
-     {
-        pixels = o->engine_data;
-        imagew = o->cur.image.w;
-        imageh = o->cur.image.h;
-        uvw = imagew;
-        uvh = imageh;
-     }
-   else if (o->cur.source->proxy.surface && !o->cur.source->proxy.redraw)
-     {
-        pixels = o->cur.source->proxy.surface;
-        imagew = o->cur.source->proxy.w;
-        imageh = o->cur.source->proxy.h;
-        uvw = imagew;
-        uvh = imageh;
-     }
-   else if (o->cur.source->type == o_type &&
-            ((Evas_Object_Image *)o->cur.source->object_data)->engine_data)
-     {
-        Evas_Object_Image *oi;
-        oi = o->cur.source->object_data;
-        pixels = oi->engine_data;
-        imagew = oi->cur.image.w;
-        imageh = oi->cur.image.h;
-        uvw = o->cur.source->cur.geometry.w;
-        uvh = o->cur.source->cur.geometry.h;
-     }
-   else
-     {
-        o->proxyrendering = 1;
-        _proxy_subrender(obj->layer->evas, o->cur.source);
-        pixels = o->cur.source->proxy.surface;
-        imagew = o->cur.source->proxy.w;
-        imageh = o->cur.source->proxy.h;
-        uvw = imagew;
-        uvh = imageh;
-        o->proxyrendering = 0;
-     }
-
-#if 0 // filtering disabled
-   /* Now check/update filter */
-   if (obj->filter && obj->filter->filter)
-     {
-        Filtered_Image *fi = NULL;
-        //printf("%p has filter: %s\n", obj,obj->filter->dirty?"dirty":"clean");
-        if (obj->filter->dirty)
-          {
-             if (obj->filter->mode != EVAS_FILTER_MODE_BELOW)
-               {
-                  uint32_t len;
-                  uint8_t *key;
-                  
-                  if (obj->filter->key) free(obj->filter->key);
-                  obj->filter->key = NULL;
-                  obj->filter->len = 0;
-                  key = evas_filter_key_get(obj->filter, &len);
-                  if (key)
-                    {
-                       obj->filter->key = key;
-                       obj->filter->len = len;
-                       fi = obj->layer->evas->engine.func->image_filtered_get
-                          (o->engine_data, key, len);
-                       if (obj->filter->cached && fi != obj->filter->cached)
-                         {
-                            obj->layer->evas->engine.func->image_filtered_free
-                               (o->engine_data, obj->filter->cached);
-                            obj->filter->cached = NULL;
-                         }
-                    }
-               }
-             else if (obj->filter->cached)
-               {
-                  obj->layer->evas->engine.func->image_filtered_free
-                     (o->engine_data, obj->filter->cached);
-               }
-             if (!fi)
-                fi = image_filter_update(obj->layer->evas, obj, pixels, 
-                                         imagew, imageh, &imagew, &imageh);
-             pixels = fi->image;
-             obj->filter->dirty = 0;
-             obj->filter->cached = fi;
-          }
-        else
-          {
-             fi = obj->filter->cached;
-             pixels = fi->image;
-          }
-     }
-#endif
-   
-   if (pixels)
-     {
-        Evas_Coord idw, idh, idx, idy;
-        int ix, iy, iw, ih;
-        int img_set = 0;
-
-        if (o->dirty_pixels)
-          {
-             if (o->func.get_pixels)
-               {
-                  // Set img object for direct rendering optimization
-                  // Check for image w/h against image geometry w/h
-                  // Check for image color r,g,b,a = {255,255,255,255}
-                  // Check and make sure that there are no maps.
-                  if ( (obj->cur.geometry.w == o->cur.image.w) &&
-                       (obj->cur.geometry.h == o->cur.image.h) &&
-                       (obj->cur.color.r == 255) &&
-                       (obj->cur.color.g == 255) &&
-                       (obj->cur.color.b == 255) &&
-                       (obj->cur.color.a == 255) && 
-                       (!obj->cur.map) )
-                    {
-                       if (obj->layer->evas->engine.func->gl_img_obj_set)
-                         {
-                            obj->layer->evas->engine.func->gl_img_obj_set(output, obj, o->cur.has_alpha);
-                            img_set = 1;
-                         }
-                    }
-
-                  o->func.get_pixels(o->func.get_pixels_data, obj);
-                  if (o->engine_data != pixels)
-                    pixels = o->engine_data;
-                  o->engine_data = obj->layer->evas->engine.func->image_dirty_region
-                     (obj->layer->evas->engine.data.output, o->engine_data,
-                         0, 0, o->cur.image.w, o->cur.image.h);
-               }
-             o->dirty_pixels = 0;
-          }
-        if ((obj->cur.map) && (obj->cur.map->count > 3) && (obj->cur.usemap))
-          {
-             const Evas_Map_Point *p, *p_end;
-             RGBA_Map_Point pts[obj->cur.map->count], *pt;
-
-             p = obj->cur.map->points;
-             p_end = p + obj->cur.map->count;
-             pt = pts;
-             
-             pts[0].px = obj->cur.map->persp.px << FP;
-             pts[0].py = obj->cur.map->persp.py << FP;
-             pts[0].foc = obj->cur.map->persp.foc << FP;
-             pts[0].z0 = obj->cur.map->persp.z0 << FP;
-             // draw geom +x +y
-             for (; p < p_end; p++, pt++)
-               {
-                  pt->x = (lround(p->x) + x) * FP1;
-                  pt->y = (lround(p->y) + y) * FP1;
-                  pt->z = (lround(p->z)    ) * FP1;
-                  pt->fx = p->px;
-                  pt->fy = p->py;
-                  pt->fz = p->z;
-                  pt->u = ((lround(p->u) * imagew) / uvw) * FP1;
-                  pt->v = ((lround(p->v) * imageh) / uvh) * FP1;
-                  if      (pt->u < 0) pt->u = 0;
-                  else if (pt->u > (imagew * FP1)) pt->u = (imagew * FP1);
-                  if      (pt->v < 0) pt->v = 0;
-                  else if (pt->v > (imageh * FP1)) pt->v = (imageh * FP1);
-                  pt->col = ARGB_JOIN(p->a, p->r, p->g, p->b);
-              }
-             if (obj->cur.map->count & 0x1)
-               {
-                  pts[obj->cur.map->count] = pts[obj->cur.map->count -1];
-               }
-
-             obj->layer->evas->engine.func->image_map_draw
-               (output, context, surface, pixels, obj->cur.map->count,
-                pts, o->cur.smooth_scale | obj->cur.map->smooth, 0);
-          }
-        else
-          {
-             obj->layer->evas->engine.func->image_scale_hint_set(output,
-                                                                 pixels,
-                                                                 o->scale_hint);
-             /* This is technically a bug here: If the value is recreated
-              * (which is returned)it may be a new object, however exactly 0
-              * of all the evas engines do this. */
-             obj->layer->evas->engine.func->image_border_set(output, pixels,
-                                                             o->cur.border.l, o->cur.border.r,
-                                                             o->cur.border.t, o->cur.border.b);
-             idx = evas_object_image_figure_x_fill(obj, o->cur.fill.x, o->cur.fill.w, &idw);
-             idy = evas_object_image_figure_y_fill(obj, o->cur.fill.y, o->cur.fill.h, &idh);
-             if (idw < 1) idw = 1;
-             if (idh < 1) idh = 1;
-             if (idx > 0) idx -= idw;
-             if (idy > 0) idy -= idh;
-             while ((int)idx < obj->cur.geometry.w)
-               {
-                  Evas_Coord ydy;
-                  int dobreak_w = 0;
-                  
-                  ydy = idy;
-                  ix = idx;
-                  if ((o->cur.fill.w == obj->cur.geometry.w) &&
-                      (o->cur.fill.x == 0))
-                    {
-                       dobreak_w = 1;
-                       iw = obj->cur.geometry.w;
-                    }
-                  else
-                    iw = ((int)(idx + idw)) - ix;
-                  while ((int)idy < obj->cur.geometry.h)
-                    {
-                       int dobreak_h = 0;
-                       
-                       iy = idy;
-                       if ((o->cur.fill.h == obj->cur.geometry.h) &&
-                           (o->cur.fill.y == 0))
-                         {
-                            ih = obj->cur.geometry.h;
-                            dobreak_h = 1;
-                         }
-                       else
-                         ih = ((int)(idy + idh)) - iy;
-                       if ((o->cur.border.l == 0) &&
-                           (o->cur.border.r == 0) &&
-                           (o->cur.border.t == 0) &&
-                           (o->cur.border.b == 0) &&
-                           (o->cur.border.fill != 0))
-                         obj->layer->evas->engine.func->image_draw(output,
-                                                                   context,
-                                                                   surface,
-                                                                   pixels,
-                                                                   0, 0,
-                                                                   imagew,
-                                                                   imageh,
-                                                                   obj->cur.geometry.x + ix + x,
-                                                                   obj->cur.geometry.y + iy + y,
-                                                                   iw, ih,
-                                                                   o->cur.smooth_scale);
-                       else
-                         {
-                            int inx, iny, inw, inh, outx, outy, outw, outh;
-                            int bl, br, bt, bb, bsl, bsr, bst, bsb;
-                            int imw, imh, ox, oy;
-                            
-                            ox = obj->cur.geometry.x + ix + x;
-                            oy = obj->cur.geometry.y + iy + y;
-                            imw = imagew;
-                            imh = imageh;
-                            bl = o->cur.border.l;
-                            br = o->cur.border.r;
-                            bt = o->cur.border.t;
-                            bb = o->cur.border.b;
-                            if ((bl + br) > iw)
-                              {
-                                 bl = iw / 2;
-                                 br = iw - bl;
-                              }
-                            if ((bl + br) > imw)
-                              {
-                                 bl = imw / 2;
-                                 br = imw - bl;
-                              }
-                            if ((bt + bb) > ih)
-                              {
-                                 bt = ih / 2;
-                                 bb = ih - bt;
-                              }
-                            if ((bt + bb) > imh)
-                              {
-                                 bt = imh / 2;
-                                 bb = imh - bt;
-                              }
-                            if (o->cur.border.scale != 1.0)
-                              {
-                                 bsl = ((double)bl * o->cur.border.scale);
-                                 bsr = ((double)br * o->cur.border.scale);
-                                 bst = ((double)bt * o->cur.border.scale);
-                                 bsb = ((double)bb * o->cur.border.scale);
-                              }
-                            else
-                              {
-                                  bsl = bl; bsr = br; bst = bt; bsb = bb;
-                              }
-                            // #--
-                            // |
-                            inx = 0; iny = 0;
-                            inw = bl; inh = bt;
-                            outx = ox; outy = oy;
-                            outw = bsl; outh = bst;
-                            obj->layer->evas->engine.func->image_draw(output, context, surface, pixels, inx, iny, inw, inh, outx, outy, outw, outh, o->cur.smooth_scale);
-                            // .##
-                            // |
-                            inx = bl; iny = 0;
-                            inw = imw - bl - br; inh = bt;
-                            outx = ox + bsl; outy = oy;
-                            outw = iw - bsl - bsr; outh = bst;
-                            obj->layer->evas->engine.func->image_draw(output, context, surface, pixels, inx, iny, inw, inh, outx, outy, outw, outh, o->cur.smooth_scale);
-                            // --#
-                            //   |
-                            inx = imw - br; iny = 0;
-                            inw = br; inh = bt;
-                            outx = ox + iw - bsr; outy = oy;
-                            outw = bsr; outh = bst;
-                            obj->layer->evas->engine.func->image_draw(output, context, surface, pixels, inx, iny, inw, inh, outx, outy, outw, outh, o->cur.smooth_scale);
-                            // .--
-                            // #  
-                            inx = 0; iny = bt;
-                            inw = bl; inh = imh - bt - bb;
-                            outx = ox; outy = oy + bst;
-                            outw = bsl; outh = ih - bst - bsb;
-                            obj->layer->evas->engine.func->image_draw(output, context, surface, pixels, inx, iny, inw, inh, outx, outy, outw, outh, o->cur.smooth_scale);
-                            // .--.
-                            // |##|
-                            if (o->cur.border.fill > EVAS_BORDER_FILL_NONE)
-                              {
-                                 inx = bl; iny = bt;
-                                 inw = imw - bl - br; inh = imh - bt - bb;
-                                 outx = ox + bsl; outy = oy + bst;
-                                 outw = iw - bsl - bsr; outh = ih - bst - bsb;
-                                 if ((o->cur.border.fill == EVAS_BORDER_FILL_SOLID) &&
-                                     (obj->cur.cache.clip.a == 255) &&
-                                     (obj->cur.render_op == EVAS_RENDER_BLEND))
-                                   {
-                                      obj->layer->evas->engine.func->context_render_op_set(output, context,
-                                                                                           EVAS_RENDER_COPY);
-                                      obj->layer->evas->engine.func->image_draw(output, context, surface, pixels, inx, iny, inw, inh, outx, outy, outw, outh, o->cur.smooth_scale);
-                                      obj->layer->evas->engine.func->context_render_op_set(output, context,
-                                                                                           obj->cur.render_op);
-                                   }
-                                 else
-                                   obj->layer->evas->engine.func->image_draw(output, context, surface, pixels, inx, iny, inw, inh, outx, outy, outw, outh, o->cur.smooth_scale);
-                              }
-                            // --.
-                            //   #
-                            inx = imw - br; iny = bt;
-                            inw = br; inh = imh - bt - bb;
-                            outx = ox + iw - bsr; outy = oy + bst;
-                            outw = bsr; outh = ih - bst - bsb;
-                            obj->layer->evas->engine.func->image_draw(output, context, surface, pixels, inx, iny, inw, inh, outx, outy, outw, outh, o->cur.smooth_scale);
-                            // |
-                            // #--
-                            inx = 0; iny = imh - bb;
-                            inw = bl; inh = bb;
-                            outx = ox; outy = oy + ih - bsb;
-                            outw = bsl; outh = bsb;
-                            obj->layer->evas->engine.func->image_draw(output, context, surface, pixels, inx, iny, inw, inh, outx, outy, outw, outh, o->cur.smooth_scale);
-                            // |
-                            // .## 
-                            inx = bl; iny = imh - bb;
-                            inw = imw - bl - br; inh = bb;
-                            outx = ox + bsl; outy = oy + ih - bsb;
-                            outw = iw - bsl - bsr; outh = bsb;
-                            obj->layer->evas->engine.func->image_draw(output, context, surface, pixels, inx, iny, inw, inh, outx, outy, outw, outh, o->cur.smooth_scale);
-                            //   |
-                            // --#
-                            inx = imw - br; iny = imh - bb;
-                            inw = br; inh = bb;
-                            outx = ox + iw - bsr; outy = oy + ih - bsb;
-                            outw = bsr; outh = bsb;
-                            obj->layer->evas->engine.func->image_draw(output, context, surface, pixels, inx, iny, inw, inh, outx, outy, outw, outh, o->cur.smooth_scale);
-                         }
-                       idy += idh;
-                       if (dobreak_h) break;
-                    }
-                  idx += idw;
-                  idy = ydy;
-                  if (dobreak_w) break;
-               }
-          }
-
-        // Unset img object 
-        if (img_set)
-          {
-             if (obj->layer->evas->engine.func->gl_img_obj_set)
-               {
-                  obj->layer->evas->engine.func->gl_img_obj_set(output, NULL, 0);
-                  img_set = 0;
-               }
-          }        
-     }
-}
-
-static void
-evas_object_image_render_pre(Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-   int is_v = 0, was_v = 0;
-   Evas *e;
-
-   /* dont pre-render the obj twice! */
-   if (obj->pre_render_done) return;
-   obj->pre_render_done = 1;
-   /* pre-render phase. this does anything an object needs to do just before */
-   /* rendering. this could mean loading the image data, retrieving it from */
-   /* elsewhere, decoding video etc. */
-   /* then when this is done the object needs to figure if it changed and */
-   /* if so what and where and add the appropriate redraw rectangles */
-   o = (Evas_Object_Image *)(obj->object_data);
-   e = obj->layer->evas;
-
-   if ((o->cur.fill.w < 1) || (o->cur.fill.h < 1))
-     {
-        ERR("%p has invalid fill size: %dx%d. Ignored",
-            obj, o->cur.fill.w, o->cur.fill.h);
-        return;
-     }
-
-   /* if someone is clipping this obj - go calculate the clipper */
-   if (obj->cur.clipper)
-     {
-        if (obj->cur.cache.clip.dirty)
-          evas_object_clip_recalc(obj->cur.clipper);
-        obj->cur.clipper->func->render_pre(obj->cur.clipper);
-     }
-   /* Proxy: Do it early */
-   if (o->cur.source && 
-       (o->cur.source->proxy.redraw || o->cur.source->changed))
-     {
-        /* XXX: Do I need to sort out the map here? */
-        evas_object_render_pre_prev_cur_add(&e->clip_changes, obj);
-        goto done;
-     }
-
-   /* now figure what changed and add draw rects */
-   /* if it just became visible or invisible */
-   is_v = evas_object_is_visible(obj);
-   was_v = evas_object_was_visible(obj);
-   if (is_v != was_v)
-     {
-        evas_object_render_pre_visible_change(&e->clip_changes, obj, is_v, was_v);
-        if (!o->pixel_updates) goto done;
-     }
-   if ((obj->cur.map != obj->prev.map) ||
-       (obj->cur.usemap != obj->prev.usemap))
-     {
-        evas_object_render_pre_prev_cur_add(&e->clip_changes, obj);
-        goto done;
-     }
-   /* it's not visible - we accounted for it appearing or not so just abort */
-   if (!is_v) goto done;
-   /* clipper changed this is in addition to anything else for obj */
-   evas_object_render_pre_clipper_change(&e->clip_changes, obj);
-   /* if we restacked (layer or just within a layer) and don't clip anyone */
-   if (obj->restack)
-     {
-        evas_object_render_pre_prev_cur_add(&e->clip_changes, obj);
-        if (!o->pixel_updates) goto done;
-     }
-   /* if it changed color */
-   if ((obj->cur.color.r != obj->prev.color.r) ||
-       (obj->cur.color.g != obj->prev.color.g) ||
-       (obj->cur.color.b != obj->prev.color.b) ||
-       (obj->cur.color.a != obj->prev.color.a))
-     {
-        evas_object_render_pre_prev_cur_add(&e->clip_changes, obj);
-        if (!o->pixel_updates) goto done;
-     }
-   /* if it changed render op */
-   if (obj->cur.render_op != obj->prev.render_op)
-     {
-        evas_object_render_pre_prev_cur_add(&e->clip_changes, obj);
-        if (!o->pixel_updates) goto done;
-     }
-   /* if it changed anti_alias */
-   if (obj->cur.anti_alias != obj->prev.anti_alias)
-     {
-        evas_object_render_pre_prev_cur_add(&e->clip_changes, obj);
-        if (!o->pixel_updates) goto done;
-     }
-   if (o->changed)
-     {
-        if (((o->cur.file) && (!o->prev.file)) ||
-            ((!o->cur.file) && (o->prev.file)) ||
-            ((o->cur.key) && (!o->prev.key)) ||
-            ((!o->cur.key) && (o->prev.key))
-            )
-          {
-             evas_object_render_pre_prev_cur_add(&e->clip_changes, obj);
-             if (!o->pixel_updates) goto done;
-          }
-        if ((o->cur.image.w != o->prev.image.w) ||
-            (o->cur.image.h != o->prev.image.h) ||
-            (o->cur.has_alpha != o->prev.has_alpha) ||
-            (o->cur.cspace != o->prev.cspace) ||
-            (o->cur.smooth_scale != o->prev.smooth_scale))
-          {
-             evas_object_render_pre_prev_cur_add(&e->clip_changes, obj);
-             if (!o->pixel_updates) goto done;
-          }
-        if ((o->cur.border.l != o->prev.border.l) ||
-            (o->cur.border.r != o->prev.border.r) ||
-            (o->cur.border.t != o->prev.border.t) ||
-            (o->cur.border.b != o->prev.border.b) ||
-            (o->cur.border.fill != o->prev.border.fill) ||
-            (o->cur.border.scale != o->prev.border.scale))
-          {
-             evas_object_render_pre_prev_cur_add(&e->clip_changes, obj);
-             if (!o->pixel_updates) goto done;
-          }
-        if (o->dirty_pixels)
-          {
-             evas_object_render_pre_prev_cur_add(&e->clip_changes, obj);
-             if (!o->pixel_updates) goto done;
-          }
-        if (o->cur.frame != o->prev.frame)
-          {
-             evas_object_render_pre_prev_cur_add(&e->clip_changes, obj);
-             if (!o->pixel_updates) goto done;
-          }
-        
-     }
-   /* if it changed geometry - and obviously not visibility or color */
-   /* calculate differences since we have a constant color fill */
-   /* we really only need to update the differences */
-#if 0 // XXX: maybe buggy?
-   if (((obj->cur.geometry.x != obj->prev.geometry.x) ||
-        (obj->cur.geometry.y != obj->prev.geometry.y) ||
-        (obj->cur.geometry.w != obj->prev.geometry.w) ||
-        (obj->cur.geometry.h != obj->prev.geometry.h)) &&
-       (o->cur.fill.w == o->prev.fill.w) &&
-       (o->cur.fill.h == o->prev.fill.h) &&
-       ((o->cur.fill.x + obj->cur.geometry.x) == (o->prev.fill.x + obj->prev.geometry.x)) &&
-       ((o->cur.fill.y + obj->cur.geometry.y) == (o->prev.fill.y + obj->prev.geometry.y)) &&
-       (!o->pixel_updates)
-       )
-     {
-        evas_rects_return_difference_rects(&e->clip_changes,
-                                           obj->cur.geometry.x,
-                                           obj->cur.geometry.y,
-                                           obj->cur.geometry.w,
-                                           obj->cur.geometry.h,
-                                           obj->prev.geometry.x,
-                                           obj->prev.geometry.y,
-                                           obj->prev.geometry.w,
-                                           obj->prev.geometry.h);
-        if (!o->pixel_updates) goto done;
-     }
-#endif   
-   if (((obj->cur.geometry.x != obj->prev.geometry.x) ||
-        (obj->cur.geometry.y != obj->prev.geometry.y) ||
-        (obj->cur.geometry.w != obj->prev.geometry.w) ||
-        (obj->cur.geometry.h != obj->prev.geometry.h))
-       )
-     {
-        evas_object_render_pre_prev_cur_add(&e->clip_changes, obj);
-        if (!o->pixel_updates) goto done;
-     }
-   if (o->changed)
-     {
-        if ((o->cur.fill.x != o->prev.fill.x) ||
-            (o->cur.fill.y != o->prev.fill.y) ||
-            (o->cur.fill.w != o->prev.fill.w) ||
-            (o->cur.fill.h != o->prev.fill.h))
-          {
-             evas_object_render_pre_prev_cur_add(&e->clip_changes, obj);
-             if (!o->pixel_updates) goto done;
-          }
-        if (o->pixel_updates)
-          {
-             if ((o->cur.border.l == 0) &&
-                 (o->cur.border.r == 0) &&
-                 (o->cur.border.t == 0) &&
-                 (o->cur.border.b == 0) &&
-                 (o->cur.image.w > 0) &&
-                 (o->cur.image.h > 0) &&
-                (!((obj->cur.map) && (obj->cur.usemap))))
-               {
-                  Eina_Rectangle *rr;
-                  
-                  EINA_LIST_FREE(o->pixel_updates, rr)
-                    {
-                       Evas_Coord idw, idh, idx, idy;
-                       int x, y, w, h;
-                       
-                       e->engine.func->image_dirty_region(e->engine.data.output, o->engine_data, rr->x, rr->y, rr->w, rr->h);
-                       
-                       idx = evas_object_image_figure_x_fill(obj, o->cur.fill.x, o->cur.fill.w, &idw);
-                       idy = evas_object_image_figure_y_fill(obj, o->cur.fill.y, o->cur.fill.h, &idh);
-                       
-                       if (idw < 1) idw = 1;
-                       if (idh < 1) idh = 1;
-                       if (idx > 0) idx -= idw;
-                       if (idy > 0) idy -= idh;
-                       while (idx < obj->cur.geometry.w)
-                         {
-                            Evas_Coord ydy;
-                            
-                            ydy = idy;
-                            x = idx;
-                            w = ((int)(idx + idw)) - x;
-                            while (idy < obj->cur.geometry.h)
-                              {
-                                 Eina_Rectangle r;
-                                 
-                                 y = idy;
-                                 h = ((int)(idy + idh)) - y;
-                                 
-                                 r.x = (rr->x * w) / o->cur.image.w;
-                                 r.y = (rr->y * h) / o->cur.image.h;
-                                 r.w = ((rr->w * w) + (o->cur.image.w * 2) - 1) / o->cur.image.w;
-                                 r.h = ((rr->h * h) + (o->cur.image.h * 2) - 1) / o->cur.image.h;
-                                 r.x += obj->cur.geometry.x + x;
-                                 r.y += obj->cur.geometry.y + y;
-                                 RECTS_CLIP_TO_RECT(r.x, r.y, r.w, r.h,
-                                                    obj->cur.cache.clip.x, obj->cur.cache.clip.y,
-                                                    obj->cur.cache.clip.w, obj->cur.cache.clip.h);
-                                 evas_add_rect(&e->clip_changes, r.x, r.y, r.w, r.h);
-                                 idy += h;
-                              }
-                            idx += idw;
-                            idy = ydy;
-                         }
-                       eina_rectangle_free(rr);
-                    }
-                  goto done;
-               }
-             else
-               {
-                  Eina_Rectangle *r;
-                  
-                  EINA_LIST_FREE(o->pixel_updates, r)
-                     eina_rectangle_free(r);
-                  e->engine.func->image_dirty_region(e->engine.data.output, o->engine_data, 0, 0, o->cur.image.w, o->cur.image.h);
-                  evas_object_render_pre_prev_cur_add(&e->clip_changes, obj);
-                  goto done;
-               }
-          }
-     }
-#if 0 // filtering disabled
-   if (obj->filter && obj->filter->dirty)
-     {
-        evas_object_render_pre_prev_cur_add(&e->clip_changes, obj);
-     }
-#endif   
-   /* it obviously didn't change - add a NO obscure - this "unupdates"  this */
-   /* area so if there were updates for it they get wiped. don't do it if we */
-   /* aren't fully opaque and we are visible */
-   if (evas_object_is_visible(obj) &&
-       evas_object_is_opaque(obj))
-     {
-        Evas_Coord x, y, w, h;
-        
-        x = obj->cur.cache.clip.x;
-        y = obj->cur.cache.clip.y;
-        w = obj->cur.cache.clip.w;
-        h = obj->cur.cache.clip.h;
-        if (obj->cur.clipper)
-          {
-             RECTS_CLIP_TO_RECT(x, y, w, h,
-                                obj->cur.clipper->cur.cache.clip.x,
-                                obj->cur.clipper->cur.cache.clip.y,
-                                obj->cur.clipper->cur.cache.clip.w,
-                                obj->cur.clipper->cur.cache.clip.h);
-          }
-        e->engine.func->output_redraws_rect_del(e->engine.data.output,
-                                                x, y, w, h);
-     }
-   done:
-   evas_object_render_pre_effect_updates(&e->clip_changes, obj, is_v, was_v);
-}
-
-static void
-evas_object_image_render_post(Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-   Eina_Rectangle *r;
-
-   /* this moves the current data to the previous state parts of the object */
-   /* in whatever way is safest for the object. also if we don't need object */
-   /* data anymore we can free it if the object deems this is a good idea */
-   o = (Evas_Object_Image *)(obj->object_data);
-   /* remove those pesky changes */
-   evas_object_clip_changes_clean(obj);
-   EINA_LIST_FREE(o->pixel_updates, r)
-     eina_rectangle_free(r);
-   /* move cur to prev safely for object data */
-   obj->prev = obj->cur;
-   o->prev = o->cur;
-   o->changed = 0;
-   /* FIXME: copy strings across */
-}
-
-static unsigned int evas_object_image_id_get(Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   o = (Evas_Object_Image *)(obj->object_data);
-   if (!o) return 0;
-   return MAGIC_OBJ_IMAGE;
-}
-
-static unsigned int evas_object_image_visual_id_get(Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   o = (Evas_Object_Image *)(obj->object_data);
-   if (!o) return 0;
-   return MAGIC_OBJ_IMAGE;
-}
-
-static void *evas_object_image_engine_data_get(Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   o = (Evas_Object_Image *)(obj->object_data);
-   if (!o) return NULL;
-   return o->engine_data;
-}
-
-static int
-evas_object_image_is_opaque(Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   /* this returns 1 if the internal object data implies that the object is */
-   /* currently fully opaque over the entire rectangle it occupies */
-   o = (Evas_Object_Image *)(obj->object_data);
-/*  disable caching due tyo maps screwing with this
-   o->cur.opaque_valid = 0;
-   if (o->cur.opaque_valid)
-     {
-        if (!o->cur.opaque) return 0;
-     }
-   else
-*/
-     {
-        o->cur.opaque = 0;
-/* disable caching */
-/*        o->cur.opaque_valid = 1; */
-        if ((o->cur.fill.w < 1) || (o->cur.fill.h < 1))
-           return o->cur.opaque;
-        if (((o->cur.border.l != 0) ||
-             (o->cur.border.r != 0) ||
-             (o->cur.border.t != 0) ||
-             (o->cur.border.b != 0)) &&
-            (!o->cur.border.fill)) return o->cur.opaque;
-        if (!o->engine_data) return o->cur.opaque;
-        o->cur.opaque = 1;
-     }
-   // FIXME: use proxy
-   if (o->cur.source)
-     {
-        o->cur.opaque = evas_object_is_opaque(o->cur.source);
-        return o->cur.opaque; /* FIXME: Should go poke at the object */
-     }
-   if (o->cur.has_alpha)
-     {
-        o->cur.opaque = 0;
-        return o->cur.opaque;
-     }
-   if ((obj->cur.map) && (obj->cur.usemap))
-     {
-        Evas_Map *m = obj->cur.map;
-        
-        if ((m->points[0].a == 255) &&
-            (m->points[1].a == 255) &&
-            (m->points[2].a == 255) &&
-            (m->points[3].a == 255))
-          {
-             if (
-                 ((m->points[0].x == m->points[3].x) &&
-                     (m->points[1].x == m->points[2].x) &&
-                     (m->points[0].y == m->points[1].y) &&
-                     (m->points[2].y == m->points[3].y))
-                 ||
-                 ((m->points[0].x == m->points[1].x) &&
-                     (m->points[2].x == m->points[3].x) &&
-                     (m->points[0].y == m->points[3].y) &&
-                     (m->points[1].y == m->points[2].y))
-                )
-               {
-                  if ((m->points[0].x == obj->cur.geometry.x) &&
-                      (m->points[0].y == obj->cur.geometry.y) &&
-                      (m->points[2].x == (obj->cur.geometry.x + obj->cur.geometry.w)) &&
-                      (m->points[2].y == (obj->cur.geometry.y + obj->cur.geometry.h)))
-                    return o->cur.opaque;
-               }
-          }
-        o->cur.opaque = 0;
-        return o->cur.opaque;
-     }
-   if (obj->cur.render_op == EVAS_RENDER_COPY) return o->cur.opaque;
-   return o->cur.opaque;
-}
-
-static int
-evas_object_image_was_opaque(Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   /* this returns 1 if the internal object data implies that the object was */
-   /* previously fully opaque over the entire rectangle it occupies */
-   o = (Evas_Object_Image *)(obj->object_data);
-   if (o->prev.opaque_valid)
-     {
-        if (!o->prev.opaque) return 0;
-     }
-   else
-     {
-        o->prev.opaque = 0;
-        o->prev.opaque_valid = 1;
-        if ((o->prev.fill.w < 1) || (o->prev.fill.h < 1))
-           return 0;
-        if (((o->prev.border.l != 0) ||
-             (o->prev.border.r != 0) ||
-             (o->prev.border.t != 0) ||
-             (o->prev.border.b != 0)) &&
-            (!o->prev.border.fill)) return 0;
-        if (!o->engine_data) return 0;
-        o->prev.opaque = 1;
-     }
-   // FIXME: use proxy
-   if (o->prev.source) return 0; /* FIXME: Should go poke at the object */
-   if (obj->prev.usemap) return 0;
-   if (obj->prev.render_op == EVAS_RENDER_COPY) return 1;
-   if (o->prev.has_alpha) return 0;
-   if (obj->prev.render_op != EVAS_RENDER_BLEND) return 0;
-   return 1;
-}
-
-static int
-evas_object_image_is_inside(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
-{
-   Evas_Object_Image *o;
-   DATA32 *data;
-   int w, h, stride, iw, ih;
-   int a;
-
-   o = (Evas_Object_Image *)(obj->object_data);
-
-   x -= obj->cur.cache.clip.x;
-   y -= obj->cur.cache.clip.y;
-   w = obj->cur.cache.clip.w;
-   h = obj->cur.cache.clip.h;
-   iw = o->cur.image.w;
-   ih = o->cur.image.h;
-
-   if ((x < 0) || (y < 0) || (x >= w) || (y >= h)) return 0;
-   if (!o->cur.has_alpha) return 1;
-
-   // FIXME: proxy needs to be honored
-   if (obj->cur.map)
-     {
-        x = obj->cur.map->mx;
-        y = obj->cur.map->my;
-     }
-   else
-     {
-        int bl, br, bt, bb, bsl, bsr, bst, bsb;
-        
-        bl = o->cur.border.l;
-        br = o->cur.border.r;
-        bt = o->cur.border.t;
-        bb = o->cur.border.b;
-        if ((bl + br) > iw)
-          {
-             bl = iw / 2;
-             br = iw - bl;
-          }
-        if ((bl + br) > iw)
-          {
-             bl = iw / 2;
-             br = iw - bl;
-          }
-        if ((bt + bb) > ih)
-          {
-             bt = ih / 2;
-             bb = ih - bt;
-          }
-        if ((bt + bb) > ih)
-          {
-             bt = ih / 2;
-             bb = ih - bt;
-          }
-        if (o->cur.border.scale != 1.0)
-          {
-             bsl = ((double)bl * o->cur.border.scale);
-             bsr = ((double)br * o->cur.border.scale);
-             bst = ((double)bt * o->cur.border.scale);
-             bsb = ((double)bb * o->cur.border.scale);
-          }
-        else
-          {
-             bsl = bl; bsr = br; bst = bt; bsb = bb;
-          }
-        
-        w = o->cur.fill.w;
-        h = o->cur.fill.h;
-        x -= o->cur.fill.x;
-        y -= o->cur.fill.y;
-        x %= w;
-        y %= h;
-        
-        if (x < 0) x += w;
-        if (y < 0) y += h;
-        
-        if (o->cur.border.fill != EVAS_BORDER_FILL_DEFAULT)
-          {
-             if ((x > bsl) && (x < (w - bsr)) &&
-                 (y > bst) && (y < (h - bsb)))
-               {
-                  if (o->cur.border.fill == EVAS_BORDER_FILL_SOLID) return 1;
-                  return 0;
-               }
-          }
-        
-        if (x < bsl) x = (x * bl) / bsl;
-        else if (x > (w - bsr)) x = iw - (((w - x) * br) / bsr);
-        else if ((bsl + bsr) < w) x = bl + (((x - bsl) * (iw - bl - br)) / (w - bsl - bsr));
-        else return 1;
-        
-        if (y < bst) y = (y * bt) / bst;
-        else if (y > (h - bsb)) y = ih - (((h - y) * bb) / bsb);
-        else if ((bst + bsb) < h) y = bt + (((y - bst) * (ih - bt - bb)) / (h - bst - bsb));
-        else return 1;
-     }
-   
-   if (x < 0) x = 0;
-   if (y < 0) y = 0;
-   if (x >= iw) x = iw - 1;
-   if (y >= ih) y = ih - 1;
-   
-   stride = o->cur.image.stride;
-   
-   o->engine_data = obj->layer->evas->engine.func->image_data_get
-      (obj->layer->evas->engine.data.output,
-          o->engine_data,
-          0,
-          &data,
-          &o->load_error);
-   if (!data)
-     return 0;
-
-   switch (o->cur.cspace)
-     {
-     case EVAS_COLORSPACE_ARGB8888:
-        data = ((DATA32*)(data) + ((y * (stride >> 2)) + x));
-        a = (*((DATA32*)(data)) >> 24) & 0xff;
-        break;
-     case EVAS_COLORSPACE_RGB565_A5P:
-        data = (void*) ((DATA16*)(data) + (h * (stride >> 1)));
-        data = (void*) ((DATA8*)(data) + ((y * (stride >> 1)) + x));
-        a = (*((DATA8*)(data))) & 0x1f;
-        break;
-     default:
-        return 1;
-        break;
-     }
-
-   return (a != 0);
-}
-
-static int
-evas_object_image_has_opaque_rect(Evas_Object *obj)
-{
-   Evas_Object_Image *o;
-
-   o = (Evas_Object_Image *)(obj->object_data);
-   if ((obj->cur.map) && (obj->cur.usemap)) return 0;
-   if (((o->cur.border.l | o->cur.border.r | o->cur.border.t | o->cur.border.b) != 0) &&
-       (o->cur.border.fill == EVAS_BORDER_FILL_SOLID) &&
-       (obj->cur.render_op == EVAS_RENDER_BLEND) &&
-       (obj->cur.cache.clip.a == 255) &&
-       (o->cur.fill.x == 0) &&
-       (o->cur.fill.y == 0) &&
-       (o->cur.fill.w == obj->cur.geometry.w) &&
-       (o->cur.fill.h == obj->cur.geometry.h)
-       ) return 1;
-   return 0;
-}
-
-static int
-evas_object_image_get_opaque_rect(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
-{
-   Evas_Object_Image *o;
-
-   o = (Evas_Object_Image *)(obj->object_data);
-   if (o->cur.border.scale == 1.0)
-     {
-        *x = obj->cur.geometry.x + o->cur.border.l;
-        *y = obj->cur.geometry.y + o->cur.border.t;
-        *w = obj->cur.geometry.w - (o->cur.border.l + o->cur.border.r);
-        if (*w < 0) *w = 0;
-        *h = obj->cur.geometry.h - (o->cur.border.t + o->cur.border.b);
-        if (*h < 0) *h = 0;
-     }
-   else
-     {
-        *x = obj->cur.geometry.x + (o->cur.border.l * o->cur.border.scale);
-        *y = obj->cur.geometry.y + (o->cur.border.t * o->cur.border.scale);
-        *w = obj->cur.geometry.w - ((o->cur.border.l * o->cur.border.scale) + (o->cur.border.r * o->cur.border.scale));
-        if (*w < 0) *w = 0;
-        *h = obj->cur.geometry.h - ((o->cur.border.t * o->cur.border.scale) + (o->cur.border.b * o->cur.border.scale));
-        if (*h < 0) *h = 0;
-     }
-   return 1;
-}
-
-static int
-evas_object_image_can_map(Evas_Object *obj __UNUSED__)
-{
-   return 1;
-}
-
-static void *
-evas_object_image_data_convert_internal(Evas_Object_Image *o, void *data, Evas_Colorspace to_cspace)
-{
-   void *out = NULL;
-
-   if (!data)
-     return NULL;
-
-   switch (o->cur.cspace)
-     {
-        case EVAS_COLORSPACE_ARGB8888:
-          out = evas_common_convert_argb8888_to(data,
-                                                o->cur.image.w,
-                                                o->cur.image.h,
-                                                o->cur.image.stride >> 2,
-                                                o->cur.has_alpha,
-                                                to_cspace);
-          break;
-        case EVAS_COLORSPACE_RGB565_A5P:
-          out = evas_common_convert_rgb565_a5p_to(data,
-                                                  o->cur.image.w,
-                                                  o->cur.image.h,
-                                                  o->cur.image.stride >> 1,
-                                                  o->cur.has_alpha,
-                                                  to_cspace);
-          break;
-        case EVAS_COLORSPACE_YCBCR422601_PL:
-           out = evas_common_convert_yuv_422_601_to(data,
-                                                   o->cur.image.w,
-                                                   o->cur.image.h,
-                                                   to_cspace);
-          break;
-        case EVAS_COLORSPACE_YCBCR422P601_PL:
-          out = evas_common_convert_yuv_422P_601_to(data,
-                                                    o->cur.image.w,
-                                                    o->cur.image.h,
-                                                    to_cspace);
-          break;
-        case EVAS_COLORSPACE_YCBCR420NV12601_PL:
-          out = evas_common_convert_yuv_420_601_to(data,
-                                                   o->cur.image.w,
-                                                   o->cur.image.h,
-                                                   to_cspace);
-          break;
-        case EVAS_COLORSPACE_YCBCR420TM12601_PL:
-          out = evas_common_convert_yuv_420T_601_to(data,
-                                                    o->cur.image.w,
-                                                    o->cur.image.h,
-                                                    to_cspace);
-          break;
-        default:
-          WRN("unknow colorspace: %i\n", o->cur.cspace);
-          break;
-     }
-
-   return out;
-}
-
-static void
-evas_object_image_filled_resize_listener(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *einfo __UNUSED__)
-{
-   Evas_Coord w, h;
-
-   evas_object_geometry_get(obj, NULL, NULL, &w, &h);
-   evas_object_image_fill_set(obj, 0, 0, w, h);
-}
-
-
-Eina_Bool
-_evas_object_image_preloading_get(const Evas_Object *obj)
-{
-   Evas_Object_Image *o = (Evas_Object_Image *)(obj->object_data);
-   if (!o) return EINA_FALSE;
-   MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-   return o->preloading;
-}
-
-void
-_evas_object_image_preloading_set(Evas_Object *obj, Eina_Bool preloading)
-{
-   Evas_Object_Image *o = (Evas_Object_Image *)(obj->object_data);
-   o->preloading = preloading;
-}
-
-void
-_evas_object_image_preloading_check(Evas_Object *obj)
-{
-   Evas_Object_Image *o = (Evas_Object_Image *)(obj->object_data);
-   if (obj->layer->evas->engine.func->image_load_error_get)
-      o->load_error = obj->layer->evas->engine.func->image_load_error_get
-      (obj->layer->evas->engine.data.output, o->engine_data);
-}
-
-Evas_Object *
-_evas_object_image_video_parent_get(Evas_Object *obj)
-{
-   Evas_Object_Image *o = (Evas_Object_Image *)(obj->object_data);
-
-   return o->video_surface ? o->video.parent : NULL;
-}
-
-void
-_evas_object_image_video_overlay_show(Evas_Object *obj)
-{
-   Evas_Object_Image *o = (Evas_Object_Image *)(obj->object_data);
-
-   if (obj->cur.cache.clip.x != obj->prev.cache.clip.x ||
-       obj->cur.cache.clip.y != obj->prev.cache.clip.y ||
-       o->created || !o->video_visible)
-     o->video.move(o->video.data, obj, &o->video, obj->cur.cache.clip.x, obj->cur.cache.clip.y);
-   if (obj->cur.cache.clip.w != obj->prev.cache.clip.w ||
-       obj->cur.cache.clip.h != obj->prev.cache.clip.h ||
-       o->created || !o->video_visible)
-     o->video.resize(o->video.data, obj, &o->video, obj->cur.cache.clip.w, obj->cur.cache.clip.h);
-   if (!o->video_visible || o->created)
-     {
-        o->video.show(o->video.data, obj, &o->video);
-     }
-   else
-     {
-        /* Cancel dirty on the image */
-        Eina_Rectangle *r;
-
-        o->dirty_pixels = 0;
-        EINA_LIST_FREE(o->pixel_updates, r)
-          eina_rectangle_free(r);
-     }
-   o->video_visible = EINA_TRUE;
-   o->created = EINA_FALSE;
-}
-
-void
-_evas_object_image_video_overlay_hide(Evas_Object *obj)
-{
-   Evas_Object_Image *o = (Evas_Object_Image *)(obj->object_data);
-
-   if (o->video_visible || o->created)
-     o->video.hide(o->video.data, obj, &o->video);
-   if (evas_object_is_visible(obj))
-     o->video.update_pixels(o->video.data, obj, &o->video);
-   o->video_visible = EINA_FALSE;
-   o->created = EINA_FALSE;
-}
-
-/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/
diff --git a/libraries/evas/src/lib/canvas/evas_object_inform.c b/libraries/evas/src/lib/canvas/evas_object_inform.c
deleted file mode 100644
index 302da42..0000000
--- a/libraries/evas/src/lib/canvas/evas_object_inform.c
+++ /dev/null
@@ -1,79 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-
-/* local calls */
-
-void
-evas_object_inform_call_show(Evas_Object *obj)
-{
-   _evas_object_event_new();
-
-   evas_object_event_callback_call(obj, EVAS_CALLBACK_SHOW, NULL, _evas_event_counter);
-   _evas_post_event_callback_call(obj->layer->evas);
-}
-
-void
-evas_object_inform_call_hide(Evas_Object *obj)
-{
-   _evas_object_event_new();
-
-   evas_object_event_callback_call(obj, EVAS_CALLBACK_HIDE, NULL, _evas_event_counter);
-   _evas_post_event_callback_call(obj->layer->evas);
-}
-
-void
-evas_object_inform_call_move(Evas_Object *obj)
-{
-   _evas_object_event_new();
-
-   evas_object_event_callback_call(obj, EVAS_CALLBACK_MOVE, NULL, _evas_event_counter);
-   _evas_post_event_callback_call(obj->layer->evas);
-}
-
-void
-evas_object_inform_call_resize(Evas_Object *obj)
-{
-   _evas_object_event_new();
-
-   evas_object_event_callback_call(obj, EVAS_CALLBACK_RESIZE, NULL, _evas_event_counter);
-   _evas_post_event_callback_call(obj->layer->evas);
-}
-
-void
-evas_object_inform_call_restack(Evas_Object *obj)
-{
-   _evas_object_event_new();
-
-   evas_object_event_callback_call(obj, EVAS_CALLBACK_RESTACK, NULL, _evas_event_counter);
-   _evas_post_event_callback_call(obj->layer->evas);
-}
-
-void
-evas_object_inform_call_changed_size_hints(Evas_Object *obj)
-{
-   _evas_object_event_new();
-
-   evas_object_event_callback_call(obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, NULL, _evas_event_counter);
-   _evas_post_event_callback_call(obj->layer->evas);
-}
-
-void
-evas_object_inform_call_image_preloaded(Evas_Object *obj)
-{
-   if (!_evas_object_image_preloading_get(obj)) return;
-   _evas_object_image_preloading_check(obj);
-   _evas_object_image_preloading_set(obj, 0);
-   _evas_object_event_new();
-
-   evas_object_event_callback_call(obj, EVAS_CALLBACK_IMAGE_PRELOADED, NULL, _evas_event_counter);
-   _evas_post_event_callback_call(obj->layer->evas);
-}
-
-void
-evas_object_inform_call_image_unloaded(Evas_Object *obj)
-{
-   _evas_object_event_new();
-
-   evas_object_event_callback_call(obj, EVAS_CALLBACK_IMAGE_UNLOADED, NULL, _evas_event_counter);
-   _evas_post_event_callback_call(obj->layer->evas);
-}
diff --git a/libraries/evas/src/lib/canvas/evas_object_intercept.c b/libraries/evas/src/lib/canvas/evas_object_intercept.c
deleted file mode 100644
index 54f7265..0000000
--- a/libraries/evas/src/lib/canvas/evas_object_intercept.c
+++ /dev/null
@@ -1,585 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-
-/* local calls */
-
-static void evas_object_intercept_init(Evas_Object *obj);
-static void evas_object_intercept_deinit(Evas_Object *obj);
-
-static void
-evas_object_intercept_init(Evas_Object *obj)
-{
-   if (!obj->interceptors)
-     obj->interceptors = evas_mem_calloc(sizeof(Evas_Intercept_Func));
-}
-
-static void
-evas_object_intercept_deinit(Evas_Object *obj)
-{
-   if (!obj->interceptors) return;
-   if ((obj->interceptors->show.func) ||
-       (obj->interceptors->hide.func) ||
-       (obj->interceptors->move.func) ||
-       (obj->interceptors->resize.func) ||
-       (obj->interceptors->raise.func) ||
-       (obj->interceptors->lower.func) ||
-       (obj->interceptors->stack_above.func) ||
-       (obj->interceptors->stack_below.func) ||
-       (obj->interceptors->layer_set.func) ||
-       (obj->interceptors->color_set.func) ||
-       (obj->interceptors->clip_set.func) ||
-       (obj->interceptors->clip_unset.func))
-     return;
-   free(obj->interceptors);
-   obj->interceptors = NULL;
-}
-
-/* private calls */
-
-void
-evas_object_intercept_cleanup(Evas_Object *obj)
-{
-   if (obj->interceptors) free(obj->interceptors);
-}
-
-int
-evas_object_intercept_call_show(Evas_Object *obj)
-{
-   int ret;
-
-   if (!obj->interceptors) return 0;
-   if (obj->intercepted) return 0;
-   obj->intercepted = EINA_TRUE;
-   ret = !!(obj->interceptors->show.func);
-   if (ret)
-     obj->interceptors->show.func(obj->interceptors->show.data, obj);
-   obj->intercepted = EINA_FALSE;
-   return ret;
-}
-
-int
-evas_object_intercept_call_hide(Evas_Object *obj)
-{
-   int ret;
-
-   if (!obj->interceptors) return 0;
-   if (obj->intercepted) return 0;
-   obj->intercepted = EINA_TRUE;
-   ret = !!(obj->interceptors->hide.func);
-   if (ret)
-     obj->interceptors->hide.func(obj->interceptors->hide.data, obj);
-   obj->intercepted = EINA_FALSE;
-   return ret;
-}
-
-int
-evas_object_intercept_call_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
-{
-   int ret;
-
-   if (!obj->interceptors) return 0;
-   if (obj->intercepted) return 0;
-   obj->intercepted = EINA_TRUE;
-   ret = !!(obj->interceptors->move.func);
-   if (ret)
-     obj->interceptors->move.func(obj->interceptors->move.data, obj, x, y);
-   obj->intercepted = EINA_FALSE;
-   return ret;
-}
-
-int
-evas_object_intercept_call_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
-{
-   int ret;
-
-   if (!obj->interceptors) return 0;
-   if (obj->intercepted) return 0;
-   obj->intercepted = EINA_TRUE;
-   ret = !!(obj->interceptors->resize.func);
-   if (ret)
-     obj->interceptors->resize.func(obj->interceptors->resize.data, obj, w, h);
-   obj->intercepted = EINA_FALSE;
-   return ret;
-}
-
-int
-evas_object_intercept_call_raise(Evas_Object *obj)
-{
-   int ret;
-
-   if (!obj->interceptors) return 0;
-   if (obj->intercepted) return 0;
-   obj->intercepted = EINA_TRUE;
-   ret = !!(obj->interceptors->raise.func);
-   if (ret)
-     obj->interceptors->raise.func(obj->interceptors->raise.data, obj);
-   obj->intercepted = EINA_FALSE;
-   return ret;
-}
-
-int
-evas_object_intercept_call_lower(Evas_Object *obj)
-{
-   int ret;
-
-   if (!obj->interceptors) return 0;
-   if (obj->intercepted) return 0;
-   obj->intercepted = EINA_TRUE;
-   ret = !!(obj->interceptors->lower.func);
-   if (ret)
-     obj->interceptors->lower.func(obj->interceptors->lower.data, obj);
-   obj->intercepted = EINA_FALSE;
-   return ret;
-}
-
-int
-evas_object_intercept_call_stack_above(Evas_Object *obj, Evas_Object *above)
-{
-   int ret;
-
-   if (!obj->interceptors) return 0;
-   if (obj->intercepted) return 0;
-   obj->intercepted = EINA_TRUE;
-   ret = !!(obj->interceptors->stack_above.func);
-   if (ret)
-     obj->interceptors->stack_above.func(obj->interceptors->stack_above.data, obj, above);
-   obj->intercepted = EINA_FALSE;
-   return ret;
-}
-
-int
-evas_object_intercept_call_stack_below(Evas_Object *obj, Evas_Object *below)
-{
-   int ret;
-
-   if (!obj->interceptors) return 0;
-   if (obj->intercepted) return 0;
-   obj->intercepted = EINA_TRUE;
-   ret = !!(obj->interceptors->stack_below.func);
-   if (ret)
-     obj->interceptors->stack_below.func(obj->interceptors->stack_below.data, obj, below);
-   obj->intercepted = EINA_FALSE;
-   return ret;
-}
-
-int
-evas_object_intercept_call_layer_set(Evas_Object *obj, int l)
-{
-   int ret;
-
-   if (!obj->interceptors) return 0;
-   if (obj->intercepted) return 0;
-   obj->intercepted = EINA_TRUE;
-   ret = !!(obj->interceptors->layer_set.func);
-   if (ret)
-     obj->interceptors->layer_set.func(obj->interceptors->layer_set.data, obj, l);
-   obj->intercepted = EINA_FALSE;
-   return ret;
-}
-
-int
-evas_object_intercept_call_color_set(Evas_Object *obj, int r, int g, int b, int a)
-{
-   int ret;
-
-   if (!obj->interceptors) return 0;
-   if (obj->intercepted) return 0;
-   obj->intercepted = EINA_TRUE;
-   ret = !!(obj->interceptors->color_set.func);
-   if (ret)
-     obj->interceptors->color_set.func(obj->interceptors->color_set.data, obj, r, g, b, a);
-   obj->intercepted = EINA_FALSE;
-   return ret;
-}
-
-int
-evas_object_intercept_call_clip_set(Evas_Object *obj, Evas_Object *clip)
-{
-   int ret;
-
-   if (!obj->interceptors) return 0;
-   if (obj->intercepted) return 0;
-   obj->intercepted = EINA_TRUE;
-   ret = !!(obj->interceptors->clip_set.func);
-   if (ret)
-     obj->interceptors->clip_set.func(obj->interceptors->clip_set.data, obj, clip);
-   obj->intercepted = EINA_FALSE;
-   return ret;
-}
-
-int
-evas_object_intercept_call_clip_unset(Evas_Object *obj)
-{
-   int ret;
-
-   if (!obj->interceptors) return 0;
-   if (obj->intercepted) return 0;
-   obj->intercepted = EINA_TRUE;
-   ret = !!(obj->interceptors->clip_unset.func);
-   if (ret)
-     obj->interceptors->clip_unset.func(obj->interceptors->clip_unset.data, obj);
-   obj->intercepted = EINA_FALSE;
-   return ret;
-}
-
-/* public calls */
-
-EAPI void
-evas_object_intercept_show_callback_add(Evas_Object *obj, Evas_Object_Intercept_Show_Cb func, const void *data)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (!func) return;
-   evas_object_intercept_init(obj);
-   if (!obj->interceptors) return;
-   obj->interceptors->show.func = func;
-   obj->interceptors->show.data = (void *)data;
-}
-
-EAPI void *
-evas_object_intercept_show_callback_del(Evas_Object *obj, Evas_Object_Intercept_Show_Cb func)
-{
-   void *data;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   if (!func) return NULL;
-   if (!obj->interceptors) return NULL;
-   obj->interceptors->show.func = NULL;
-   data = obj->interceptors->show.data;
-   obj->interceptors->show.data = NULL;
-   evas_object_intercept_deinit(obj);
-   return data;
-}
-
-EAPI void
-evas_object_intercept_hide_callback_add(Evas_Object *obj, Evas_Object_Intercept_Hide_Cb func, const void *data)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (!func) return;
-   evas_object_intercept_init(obj);
-   if (!obj->interceptors) return;
-   obj->interceptors->hide.func = func;
-   obj->interceptors->hide.data = (void *)data;
-}
-
-EAPI void *
-evas_object_intercept_hide_callback_del(Evas_Object *obj, Evas_Object_Intercept_Hide_Cb func)
-{
-   void *data;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   if (!func) return NULL;
-   if (!obj->interceptors) return NULL;
-   obj->interceptors->hide.func = NULL;
-   data = obj->interceptors->hide.data;
-   obj->interceptors->hide.data = NULL;
-   evas_object_intercept_deinit(obj);
-   return data;
-}
-
-EAPI void
-evas_object_intercept_move_callback_add(Evas_Object *obj, Evas_Object_Intercept_Move_Cb func, const void *data)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (!func) return;
-   evas_object_intercept_init(obj);
-   if (!obj->interceptors) return;
-   obj->interceptors->move.func = func;
-   obj->interceptors->move.data = (void *)data;
-}
-
-EAPI void *
-evas_object_intercept_move_callback_del(Evas_Object *obj, Evas_Object_Intercept_Move_Cb func)
-{
-   void *data;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   if (!func) return NULL;
-   if (!obj->interceptors) return NULL;
-   obj->interceptors->move.func = NULL;
-   data = obj->interceptors->move.data;
-   obj->interceptors->move.data = NULL;
-   evas_object_intercept_deinit(obj);
-   return data;
-}
-
-EAPI void
-evas_object_intercept_resize_callback_add(Evas_Object *obj, Evas_Object_Intercept_Resize_Cb func, const void *data)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (!func) return;
-   evas_object_intercept_init(obj);
-   if (!obj->interceptors) return;
-   obj->interceptors->resize.func = func;
-   obj->interceptors->resize.data = (void *)data;
-}
-
-EAPI void *
-evas_object_intercept_resize_callback_del(Evas_Object *obj, Evas_Object_Intercept_Resize_Cb func)
-{
-   void *data;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   if (!func) return NULL;
-   if (!obj->interceptors) return NULL;
-   obj->interceptors->resize.func = NULL;
-   data = obj->interceptors->resize.data;
-   obj->interceptors->resize.data = NULL;
-   evas_object_intercept_deinit(obj);
-   return data;
-}
-
-EAPI void
-evas_object_intercept_raise_callback_add(Evas_Object *obj, Evas_Object_Intercept_Raise_Cb func, const void *data)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (!func) return;
-   evas_object_intercept_init(obj);
-   if (!obj->interceptors) return;
-   obj->interceptors->raise.func = func;
-   obj->interceptors->raise.data = (void *)data;
-}
-
-EAPI void *
-evas_object_intercept_raise_callback_del(Evas_Object *obj, Evas_Object_Intercept_Raise_Cb func)
-{
-   void *data;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   if (!func) return NULL;
-   if (!obj->interceptors) return NULL;
-   obj->interceptors->raise.func = NULL;
-   data = obj->interceptors->raise.data;
-   obj->interceptors->raise.data = NULL;
-   evas_object_intercept_deinit(obj);
-   return data;
-}
-
-EAPI void
-evas_object_intercept_lower_callback_add(Evas_Object *obj, Evas_Object_Intercept_Lower_Cb func, const void *data)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (!func) return;
-   evas_object_intercept_init(obj);
-   if (!obj->interceptors) return;
-   obj->interceptors->lower.func = func;
-   obj->interceptors->lower.data = (void *)data;
-}
-
-EAPI void *
-evas_object_intercept_lower_callback_del(Evas_Object *obj, Evas_Object_Intercept_Lower_Cb func)
-{
-   void *data;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   if (!func) return NULL;
-   if (!obj->interceptors) return NULL;
-   obj->interceptors->lower.func = NULL;
-   data = obj->interceptors->lower.data;
-   obj->interceptors->lower.data = NULL;
-   evas_object_intercept_deinit(obj);
-   return data;
-}
-
-EAPI void
-evas_object_intercept_stack_above_callback_add(Evas_Object *obj, Evas_Object_Intercept_Stack_Above_Cb func, const void *data)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (!func) return;
-   evas_object_intercept_init(obj);
-   if (!obj->interceptors) return;
-   obj->interceptors->stack_above.func = func;
-   obj->interceptors->stack_above.data = (void *)data;
-}
-
-EAPI void *
-evas_object_intercept_stack_above_callback_del(Evas_Object *obj, Evas_Object_Intercept_Stack_Above_Cb func)
-{
-   void *data;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   if (!func) return NULL;
-   if (!obj->interceptors) return NULL;
-   obj->interceptors->stack_above.func = NULL;
-   data = obj->interceptors->stack_above.data;
-   obj->interceptors->stack_above.data = NULL;
-   evas_object_intercept_deinit(obj);
-   return data;
-}
-
-EAPI void
-evas_object_intercept_stack_below_callback_add(Evas_Object *obj, Evas_Object_Intercept_Stack_Below_Cb func, const void *data)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (!func) return;
-   evas_object_intercept_init(obj);
-   if (!obj->interceptors) return;
-   obj->interceptors->stack_below.func = func;
-   obj->interceptors->stack_below.data = (void *)data;
-}
-
-EAPI void *
-evas_object_intercept_stack_below_callback_del(Evas_Object *obj, Evas_Object_Intercept_Stack_Below_Cb func)
-{
-   void *data;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   if (!func) return NULL;
-   if (!obj->interceptors) return NULL;
-   obj->interceptors->stack_below.func = NULL;
-   data = obj->interceptors->stack_below.data;
-   obj->interceptors->stack_below.data = NULL;
-   evas_object_intercept_deinit(obj);
-   return data;
-}
-
-EAPI void
-evas_object_intercept_layer_set_callback_add(Evas_Object *obj, Evas_Object_Intercept_Layer_Set_Cb func, const void *data)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (!func) return;
-   evas_object_intercept_init(obj);
-   if (!obj->interceptors) return;
-   obj->interceptors->layer_set.func = func;
-   obj->interceptors->layer_set.data = (void *)data;
-}
-
-EAPI void *
-evas_object_intercept_layer_set_callback_del(Evas_Object *obj, Evas_Object_Intercept_Layer_Set_Cb func)
-{
-   void *data;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   if (!func) return NULL;
-   if (!obj->interceptors) return NULL;
-   obj->interceptors->layer_set.func = NULL;
-   data = obj->interceptors->layer_set.data;
-   obj->interceptors->layer_set.data = NULL;
-   evas_object_intercept_deinit(obj);
-   return data;
-}
-
-EAPI void
-evas_object_intercept_color_set_callback_add(Evas_Object *obj, Evas_Object_Intercept_Color_Set_Cb func, const void *data)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (!func) return;
-   evas_object_intercept_init(obj);
-   if (!obj->interceptors) return;
-   obj->interceptors->color_set.func = func;
-   obj->interceptors->color_set.data = (void *)data;
-}
-
-EAPI void *
-evas_object_intercept_color_set_callback_del(Evas_Object *obj, Evas_Object_Intercept_Color_Set_Cb func)
-{
-   void *data;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   if (!func) return NULL;
-   if (!obj->interceptors) return NULL;
-   obj->interceptors->color_set.func = NULL;
-   data = obj->interceptors->color_set.data;
-   obj->interceptors->color_set.data = NULL;
-   evas_object_intercept_deinit(obj);
-   return data;
-}
-
-EAPI void
-evas_object_intercept_clip_set_callback_add(Evas_Object *obj, Evas_Object_Intercept_Clip_Set_Cb func, const void *data)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (!func) return;
-   evas_object_intercept_init(obj);
-   if (!obj->interceptors) return;
-   obj->interceptors->clip_set.func = func;
-   obj->interceptors->clip_set.data = (void *)data;
-}
-
-EAPI void *
-evas_object_intercept_clip_set_callback_del(Evas_Object *obj, Evas_Object_Intercept_Clip_Set_Cb func)
-{
-   void *data;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   if (!func) return NULL;
-   if (!obj->interceptors) return NULL;
-   obj->interceptors->clip_set.func = NULL;
-   data = obj->interceptors->clip_set.data;
-   obj->interceptors->clip_set.data = NULL;
-   evas_object_intercept_deinit(obj);
-   return data;
-}
-
-EAPI void
-evas_object_intercept_clip_unset_callback_add(Evas_Object *obj, Evas_Object_Intercept_Clip_Unset_Cb func, const void *data)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (!func) return;
-   evas_object_intercept_init(obj);
-   if (!obj->interceptors) return;
-   obj->interceptors->clip_unset.func = func;
-   obj->interceptors->clip_unset.data = (void *)data;
-}
-
-EAPI void *
-evas_object_intercept_clip_unset_callback_del(Evas_Object *obj, Evas_Object_Intercept_Clip_Unset_Cb func)
-{
-   void *data;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   if (!func) return NULL;
-   if (!obj->interceptors) return NULL;
-   obj->interceptors->clip_unset.func = NULL;
-   data = obj->interceptors->clip_unset.data;
-   obj->interceptors->clip_unset.data = NULL;
-   evas_object_intercept_deinit(obj);
-   return data;
-}
diff --git a/libraries/evas/src/lib/canvas/evas_object_line.c b/libraries/evas/src/lib/canvas/evas_object_line.c
deleted file mode 100644
index b09a6e2..0000000
--- a/libraries/evas/src/lib/canvas/evas_object_line.c
+++ /dev/null
@@ -1,461 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-
-/* private magic number for line objects */
-static const char o_type[] = "line";
-
-/* private struct for line object internal data */
-typedef struct _Evas_Object_Line      Evas_Object_Line;
-
-struct _Evas_Object_Line
-{
-   DATA32            magic;
-   struct {
-      struct {
-         int         x1, y1, x2, y2;
-         struct {
-            Evas_Coord w, h;
-         } object;
-      } cache;
-      Evas_Coord         x1, y1, x2, y2;
-   } cur, prev;
-
-   void             *engine_data;
-
-   char              changed : 1;
-};
-
-/* private methods for line objects */
-static void evas_object_line_init(Evas_Object *obj);
-static void *evas_object_line_new(void);
-static void evas_object_line_render(Evas_Object *obj, void *output, void *context, void *surface, int x, int y);
-static void evas_object_line_free(Evas_Object *obj);
-static void evas_object_line_render_pre(Evas_Object *obj);
-static void evas_object_line_render_post(Evas_Object *obj);
-
-static unsigned int evas_object_line_id_get(Evas_Object *obj);
-static unsigned int evas_object_line_visual_id_get(Evas_Object *obj);
-static void *evas_object_line_engine_data_get(Evas_Object *obj);
-
-static int evas_object_line_is_opaque(Evas_Object *obj);
-static int evas_object_line_was_opaque(Evas_Object *obj);
-static int evas_object_line_is_inside(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
-static int evas_object_line_was_inside(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
-static void evas_object_line_coords_recalc(Evas_Object *obj);
-
-static const Evas_Object_Func object_func =
-{
-   /* methods (compulsory) */
-   evas_object_line_free,
-     evas_object_line_render,
-     evas_object_line_render_pre,
-     evas_object_line_render_post,
-     evas_object_line_id_get,
-     evas_object_line_visual_id_get,
-     evas_object_line_engine_data_get,
-   /* these are optional. NULL = nothing */
-     NULL,
-     NULL,
-     NULL,
-     NULL,
-     evas_object_line_is_opaque,
-     evas_object_line_was_opaque,
-     evas_object_line_is_inside,
-     evas_object_line_was_inside,
-     evas_object_line_coords_recalc,
-     NULL,
-     NULL,
-     NULL,
-     NULL
-};
-
-/* the actual api call to add a rect */
-/* it has no other api calls as all properties are standard */
-
-EVAS_MEMPOOL(_mp_obj);
-
-EAPI Evas_Object *
-evas_object_line_add(Evas *e)
-{
-   Evas_Object *obj;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return NULL;
-   MAGIC_CHECK_END();
-   obj = evas_object_new(e);
-   evas_object_line_init(obj);
-   evas_object_inject(obj, e);
-   return obj;
-}
-
-EAPI void
-evas_object_line_xy_set(Evas_Object *obj, Evas_Coord x1, Evas_Coord y1, Evas_Coord x2, Evas_Coord y2)
-{
-   Evas_Object_Line *o;
-   Evas_Coord min_x, max_x, min_y, max_y;
-   int is, was = 0;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Line *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Line, MAGIC_OBJ_LINE);
-   return;
-   MAGIC_CHECK_END();
-   if ((x1 == o->cur.x1) && (y1 == o->cur.y1) &&
-       (x2 == o->cur.x2) && (y2 == o->cur.y2)) return;
-   if (obj->layer->evas->events_frozen <= 0)
-     {
-        if (!evas_event_passes_through(obj) &&
-            !evas_event_freezes_through(obj))
-          was = evas_object_is_in_output_rect(obj,
-                                              obj->layer->evas->pointer.x,
-                                              obj->layer->evas->pointer.y,
-                                              1, 1);
-     }
-   if (x1 < x2)
-     {
-        min_x = x1;
-        max_x = x2;
-     }
-   else
-     {
-        min_x = x2;
-        max_x = x1;
-     }
-   if (y1 < y2)
-     {
-        min_y = y1;
-        max_y = y2;
-     }
-   else
-     {
-        min_y = y2;
-        max_y = y1;
-     }
-   obj->cur.geometry.x = min_x;
-   obj->cur.geometry.y = min_y;
-   obj->cur.geometry.w = max_x - min_x + 2;
-   obj->cur.geometry.h = max_y - min_y + 2;
-////   obj->cur.cache.geometry.validity = 0;
-   o->cur.x1 = x1 - min_x;
-   o->cur.y1 = y1 - min_y;
-   o->cur.x2 = x2 - min_x;
-   o->cur.y2 = y2 - min_y;
-   o->changed = 1;
-   evas_object_change(obj);
-   evas_object_coords_recalc(obj);
-   evas_object_clip_dirty(obj);
-   if (obj->layer->evas->events_frozen <= 0)
-     {
-        is = evas_object_is_in_output_rect(obj,
-                                           obj->layer->evas->pointer.x,
-                                           obj->layer->evas->pointer.y, 1, 1);
-        if (!evas_event_passes_through(obj) &&
-            !evas_event_freezes_through(obj))
-          {
-             if ((is ^ was) && obj->cur.visible)
-               evas_event_feed_mouse_move(obj->layer->evas,
-                                          obj->layer->evas->pointer.x,
-                                          obj->layer->evas->pointer.y,
-                                          obj->layer->evas->last_timestamp,
-                                          NULL);
-          }
-     }
-   evas_object_inform_call_move(obj);
-   evas_object_inform_call_resize(obj);
-}
-
-EAPI void
-evas_object_line_xy_get(const Evas_Object *obj, Evas_Coord *x1, Evas_Coord *y1, Evas_Coord *x2, Evas_Coord *y2)
-{
-   Evas_Object_Line *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   if (x1) *x1 = 0;
-   if (y1) *y1 = 0;
-   if (x2) *x2 = 0;
-   if (y2) *y2 = 0;
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Line *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Line, MAGIC_OBJ_LINE);
-   if (x1) *x1 = 0;
-   if (y1) *y1 = 0;
-   if (x2) *x2 = 0;
-   if (y2) *y2 = 0;
-   return;
-   MAGIC_CHECK_END();
-   if (x1) *x1 = obj->cur.geometry.x + o->cur.x1;
-   if (y1) *y1 = obj->cur.geometry.y + o->cur.y1;
-   if (x2) *x2 = obj->cur.geometry.x + o->cur.x2;
-   if (y2) *y2 = obj->cur.geometry.y + o->cur.y2;
-}
-
-/* all nice and private */
-static void
-evas_object_line_init(Evas_Object *obj)
-{
-   /* alloc image ob, setup methods and default values */
-   obj->object_data = evas_object_line_new();
-   /* set up default settings for this kind of object */
-   obj->cur.color.r = 255;
-   obj->cur.color.g = 255;
-   obj->cur.color.b = 255;
-   obj->cur.color.a = 255;
-   obj->cur.geometry.x = 0;
-   obj->cur.geometry.y = 0;
-   obj->cur.geometry.w = 0;
-   obj->cur.geometry.h = 0;
-   obj->cur.layer = 0;
-   obj->cur.anti_alias = 1;
-   obj->cur.render_op = EVAS_RENDER_BLEND;
-   /* set up object-specific settings */
-   obj->prev = obj->cur;
-   /* set up methods (compulsory) */
-   obj->func = &object_func;
-   obj->type = o_type;
-}
-
-static void *
-evas_object_line_new(void)
-{
-   Evas_Object_Line *o;
-
-   /* alloc obj private data */
-   EVAS_MEMPOOL_INIT(_mp_obj, "evas_object_line", Evas_Object_Line, 16, NULL);
-   o = EVAS_MEMPOOL_ALLOC(_mp_obj, Evas_Object_Line);
-   if (!o) return NULL;
-   EVAS_MEMPOOL_PREP(_mp_obj, o, Evas_Object_Line);
-   o->magic = MAGIC_OBJ_LINE;
-   o->cur.x1 = 0;
-   o->cur.y1 = 0;
-   o->cur.x2 = 31;
-   o->cur.y2 = 31;
-   o->prev = o->cur;
-   return o;
-}
-
-static void
-evas_object_line_free(Evas_Object *obj)
-{
-   Evas_Object_Line *o;
-
-   /* frees private object data. very simple here */
-   o = (Evas_Object_Line *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Line, MAGIC_OBJ_LINE);
-   return;
-   MAGIC_CHECK_END();
-   /* free obj */
-   o->magic = 0;
-   EVAS_MEMPOOL_FREE(_mp_obj, o);
-}
-
-static void
-evas_object_line_render(Evas_Object *obj, void *output, void *context, void *surface, int x, int y)
-{
-   Evas_Object_Line *o;
-
-   /* render object to surface with context, and offxet by x,y */
-   o = (Evas_Object_Line *)(obj->object_data);
-   obj->layer->evas->engine.func->context_color_set(output,
-                                                    context,
-                                                    obj->cur.cache.clip.r,
-                                                    obj->cur.cache.clip.g,
-                                                    obj->cur.cache.clip.b,
-                                                    obj->cur.cache.clip.a);
-   obj->layer->evas->engine.func->context_multiplier_unset(output,
-                                                           context);
-   obj->layer->evas->engine.func->context_anti_alias_set(output, context,
-                                                         obj->cur.anti_alias);
-   obj->layer->evas->engine.func->context_render_op_set(output, context,
-                                                        obj->cur.render_op);
-   obj->layer->evas->engine.func->line_draw(output,
-                                            context,
-                                            surface,
-                                            o->cur.cache.x1 + x,
-                                            o->cur.cache.y1 + y,
-                                            o->cur.cache.x2 + x,
-                                            o->cur.cache.y2 + y);
-}
-
-static void
-evas_object_line_render_pre(Evas_Object *obj)
-{
-   Evas_Object_Line *o;
-   int is_v, was_v;
-
-   /* dont pre-render the obj twice! */
-   if (obj->pre_render_done) return;
-   obj->pre_render_done = 1;
-   /* pre-render phase. this does anything an object needs to do just before */
-   /* rendering. this could mean loading the image data, retrieving it from */
-   /* elsewhere, decoding video etc. */
-   /* then when this is done the object needs to figure if it changed and */
-   /* if so what and where and add the appropriate redraw lines */
-   o = (Evas_Object_Line *)(obj->object_data);
-   /* if someone is clipping this obj - go calculate the clipper */
-   if (obj->cur.clipper)
-     {
-        if (obj->cur.cache.clip.dirty)
-          evas_object_clip_recalc(obj->cur.clipper);
-        obj->cur.clipper->func->render_pre(obj->cur.clipper);
-     }
-   /* now figure what changed and add draw rects */
-   /* if it just became visible or invisible */
-   is_v = evas_object_is_visible(obj);
-   was_v = evas_object_was_visible(obj);
-   if (is_v != was_v)
-     {
-        evas_object_render_pre_visible_change(&obj->layer->evas->clip_changes, obj, is_v, was_v);
-        goto done;
-     }
-   if ((obj->cur.map != obj->prev.map) ||
-       (obj->cur.usemap != obj->prev.usemap))
-     {
-        evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, obj);
-        goto done;
-     }
-   /* it's not visible - we accounted for it appearing or not so just abort */
-   if (!is_v) goto done;
-   /* clipper changed this is in addition to anything else for obj */
-   evas_object_render_pre_clipper_change(&obj->layer->evas->clip_changes, obj);
-   /* if we restacked (layer or just within a layer) */
-   if (obj->restack)
-     {
-        evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, obj);
-        goto done;
-     }
-   /* if it changed anti_alias */
-   if (obj->cur.anti_alias != obj->prev.anti_alias)
-     {
-        evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, obj);
-        goto done;
-     }
-   /* if it changed render op */
-   if (obj->cur.render_op != obj->prev.render_op)
-     {
-        evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, obj);
-        goto done;
-     }
-   /* if it changed color */
-   if ((obj->cur.color.r != obj->prev.color.r) ||
-       (obj->cur.color.g != obj->prev.color.g) ||
-       (obj->cur.color.b != obj->prev.color.b) ||
-       (obj->cur.color.a != obj->prev.color.a))
-     {
-        evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, obj);
-        goto done;
-     }
-   /* if it changed geometry - and obviously not visibility or color */
-   /* calculate differences since we have a constant color fill */
-   /* we really only need to update the differences */
-   if ((obj->cur.geometry.x != obj->prev.geometry.x) ||
-       (obj->cur.geometry.y != obj->prev.geometry.y) ||
-       (obj->cur.geometry.w != obj->prev.geometry.w) ||
-       (obj->cur.geometry.h != obj->prev.geometry.h) ||
-       ((o->changed) &&
-        ((o->cur.x1 != o->prev.x1) ||
-         (o->cur.y1 != o->prev.y1) ||
-         (o->cur.x2 != o->prev.x2) ||
-         (o->cur.y2 != o->prev.y2)))
-       )
-     {
-        evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, obj);
-        goto done;
-     }
-   done:
-   evas_object_render_pre_effect_updates(&obj->layer->evas->clip_changes, obj, is_v, was_v);
-}
-
-static void
-evas_object_line_render_post(Evas_Object *obj)
-{
-   Evas_Object_Line *o;
-
-   /* this moves the current data to the previous state parts of the object */
-   /* in whatever way is safest for the object. also if we don't need object */
-   /* data anymore we can free it if the object deems this is a good idea */
-   o = (Evas_Object_Line *)(obj->object_data);
-   /* remove those pesky changes */
-   evas_object_clip_changes_clean(obj);
-   /* move cur to prev safely for object data */
-   obj->prev = obj->cur;
-   o->prev = o->cur;
-   o->changed = 0;
-}
-
-static unsigned int evas_object_line_id_get(Evas_Object *obj)
-{
-   Evas_Object_Line *o;
-
-   o = (Evas_Object_Line *)(obj->object_data);
-   if (!o) return 0;
-   return MAGIC_OBJ_LINE;
-}
-
-static unsigned int evas_object_line_visual_id_get(Evas_Object *obj)
-{
-   Evas_Object_Line *o;
-
-   o = (Evas_Object_Line *)(obj->object_data);
-   if (!o) return 0;
-   return MAGIC_OBJ_SHAPE;
-}
-
-static void *evas_object_line_engine_data_get(Evas_Object *obj)
-{
-   Evas_Object_Line *o;
-
-   o = (Evas_Object_Line *)(obj->object_data);
-   if (!o) return NULL;
-   return o->engine_data;
-}
-
-static int
-evas_object_line_is_opaque(Evas_Object *obj __UNUSED__)
-{
-   /* this returns 1 if the internal object data implies that the object is */
-   /* currently fully opaque over the entire line it occupies */
-   return 0;
-}
-
-static int
-evas_object_line_was_opaque(Evas_Object *obj __UNUSED__)
-{
-   /* this returns 1 if the internal object data implies that the object was */
-   /* previously fully opaque over the entire line it occupies */
-   return 0;
-}
-
-static int
-evas_object_line_is_inside(Evas_Object *obj __UNUSED__, Evas_Coord x __UNUSED__, Evas_Coord y __UNUSED__)
-{
-   /* this returns 1 if the canvas co-ordinates are inside the object based */
-   /* on object private data. not much use for rects, but for polys, images */
-   /* and other complex objects it might be */
-   return 1;
-}
-
-static int
-evas_object_line_was_inside(Evas_Object *obj __UNUSED__, Evas_Coord x __UNUSED__, Evas_Coord y __UNUSED__)
-{
-   /* this returns 1 if the canvas co-ordinates were inside the object based */
-   /* on object private data. not much use for rects, but for polys, images */
-   /* and other complex objects it might be */
-   return 1;
-}
-
-static void
-evas_object_line_coords_recalc(Evas_Object *obj)
-{
-   Evas_Object_Line *o;
-
-   o = (Evas_Object_Line *)(obj->object_data);
-   o->cur.cache.x1 = obj->cur.geometry.x + o->cur.x1;
-   o->cur.cache.y1 = obj->cur.geometry.y + o->cur.y1;
-   o->cur.cache.x2 = obj->cur.geometry.x + o->cur.x2;
-   o->cur.cache.y2 = obj->cur.geometry.y + o->cur.y2;
-   o->cur.cache.object.w = obj->cur.geometry.w;
-   o->cur.cache.object.h = obj->cur.geometry.h;
-}
diff --git a/libraries/evas/src/lib/canvas/evas_object_main.c b/libraries/evas/src/lib/canvas/evas_object_main.c
deleted file mode 100644
index 81fc858..0000000
--- a/libraries/evas/src/lib/canvas/evas_object_main.c
+++ /dev/null
@@ -1,1398 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-
-EVAS_MEMPOOL(_mp_obj);
-EVAS_MEMPOOL(_mp_sh);
-
-static Eina_Inlist *
-get_layer_objects(Evas_Layer *l)
-{
-   if ((!l) || (!l->objects)) return NULL;
-   return (EINA_INLIST_GET(l->objects));
-}
-
-/* evas internal stuff */
-Evas_Object *
-evas_object_new(Evas *e __UNUSED__)
-{
-   Evas_Object *obj;
-
-   EVAS_MEMPOOL_INIT(_mp_obj, "evas_object", Evas_Object, 512, NULL);
-   obj = EVAS_MEMPOOL_ALLOC(_mp_obj, Evas_Object);
-   if (!obj) return NULL;
-   EVAS_MEMPOOL_PREP(_mp_obj, obj, Evas_Object);
-
-   obj->magic = MAGIC_OBJ;
-   obj->cur.scale = 1.0;
-   obj->prev.scale = 1.0;
-   obj->is_frame = EINA_FALSE;
-
-   return obj;
-}
-
-void
-evas_object_free(Evas_Object *obj, int clean_layer)
-{
-   int was_smart_child = 0;
-
-#if 0 // filtering disabled
-   evas_filter_free(obj);
-#endif
-   if (!strcmp(obj->type, "image")) evas_object_image_video_surface_set(obj, NULL);
-   evas_object_map_set(obj, NULL);
-   evas_object_grabs_cleanup(obj);
-   evas_object_intercept_cleanup(obj);
-   if (obj->smart.parent) was_smart_child = 1;
-   evas_object_smart_cleanup(obj);
-   obj->func->free(obj);
-   if (!was_smart_child) evas_object_release(obj, clean_layer);
-   if (obj->clip.clipees)
-     eina_list_free(obj->clip.clipees);
-   evas_object_clip_changes_clean(obj);
-   evas_object_event_callback_all_del(obj);
-   evas_object_event_callback_cleanup(obj);
-   while (obj->data.elements)
-     {
-        Evas_Data_Node *node;
-
-        node = obj->data.elements->data;
-        obj->data.elements = eina_list_remove(obj->data.elements, node);
-        free(node);
-     }
-   obj->magic = 0;
-   if (obj->size_hints)
-     {
-       EVAS_MEMPOOL_FREE(_mp_sh, obj->size_hints);
-     }
-   EVAS_MEMPOOL_FREE(_mp_obj, obj);
-}
-
-void
-evas_object_change(Evas_Object *obj)
-{
-   Eina_List *l;
-   Evas_Object *obj2;
-   Eina_Bool movch = 0;
-
-   if (obj->layer->evas->nochange)
-     {
-//        printf("nochange %p\n", obj);
-        return;
-     }
-//   else
-//      printf("ch %p\n", obj);
-   obj->layer->evas->changed = 1;
-   if (obj->changed_move)
-     {
-        movch = 1;
-        obj->changed_move = 0;
-        if (!obj->changed_nomove) obj->changed_move_only = 1;
-        if (obj->changed) return;
-     }
-   else
-     {
-        obj->changed_move_only = 0;
-        obj->changed_nomove = 1;
-        if (obj->changed) return;
-     }
-//   obj->changed = 1;
-   evas_render_object_recalc(obj);
-   /* set changed flag on all objects this one clips too */
-   if (!((movch) && (obj->is_static_clip)))
-     {
-        EINA_LIST_FOREACH(obj->clip.clipees, l, obj2) 
-          evas_object_change(obj2);
-     }
-   EINA_LIST_FOREACH(obj->proxy.proxies, l, obj2)
-     {
-        evas_object_change(obj2);
-     }
-   if (obj->smart.parent) evas_object_change(obj->smart.parent);
-}
-
-void
-evas_object_render_pre_visible_change(Eina_Array *rects, Evas_Object *obj, int is_v, int was_v)
-{
-   if (obj->smart.smart) return;
-   if (is_v == was_v) return;
-   if (is_v)
-     {
-        evas_add_rect(rects,
-                      obj->cur.cache.clip.x,
-                      obj->cur.cache.clip.y,
-                      obj->cur.cache.clip.w,
-                      obj->cur.cache.clip.h);
-     }
-   else
-     {
-        evas_add_rect(rects,
-                      obj->prev.cache.clip.x,
-                      obj->prev.cache.clip.y,
-                      obj->prev.cache.clip.w,
-                      obj->prev.cache.clip.h);
-     }
-}
-
-void
-evas_object_render_pre_clipper_change(Eina_Array *rects, Evas_Object *obj)
-{
-   if (obj->smart.smart) return;
-   if (obj->cur.clipper == obj->prev.clipper) return;
-   if ((obj->cur.clipper) && (obj->prev.clipper))
-     {
-        /* get difference rects between clippers */
-        evas_rects_return_difference_rects(rects,
-                                           obj->cur.clipper->cur.cache.clip.x,
-                                           obj->cur.clipper->cur.cache.clip.y,
-                                           obj->cur.clipper->cur.cache.clip.w,
-                                           obj->cur.clipper->cur.cache.clip.h,
-                                           obj->prev.clipper->prev.cache.clip.x,
-                                           obj->prev.clipper->prev.cache.clip.y,
-                                           obj->prev.clipper->prev.cache.clip.w,
-                                           obj->prev.clipper->prev.cache.clip.h);
-     }
-   else if (obj->cur.clipper)
-     {
-        evas_rects_return_difference_rects(rects,
-                                           obj->cur.geometry.x,
-                                           obj->cur.geometry.y,
-                                           obj->cur.geometry.w,
-                                           obj->cur.geometry.h,
-////    rl = evas_rects_return_difference_rects(obj->cur.cache.geometry.x,
-////                                            obj->cur.cache.geometry.y,
-////                                            obj->cur.cache.geometry.w,
-////                                            obj->cur.cache.geometry.h,
-                                           obj->cur.clipper->cur.cache.clip.x,
-                                           obj->cur.clipper->cur.cache.clip.y,
-                                           obj->cur.clipper->cur.cache.clip.w,
-                                           obj->cur.clipper->cur.cache.clip.h);
-     }
-   else if (obj->prev.clipper)
-     {
-     evas_rects_return_difference_rects(rects,
-                                        obj->prev.geometry.x,
-                                        obj->prev.geometry.y,
-                                        obj->prev.geometry.w,
-                                        obj->prev.geometry.h,
-////    rl = evas_rects_return_difference_rects(obj->prev.cache.geometry.x,
-////                                            obj->prev.cache.geometry.y,
-////                                            obj->prev.cache.geometry.w,
-////                                            obj->prev.cache.geometry.h,
-                                        obj->prev.clipper->prev.cache.clip.x,
-                                        obj->prev.clipper->prev.cache.clip.y,
-                                        obj->prev.clipper->prev.cache.clip.w,
-                                        obj->prev.clipper->prev.cache.clip.h);
-     }
-}
-
-void
-evas_object_render_pre_prev_cur_add(Eina_Array *rects, Evas_Object *obj)
-{
-   evas_add_rect(rects,
-                 obj->cur.cache.clip.x,
-                 obj->cur.cache.clip.y,
-                 obj->cur.cache.clip.w,
-                 obj->cur.cache.clip.h);
-   evas_add_rect(rects,
-                 obj->prev.cache.clip.x,
-                 obj->prev.cache.clip.y,
-                 obj->prev.cache.clip.w,
-                 obj->prev.cache.clip.h);
-/*        
-        evas_add_rect(rects,
-                      obj->cur.geometry.x,
-                      obj->cur.geometry.y,
-                      obj->cur.geometry.w,
-                      obj->cur.geometry.h);
-////        obj->cur.cache.geometry.x,
-////        obj->cur.cache.geometry.y,
-////        obj->cur.cache.geometry.w,
-////        obj->cur.cache.geometry.h);
-        evas_add_rect(rects,
-                      obj->prev.geometry.x,
-                      obj->prev.geometry.y,
-                      obj->prev.geometry.w,
-                      obj->prev.geometry.h);
-////        obj->prev.cache.geometry.x,
-////        obj->prev.cache.geometry.y,
-////        obj->prev.cache.geometry.w,
-////        obj->prev.cache.geometry.h);
-*/
-}
-
-void
-evas_object_clip_changes_clean(Evas_Object *obj)
-{
-   Eina_Rectangle *r;
-
-   EINA_LIST_FREE(obj->clip.changes, r) 
-     eina_rectangle_free(r);
-}
-
-void
-evas_object_render_pre_effect_updates(Eina_Array *rects, Evas_Object *obj, int is_v, int was_v __UNUSED__)
-{
-   Eina_Rectangle *r;
-   Evas_Object *clipper;
-   Eina_List *l;
-   unsigned int i;
-   Eina_Array_Iterator it;
-   int x, y, w, h;
-
-   if (obj->smart.smart) goto end;
-   /* FIXME: was_v isn't used... why? */
-   if (!obj->clip.clipees)
-     {
-        EINA_ARRAY_ITER_NEXT(rects, i, r, it)
-          {
-             /* get updates and clip to current clip */
-             x = r->x;
-             y = r->y;
-             w = r->w;
-             h = r->h;
-             RECTS_CLIP_TO_RECT(x, y, w, h,
-                                obj->cur.cache.clip.x,
-                                obj->cur.cache.clip.y,
-                                obj->cur.cache.clip.w,
-                                obj->cur.cache.clip.h);
-             if ((w > 0) && (h > 0))
-               obj->layer->evas->engine.func->output_redraws_rect_add(obj->layer->evas->engine.data.output,
-                                                                      x, y, w, h);
-             /* get updates and clip to previous clip */
-             x = r->x;
-             y = r->y;
-             w = r->w;
-             h = r->h;
-             RECTS_CLIP_TO_RECT(x, y, w, h,
-                                obj->prev.cache.clip.x,
-                                obj->prev.cache.clip.y,
-                                obj->prev.cache.clip.w,
-                                obj->prev.cache.clip.h);
-             if ((w > 0) && (h > 0))
-               obj->layer->evas->engine.func->output_redraws_rect_add(obj->layer->evas->engine.data.output,
-                                                                      x, y, w, h);
-          }
-        /* if the object is actually visible, take any parent clip changes */
-        if (is_v)
-          {
-             clipper = obj->cur.clipper;
-             while (clipper)
-               {
-                  EINA_LIST_FOREACH(clipper->clip.changes, l, r)
-                    {
-                       /* get updates and clip to current clip */
-                       x = r->x; y = r->y; w = r->w; h = r->h;
-                       RECTS_CLIP_TO_RECT(x, y, w, h,
-                                          obj->cur.cache.clip.x,
-                                          obj->cur.cache.clip.y,
-                                          obj->cur.cache.clip.w,
-                                          obj->cur.cache.clip.h);
-                       if ((w > 0) && (h > 0))
-                         obj->layer->evas->engine.func->output_redraws_rect_add(obj->layer->evas->engine.data.output,
-                                                                                x, y, w, h);
-                       /* get updates and clip to previous clip */
-                       x = r->x; y = r->y; w = r->w; h = r->h;
-                       RECTS_CLIP_TO_RECT(x, y, w, h,
-                                          obj->prev.cache.clip.x,
-                                          obj->prev.cache.clip.y,
-                                          obj->prev.cache.clip.w,
-                                          obj->prev.cache.clip.h);
-                       if ((w > 0) && (h > 0))
-                         obj->layer->evas->engine.func->output_redraws_rect_add(obj->layer->evas->engine.data.output,
-                                                                                x, y, w, h);
-                    }
-                  clipper = clipper->cur.clipper;
-               }
-          }
-     }
-   else
-     {
-        evas_object_clip_changes_clean(obj);
-        EINA_ARRAY_ITER_NEXT(rects, i, r, it)
-           obj->clip.changes = eina_list_append(obj->clip.changes, r);
-        eina_array_clean(rects);
-     }
-
- end:
-   EINA_ARRAY_ITER_NEXT(rects, i, r, it)
-     eina_rectangle_free(r);
-   eina_array_clean(rects);
-}
-
-int
-evas_object_was_in_output_rect(Evas_Object *obj, int x, int y, int w, int h)
-{
-   if (obj->smart.smart) return 0;
-   /* assumes coords have been recalced */
-   if ((RECTS_INTERSECT(x, y, w, h,
-                        obj->prev.cache.clip.x,
-                        obj->prev.cache.clip.y,
-                        obj->prev.cache.clip.w,
-                        obj->prev.cache.clip.h)))
-     return 1;
-   return 0;
-}
-
-int
-evas_object_was_opaque(Evas_Object *obj)
-{
-   if (obj->smart.smart) return 0;
-   if (obj->prev.cache.clip.a == 255)
-     {
-        if (obj->func->was_opaque)
-          return obj->func->was_opaque(obj);
-        return 1;
-     }
-   return 0;
-}
-
-int
-evas_object_is_inside(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
-{
-   if (obj->smart.smart) return 0;
-   if (obj->func->is_inside)
-     return obj->func->is_inside(obj, x, y);
-   return 0;
-}
-
-int
-evas_object_was_inside(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
-{
-   if (obj->smart.smart) return 0;
-   if (obj->func->was_inside)
-     return obj->func->was_inside(obj, x, y);
-   return 0;
-}
-/* routines apps will call */
-
-EAPI void
-evas_object_ref(Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   obj->ref++;
-   if (obj->ref == 0) obj->ref--;
-}
-
-EAPI void
-evas_object_unref(Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (obj->ref == 0) return;
-   obj->ref--;
-   if ((obj->del_ref) && (obj->ref == 0)) evas_object_del(obj);
-}
-
-EAPI void
-evas_object_del(Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-
-   if (obj->delete_me) return;
-
-   if (obj->ref > 0)
-     {
-        obj->del_ref = 1;
-        return;
-     }
-#ifdef EVAS_FRAME_QUEUING
-   evas_common_frameq_flush();
-#endif
-
-   evas_object_hide(obj);
-   if (obj->focused)
-     {
-        obj->focused = 0;
-        obj->layer->evas->focused = NULL;
-        _evas_object_event_new();
-        evas_object_event_callback_call(obj, EVAS_CALLBACK_FOCUS_OUT, NULL, _evas_event_counter);
-        _evas_post_event_callback_call(obj->layer->evas);
-     }
-   _evas_object_event_new();
-   evas_object_event_callback_call(obj, EVAS_CALLBACK_DEL, NULL, _evas_event_counter);
-   _evas_post_event_callback_call(obj->layer->evas);
-   if (obj->mouse_grabbed > 0)
-      obj->layer->evas->pointer.mouse_grabbed -= obj->mouse_grabbed;
-   if ((obj->mouse_in) || (obj->mouse_grabbed > 0))
-      obj->layer->evas->pointer.object.in = eina_list_remove(obj->layer->evas->pointer.object.in, obj);
-   obj->mouse_grabbed = 0;
-   obj->mouse_in = 0;
-   if (obj->name) evas_object_name_set(obj, NULL);
-   if (!obj->layer)
-     {
-        evas_object_free(obj, 1);
-        return;
-     }
-   evas_object_grabs_cleanup(obj);
-   while (obj->clip.clipees)
-     evas_object_clip_unset(obj->clip.clipees->data);
-   while (obj->proxy.proxies)
-     evas_object_image_source_unset(obj->proxy.proxies->data);
-   if (obj->cur.clipper) evas_object_clip_unset(obj);
-   if (obj->smart.smart) evas_object_smart_del(obj);
-   evas_object_map_set(obj, NULL);
-   _evas_object_event_new();
-   evas_object_event_callback_call(obj, EVAS_CALLBACK_FREE, NULL, _evas_event_counter);
-   _evas_post_event_callback_call(obj->layer->evas);
-   evas_object_smart_cleanup(obj);
-   obj->delete_me = 1;
-   evas_object_change(obj);
-}
-
-EAPI void
-evas_object_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
-{
-   int is, was = 0, pass = 0, freeze = 0;
-   int nx = 0, ny = 0;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (obj->delete_me) return;
-
-   nx = x;
-   ny = y;
-
-   if (!obj->is_frame) 
-     {
-        int fx, fy;
-
-        evas_output_framespace_get(obj->layer->evas, &fx, &fy, NULL, NULL);
-        if (!obj->smart.parent) 
-          {
-             nx += fx;
-             ny += fy;
-          }
-     }
-
-   if (evas_object_intercept_call_move(obj, nx, ny)) return;
-
-   if (obj->doing.in_move > 0)
-     {
-        WRN("evas_object_move() called on object %p when in the middle of moving the same object", obj);
-        return;
-     }
-
-   if ((obj->cur.geometry.x == nx) && (obj->cur.geometry.y == ny)) return;
-
-   if (obj->layer->evas->events_frozen <= 0)
-     {
-        pass = evas_event_passes_through(obj);
-        freeze = evas_event_freezes_through(obj);
-        if ((!pass) && (!freeze))
-          was = evas_object_is_in_output_rect(obj,
-                                              obj->layer->evas->pointer.x,
-                                              obj->layer->evas->pointer.y, 1, 1);
-     }
-   obj->doing.in_move++;
-
-   if (obj->smart.smart)
-     {
-        if (obj->smart.smart->smart_class->move)
-          obj->smart.smart->smart_class->move(obj, nx, ny);
-     }
-
-   obj->cur.geometry.x = nx;
-   obj->cur.geometry.y = ny;
-
-////   obj->cur.cache.geometry.validity = 0;
-   obj->changed_move = 1;
-   evas_object_change(obj);
-   evas_object_clip_dirty(obj);
-   obj->doing.in_move--;
-   if (obj->layer->evas->events_frozen <= 0)
-     {
-        evas_object_recalc_clippees(obj);
-        if (!pass)
-          {
-             if (!obj->smart.smart)
-               {
-                  is = evas_object_is_in_output_rect(obj,
-                                                     obj->layer->evas->pointer.x,
-                                                     obj->layer->evas->pointer.y, 1, 1);
-                  if ((is ^ was) && obj->cur.visible)
-                    evas_event_feed_mouse_move(obj->layer->evas,
-                                               obj->layer->evas->pointer.x,
-                                               obj->layer->evas->pointer.y,
-                                               obj->layer->evas->last_timestamp,
-                                               NULL);
-               }
-          }
-     }
-   evas_object_inform_call_move(obj);
-}
-
-EAPI void
-evas_object_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
-{
-   int is, was = 0, pass = 0, freeze =0;
-   int nw = 0, nh = 0;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (obj->delete_me) return;
-   if (w < 0) w = 0; if (h < 0) h = 0;
-
-   nw = w;
-   nh = h;
-   if (!obj->is_frame) 
-     {
-        int fw, fh;
-
-        evas_output_framespace_get(obj->layer->evas, NULL, NULL, &fw, &fh);
-        if (!obj->smart.parent) 
-          {
-             nw = w - fw;
-             nh = h - fh;
-             if (nw < 0) nw = 0;
-             if (nh < 0) nh = 0;
-          }
-     }
-
-   if (evas_object_intercept_call_resize(obj, nw, nh)) return;
-
-   if (obj->doing.in_resize > 0)
-     {
-        WRN("evas_object_resize() called on object %p when in the middle of resizing the same object", obj);
-        return;
-     }
-
-   if ((obj->cur.geometry.w == nw) && (obj->cur.geometry.h == nh)) return;
-
-   if (obj->layer->evas->events_frozen <= 0)
-     {
-        pass = evas_event_passes_through(obj);
-        freeze = evas_event_freezes_through(obj);
-        if ((!pass) && (!freeze))
-          was = evas_object_is_in_output_rect(obj,
-                                              obj->layer->evas->pointer.x,
-                                              obj->layer->evas->pointer.y, 1, 1);
-     }
-   obj->doing.in_resize++;
-
-   if (obj->smart.smart)
-     {
-       if (obj->smart.smart->smart_class->resize)
-          obj->smart.smart->smart_class->resize(obj, nw, nh);
-     }
-
-   obj->cur.geometry.w = nw;
-   obj->cur.geometry.h = nh;
-
-////   obj->cur.cache.geometry.validity = 0;
-   evas_object_change(obj);
-   evas_object_clip_dirty(obj);
-   obj->doing.in_resize--;
-   /* NB: evas_object_recalc_clippees was here previously ( < 08/07/2009) */
-   if (obj->layer->evas->events_frozen <= 0)
-     {
-        /* NB: If this creates glitches on screen then move to above position */
-        evas_object_recalc_clippees(obj);
-
-        //   if (obj->func->coords_recalc) obj->func->coords_recalc(obj);
-        if (!pass)
-          {
-             if (!obj->smart.smart)
-               {
-                  is = evas_object_is_in_output_rect(obj,
-                                                     obj->layer->evas->pointer.x,
-                                                     obj->layer->evas->pointer.y, 1, 1);
-                  if ((is ^ was) && (obj->cur.visible))
-                    evas_event_feed_mouse_move(obj->layer->evas,
-                                               obj->layer->evas->pointer.x,
-                                               obj->layer->evas->pointer.y,
-                                               obj->layer->evas->last_timestamp,
-                                               NULL);
-               }
-          }
-     }
-   evas_object_inform_call_resize(obj);
-}
-
-EAPI void
-evas_object_geometry_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   if (x) *x = 0; if (y) *y = 0; if (w) *w = 0; if (h) *h = 0;
-   return;
-   MAGIC_CHECK_END();
-   if (obj->delete_me)
-     {
-        if (x) *x = 0; if (y) *y = 0; if (w) *w = 0; if (h) *h = 0;
-        return;
-     }
-
-   if (x) *x = obj->cur.geometry.x;
-   if (y) *y = obj->cur.geometry.y;
-   if (w) *w = obj->cur.geometry.w;
-   if (h) *h = obj->cur.geometry.h;
-}
-
-static void
-_evas_object_size_hint_alloc(Evas_Object *obj)
-{
-   if (obj->size_hints) return;
-
-   EVAS_MEMPOOL_INIT(_mp_sh, "evas_size_hints", Evas_Size_Hints, 512, );
-   obj->size_hints = EVAS_MEMPOOL_ALLOC(_mp_sh, Evas_Size_Hints);
-   if (!obj->size_hints) return;
-   EVAS_MEMPOOL_PREP(_mp_sh, obj->size_hints, Evas_Size_Hints);
-   obj->size_hints->max.w = -1;
-   obj->size_hints->max.h = -1;
-   obj->size_hints->align.x = 0.5;
-   obj->size_hints->align.y = 0.5;
-}
-
-EAPI void
-evas_object_size_hint_min_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   if (w) *w = 0; if (h) *h = 0;
-   return;
-   MAGIC_CHECK_END();
-   if ((!obj->size_hints) || obj->delete_me)
-     {
-        if (w) *w = 0; if (h) *h = 0;
-        return;
-     }
-   if (w) *w = obj->size_hints->min.w;
-   if (h) *h = obj->size_hints->min.h;
-}
-
-EAPI void
-evas_object_size_hint_min_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (obj->delete_me)
-     return;
-   _evas_object_size_hint_alloc(obj);
-   if ((obj->size_hints->min.w == w) && (obj->size_hints->min.h == h)) return;
-   obj->size_hints->min.w = w;
-   obj->size_hints->min.h = h;
-
-   evas_object_inform_call_changed_size_hints(obj);
-}
-
-EAPI void
-evas_object_size_hint_max_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   if (w) *w = -1; if (h) *h = -1;
-   return;
-   MAGIC_CHECK_END();
-   if ((!obj->size_hints) || obj->delete_me)
-     {
-        if (w) *w = -1; if (h) *h = -1;
-        return;
-     }
-   if (w) *w = obj->size_hints->max.w;
-   if (h) *h = obj->size_hints->max.h;
-}
-
-EAPI void
-evas_object_size_hint_max_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (obj->delete_me)
-     return;
-   _evas_object_size_hint_alloc(obj);
-   if ((obj->size_hints->max.w == w) && (obj->size_hints->max.h == h)) return;
-   obj->size_hints->max.w = w;
-   obj->size_hints->max.h = h;
-
-   evas_object_inform_call_changed_size_hints(obj);
-}
-
-EAPI void
-evas_object_size_hint_request_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   if (w) *w = 0; if (h) *h = 0;
-   return;
-   MAGIC_CHECK_END();
-   if ((!obj->size_hints) || obj->delete_me)
-     {
-        if (w) *w = 0; if (h) *h = 0;
-        return;
-     }
-   if (w) *w = obj->size_hints->request.w;
-   if (h) *h = obj->size_hints->request.h;
-}
-
-EAPI void
-evas_object_size_hint_request_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (obj->delete_me)
-     return;
-   _evas_object_size_hint_alloc(obj);
-   if ((obj->size_hints->request.w == w) && (obj->size_hints->request.h == h)) return;
-   obj->size_hints->request.w = w;
-   obj->size_hints->request.h = h;
-
-   evas_object_inform_call_changed_size_hints(obj);
-}
-
-EAPI void
-evas_object_size_hint_aspect_get(const Evas_Object *obj, Evas_Aspect_Control *aspect, Evas_Coord *w, Evas_Coord *h)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   if (aspect) *aspect = EVAS_ASPECT_CONTROL_NONE;
-   if (w) *w = 0; if (h) *h = 0;
-   return;
-   MAGIC_CHECK_END();
-   if ((!obj->size_hints) || obj->delete_me)
-     {
-        if (aspect) *aspect = EVAS_ASPECT_CONTROL_NONE;
-        if (w) *w = 0; if (h) *h = 0;
-        return;
-     }
-   if (aspect) *aspect = obj->size_hints->aspect.mode;
-   if (w) *w = obj->size_hints->aspect.size.w;
-   if (h) *h = obj->size_hints->aspect.size.h;
-}
-
-EAPI void
-evas_object_size_hint_aspect_set(Evas_Object *obj, Evas_Aspect_Control aspect, Evas_Coord w, Evas_Coord h)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (obj->delete_me)
-     return;
-   _evas_object_size_hint_alloc(obj);
-   if ((obj->size_hints->aspect.mode == aspect) && (obj->size_hints->aspect.size.w == w) && (obj->size_hints->aspect.size.h == h)) return;
-   obj->size_hints->aspect.mode = aspect;
-   obj->size_hints->aspect.size.w = w;
-   obj->size_hints->aspect.size.h = h;
-
-   evas_object_inform_call_changed_size_hints(obj);
-}
-
-EAPI void
-evas_object_size_hint_align_get(const Evas_Object *obj, double *x, double *y)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   if (x) *x = 0.5; if (y) *y = 0.5;
-   return;
-   MAGIC_CHECK_END();
-   if ((!obj->size_hints) || obj->delete_me)
-     {
-        if (x) *x = 0.5; if (y) *y = 0.5;
-        return;
-     }
-   if (x) *x = obj->size_hints->align.x;
-   if (y) *y = obj->size_hints->align.y;
-}
-
-EAPI void
-evas_object_size_hint_align_set(Evas_Object *obj, double x, double y)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (obj->delete_me)
-     return;
-   _evas_object_size_hint_alloc(obj);
-   if ((obj->size_hints->align.x == x) && (obj->size_hints->align.y == y)) return;
-   obj->size_hints->align.x = x;
-   obj->size_hints->align.y = y;
-
-   evas_object_inform_call_changed_size_hints(obj);
-}
-
-EAPI void
-evas_object_size_hint_weight_get(const Evas_Object *obj, double *x, double *y)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   if (x) *x = 0.0; if (y) *y = 0.0;
-   return;
-   MAGIC_CHECK_END();
-   if ((!obj->size_hints) || obj->delete_me)
-     {
-        if (x) *x = 0.0; if (y) *y = 0.0;
-        return;
-     }
-   if (x) *x = obj->size_hints->weight.x;
-   if (y) *y = obj->size_hints->weight.y;
-}
-
-EAPI void
-evas_object_size_hint_weight_set(Evas_Object *obj, double x, double y)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (obj->delete_me)
-     return;
-   _evas_object_size_hint_alloc(obj);
-   if ((obj->size_hints->weight.x == x) && (obj->size_hints->weight.y == y)) return;
-   obj->size_hints->weight.x = x;
-   obj->size_hints->weight.y = y;
-
-   evas_object_inform_call_changed_size_hints(obj);
-}
-
-EAPI void
-evas_object_size_hint_padding_get(const Evas_Object *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   if (l) *l = 0; if (r) *r = 0;
-   if (t) *t = 0; if (b) *b = 0;
-   return;
-   MAGIC_CHECK_END();
-   if ((!obj->size_hints) || obj->delete_me)
-     {
-        if (l) *l = 0; if (r) *r = 0;
-        if (t) *t = 0; if (b) *b = 0;
-        return;
-     }
-   if (l) *l = obj->size_hints->padding.l;
-   if (r) *r = obj->size_hints->padding.r;
-   if (t) *t = obj->size_hints->padding.t;
-   if (b) *b = obj->size_hints->padding.b;
-}
-
-EAPI void
-evas_object_size_hint_padding_set(Evas_Object *obj, Evas_Coord l, Evas_Coord r, Evas_Coord t, Evas_Coord b)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (obj->delete_me)
-     return;
-   _evas_object_size_hint_alloc(obj);
-   if ((obj->size_hints->padding.l == l) && (obj->size_hints->padding.r == r) && (obj->size_hints->padding.t == t) && (obj->size_hints->padding.b == b)) return;
-   obj->size_hints->padding.l = l;
-   obj->size_hints->padding.r = r;
-   obj->size_hints->padding.t = t;
-   obj->size_hints->padding.b = b;
-
-   evas_object_inform_call_changed_size_hints(obj);
-}
-
-EAPI void
-evas_object_show(Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (obj->delete_me) return;
-   if (evas_object_intercept_call_show(obj)) return;
-   if (obj->smart.smart)
-     {
-       if (obj->smart.smart->smart_class->show)
-         obj->smart.smart->smart_class->show(obj);
-     }
-   if (obj->cur.visible)
-     {
-        return;
-     }
-   obj->cur.visible = 1;
-   evas_object_change(obj);
-   evas_object_clip_dirty(obj);
-   if (obj->layer->evas->events_frozen <= 0)
-     {
-        evas_object_clip_across_clippees_check(obj);
-        evas_object_recalc_clippees(obj);
-        if ((!evas_event_passes_through(obj)) &&
-            (!evas_event_freezes_through(obj)))
-          {
-             if (!obj->smart.smart)
-               {
-                  if (evas_object_is_in_output_rect(obj,
-                                                    obj->layer->evas->pointer.x,
-                                                    obj->layer->evas->pointer.y, 1, 1))
-                    evas_event_feed_mouse_move(obj->layer->evas,
-                                               obj->layer->evas->pointer.x,
-                                               obj->layer->evas->pointer.y,
-                                               obj->layer->evas->last_timestamp,
-                                               NULL);
-               }
-          }
-     }
-   evas_object_inform_call_show(obj);
-}
-
-EAPI void
-evas_object_hide(Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (obj->delete_me) return;
-   if (evas_object_intercept_call_hide(obj)) return;
-   if (obj->smart.smart)
-     {
-       if (obj->smart.smart->smart_class->hide)
-         obj->smart.smart->smart_class->hide(obj);
-     }
-   if (!obj->cur.visible)
-     {
-        return;
-     }
-   obj->cur.visible = 0;
-   evas_object_change(obj);
-   evas_object_clip_dirty(obj);
-   if (obj->layer->evas->events_frozen <= 0)
-     {
-        evas_object_clip_across_clippees_check(obj);
-        evas_object_recalc_clippees(obj);
-        if ((!evas_event_passes_through(obj)) &&
-            (!evas_event_freezes_through(obj)))
-          {
-             if ((!obj->smart.smart) ||
-                 ((obj->cur.map) && (obj->cur.map->count == 4) && (obj->cur.usemap)))
-               {
-                  if (!obj->mouse_grabbed)
-                    {
-                       if (evas_object_is_in_output_rect(obj,
-                                                         obj->layer->evas->pointer.x,
-                                                         obj->layer->evas->pointer.y, 1, 1))
-                          evas_event_feed_mouse_move(obj->layer->evas,
-                                                     obj->layer->evas->pointer.x,
-                                                     obj->layer->evas->pointer.y,
-                                                     obj->layer->evas->last_timestamp,
-                                                     NULL);
-                    }
-/* this is at odds to handling events when an obj is moved out of the mouse
- * ore resized out or clipped out. if mouse is grabbed - regardless of
- * visibility, mouse move events should keep happening and mouse up.
- * for better or worse it's at least consistent.
-                  if (obj->delete_me) return;
-                  if (obj->mouse_grabbed > 0)
-                    obj->layer->evas->pointer.mouse_grabbed -= obj->mouse_grabbed;
-                  if ((obj->mouse_in) || (obj->mouse_grabbed > 0))
-                    obj->layer->evas->pointer.object.in = eina_list_remove(obj->layer->evas->pointer.object.in, obj);
-                  obj->mouse_grabbed = 0;
-                  if (obj->layer->evas->events_frozen > 0)
-                    {
-                       obj->mouse_in = 0;
-                       return;
-                    }
-                  if (obj->mouse_in)
-                    {
-                       Evas_Event_Mouse_Out ev;
-
-                       _evas_object_event_new();
-
-                       obj->mouse_in = 0;
-                       ev.buttons = obj->layer->evas->pointer.button;
-                       ev.output.x = obj->layer->evas->pointer.x;
-                       ev.output.y = obj->layer->evas->pointer.y;
-                       ev.canvas.x = obj->layer->evas->pointer.x;
-                       ev.canvas.y = obj->layer->evas->pointer.y;
-                       ev.data = NULL;
-                       ev.modifiers = &(obj->layer->evas->modifiers);
-                       ev.locks = &(obj->layer->evas->locks);
-                       ev.timestamp = obj->layer->evas->last_timestamp;
-                       ev.event_flags = EVAS_EVENT_FLAG_NONE;
-                       evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev);
-                       _evas_post_event_callback_call(obj->layer->evas);
-                    }
- */
-               }
-          }
-     }
-   else
-     {
-/*        
-        if (obj->mouse_grabbed > 0)
-          obj->layer->evas->pointer.mouse_grabbed -= obj->mouse_grabbed;
-        if ((obj->mouse_in) || (obj->mouse_grabbed > 0))
-          obj->layer->evas->pointer.object.in = eina_list_remove(obj->layer->evas->pointer.object.in, obj);
-        obj->mouse_grabbed = 0;
-        obj->mouse_in = 0;
- */
-     }
-   evas_object_inform_call_hide(obj);
-}
-
-EAPI Eina_Bool
-evas_object_visible_get(const Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   if (obj->delete_me) return 0;
-   return obj->cur.visible;
-}
-
-EAPI void
-evas_object_color_set(Evas_Object *obj, int r, int g, int b, int a)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (obj->delete_me) return;
-   if (r > 255) r = 255; if (r < 0) r = 0;
-   if (g > 255) g = 255; if (g < 0) g = 0;
-   if (b > 255) b = 255; if (b < 0) b = 0;
-   if (a > 255) a = 255; if (a < 0) a = 0;
-   if (r > a)
-     {
-        r = a;
-        ERR("Evas only handle pre multiplied color !");
-     }
-   if (g > a)
-     {
-        g = a;
-        ERR("Evas only handle pre multiplied color !");
-     }
-   if (b > a)
-     {
-        b = a;
-        ERR("Evas only handle pre multiplied color !");
-     }
-
-   if (evas_object_intercept_call_color_set(obj, r, g, b, a)) return;
-   if (obj->smart.smart)
-     {
-       if (obj->smart.smart->smart_class->color_set)
-         obj->smart.smart->smart_class->color_set(obj, r, g, b, a);
-     }
-   if ((obj->cur.color.r == r) &&
-       (obj->cur.color.g == g) &&
-       (obj->cur.color.b == b) &&
-       (obj->cur.color.a == a)) return;
-   obj->cur.color.r = r;
-   obj->cur.color.g = g;
-   obj->cur.color.b = b;
-   evas_object_clip_dirty(obj);
-   if ((obj->cur.color.a == 0) && (a == 0) && (obj->cur.render_op == EVAS_RENDER_BLEND)) return;
-   obj->cur.color.a = a;
-   evas_object_change(obj);
-}
-
-EAPI void
-evas_object_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   if (r) *r = 0; if (g) *g = 0; if (b) *b = 0; if (a) *a = 0;
-   return;
-   MAGIC_CHECK_END();
-   if (obj->delete_me)
-     {
-        if (r) *r = 0; if (g) *g = 0; if (b) *b = 0; if (a) *a = 0;
-        return;
-     }
-   if (r) *r = obj->cur.color.r;
-   if (g) *g = obj->cur.color.g;
-   if (b) *b = obj->cur.color.b;
-   if (a) *a = obj->cur.color.a;
-}
-
-EAPI void
-evas_object_anti_alias_set(Evas_Object *obj, Eina_Bool anti_alias)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (obj->delete_me) return;
-   anti_alias = !!anti_alias;
-   if (obj->cur.anti_alias == anti_alias)return;
-   obj->cur.anti_alias = anti_alias;
-   evas_object_change(obj);
-}
-
-EAPI Eina_Bool
-evas_object_anti_alias_get(const Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   if (obj->delete_me) return 0;
-   return obj->cur.anti_alias;
-}
-
-EAPI void
-evas_object_scale_set(Evas_Object *obj, double scale)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (obj->delete_me) return;
-   if (obj->cur.scale == scale) return;
-   obj->cur.scale = scale;
-   evas_object_change(obj);
-   if (obj->func->scale_update) obj->func->scale_update(obj);
-}
-
-EAPI double
-evas_object_scale_get(const Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   if (obj->delete_me) return 1.0;
-   return obj->cur.scale;
-}
-
-EAPI void
-evas_object_render_op_set(Evas_Object *obj, Evas_Render_Op render_op)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (obj->delete_me) return;
-   if (obj->cur.render_op == render_op) return;
-   obj->cur.render_op = render_op;
-   evas_object_change(obj);
-}
-
-EAPI Evas_Render_Op
-evas_object_render_op_get(const Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   if (obj->delete_me) return EVAS_RENDER_BLEND;
-   return obj->cur.render_op;
-}
-
-EAPI Evas *
-evas_object_evas_get(const Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   if (obj->delete_me) return NULL;
-   return obj->layer->evas;
-}
-
-EAPI Evas_Object *
-evas_object_top_at_xy_get(const Evas *e, Evas_Coord x, Evas_Coord y, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects)
-{
-   Evas_Layer *lay;
-   int xx, yy;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return NULL;
-   MAGIC_CHECK_END();
-   xx = x;
-   yy = y;
-////   xx = evas_coord_world_x_to_screen(e, x);
-////   yy = evas_coord_world_y_to_screen(e, y);
-   EINA_INLIST_REVERSE_FOREACH((EINA_INLIST_GET(e->layers)), lay)
-     {
-        Evas_Object *obj;
-
-        EINA_INLIST_REVERSE_FOREACH(get_layer_objects(lay), obj)
-          {
-             if (obj->delete_me) continue;
-             if ((!include_pass_events_objects) &&
-                 (evas_event_passes_through(obj))) continue;
-             if ((!include_hidden_objects) && (!obj->cur.visible)) continue;
-             evas_object_clip_recalc(obj);
-             if ((evas_object_is_in_output_rect(obj, xx, yy, 1, 1)) &&
-                 (!obj->clip.clipees))
-               return obj;
-          }
-     }
-   return NULL;
-}
-
-EAPI Evas_Object *
-evas_object_top_at_pointer_get(const Evas *e)
-{
-   return evas_object_top_at_xy_get(e, e->pointer.x, e->pointer.y, EINA_TRUE,
-                                    EINA_TRUE);
-}
-
-EAPI Evas_Object *
-evas_object_top_in_rectangle_get(const Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects)
-{
-   Evas_Layer *lay;
-   int xx, yy, ww, hh;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return NULL;
-   MAGIC_CHECK_END();
-   xx = x;
-   yy = y;
-   ww = w;
-   hh = h;
-////   xx = evas_coord_world_x_to_screen(e, x);
-////   yy = evas_coord_world_y_to_screen(e, y);
-////   ww = evas_coord_world_x_to_screen(e, w);
-////   hh = evas_coord_world_y_to_screen(e, h);
-   if (ww < 1) ww = 1;
-   if (hh < 1) hh = 1;
-   EINA_INLIST_REVERSE_FOREACH((EINA_INLIST_GET(e->layers)), lay)
-     {
-        Evas_Object *obj;
-
-        EINA_INLIST_REVERSE_FOREACH(get_layer_objects(lay), obj)
-          {
-             if (obj->delete_me) continue;
-             if ((!include_pass_events_objects) &&
-                 (evas_event_passes_through(obj))) continue;
-             if ((!include_hidden_objects) && (!obj->cur.visible)) continue;
-             evas_object_clip_recalc(obj);
-             if ((evas_object_is_in_output_rect(obj, xx, yy, ww, hh)) &&
-                 (!obj->clip.clipees))
-               return obj;
-          }
-     }
-   return NULL;
-}
-
-EAPI Eina_List *
-evas_objects_at_xy_get(const Evas *e, Evas_Coord x, Evas_Coord y, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects)
-{
-   Eina_List *in = NULL;
-   Evas_Layer *lay;
-   int xx, yy;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return NULL;
-   MAGIC_CHECK_END();
-   xx = x;
-   yy = y;
-////   xx = evas_coord_world_x_to_screen(e, x);
-////   yy = evas_coord_world_y_to_screen(e, y);
-   EINA_INLIST_REVERSE_FOREACH((EINA_INLIST_GET(e->layers)), lay)
-     {
-        Evas_Object *obj;
-
-        EINA_INLIST_REVERSE_FOREACH(get_layer_objects(lay), obj)
-          {
-             if (obj->delete_me) continue;
-             if ((!include_pass_events_objects) &&
-                 (evas_event_passes_through(obj))) continue;
-             if ((!include_hidden_objects) && (!obj->cur.visible)) continue;
-             evas_object_clip_recalc(obj);
-             if ((evas_object_is_in_output_rect(obj, xx, yy, 1, 1)) &&
-                 (!obj->clip.clipees))
-               in = eina_list_prepend(in, obj);
-          }
-     }
-   return in;
-}
-
-/**
- * Retrieves the objects in the given rectangle region
- * @param   e The given evas object.
- * @param   x The horizontal coordinate.
- * @param   y The vertical coordinate.
- * @param   w The width size.
- * @param   h The height size.
- * @param   include_pass_events_objects Boolean Flag to include or not pass events objects
- * @param   include_hidden_objects Boolean Flag to include or not hidden objects
- * @return  The list of evas object in the rectangle region.
- *
- */
-EAPI Eina_List *
-evas_objects_in_rectangle_get(const Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects)
-{
-   Eina_List *in = NULL;
-   Evas_Layer *lay;
-   int xx, yy, ww, hh;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return NULL;
-   MAGIC_CHECK_END();
-   xx = x;
-   yy = y;
-   ww = w;
-   hh = h;
-////   xx = evas_coord_world_x_to_screen(e, x);
-////   yy = evas_coord_world_y_to_screen(e, y);
-////   ww = evas_coord_world_x_to_screen(e, w);
-////   hh = evas_coord_world_y_to_screen(e, h);
-   if (ww < 1) ww = 1;
-   if (hh < 1) hh = 1;
-   EINA_INLIST_REVERSE_FOREACH((EINA_INLIST_GET(e->layers)), lay)
-     {
-        Evas_Object *obj;
-
-        EINA_INLIST_REVERSE_FOREACH(get_layer_objects(lay), obj)
-          {
-             if (obj->delete_me) continue;
-             if ((!include_pass_events_objects) &&
-                 (evas_event_passes_through(obj))) continue;
-             if ((!include_hidden_objects) && (!obj->cur.visible)) continue;
-             evas_object_clip_recalc(obj);
-             if ((evas_object_is_in_output_rect(obj, xx, yy, ww, hh)) &&
-                 (!obj->clip.clipees))
-               in = eina_list_prepend(in, obj);
-          }
-     }
-   return in;
-}
-
-EAPI const char *
-evas_object_type_get(const Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   if (obj->delete_me) return "";
-   return obj->type;
-}
-
-EAPI void
-evas_object_precise_is_inside_set(Evas_Object *obj, Eina_Bool precise)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   obj->precise_is_inside = precise;
-}
-
-EAPI Eina_Bool
-evas_object_precise_is_inside_get(const Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   return obj->precise_is_inside;
-}
-
-EAPI void
-evas_object_static_clip_set(Evas_Object *obj, Eina_Bool is_static_clip)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   obj->is_static_clip = is_static_clip;
-}
-
-EAPI Eina_Bool
-evas_object_static_clip_get(const Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   return obj->is_static_clip;
-}
-
-EAPI void 
-evas_object_is_frame_object_set(Evas_Object *obj, Eina_Bool is_frame) 
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   obj->is_frame = is_frame;
-}
-
-EAPI Eina_Bool 
-evas_object_is_frame_object_get(Evas_Object *obj) 
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-   return obj->is_frame;
-}
diff --git a/libraries/evas/src/lib/canvas/evas_object_polygon.c b/libraries/evas/src/lib/canvas/evas_object_polygon.c
deleted file mode 100644
index cbc1802..0000000
--- a/libraries/evas/src/lib/canvas/evas_object_polygon.c
+++ /dev/null
@@ -1,554 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-
-/* private magic number for polygon objects */
-static const char o_type[] = "polygon";
-
-/* private struct for line object internal data */
-typedef struct _Evas_Object_Polygon      Evas_Object_Polygon;
-typedef struct _Evas_Polygon_Point       Evas_Polygon_Point;
-
-struct _Evas_Object_Polygon
-{
-   DATA32               magic;
-   Eina_List           *points;
-   void                *engine_data;
-   struct {
-      int x, y;
-   } offset;
-   Evas_Coord_Rectangle geometry;
-   char                 changed : 1;
-};
-
-struct _Evas_Polygon_Point
-{
-   Evas_Coord x, y;
-};
-
-/* private methods for polygon objects */
-static void evas_object_polygon_init(Evas_Object *obj);
-static void *evas_object_polygon_new(void);
-static void evas_object_polygon_render(Evas_Object *obj, void *output, void *context, void *surface, int x, int y);
-static void evas_object_polygon_free(Evas_Object *obj);
-static void evas_object_polygon_render_pre(Evas_Object *obj);
-static void evas_object_polygon_render_post(Evas_Object *obj);
-
-static unsigned int evas_object_polygon_id_get(Evas_Object *obj);
-static unsigned int evas_object_polygon_visual_id_get(Evas_Object *obj);
-static void *evas_object_polygon_engine_data_get(Evas_Object *obj);
-
-static int evas_object_polygon_is_opaque(Evas_Object *obj);
-static int evas_object_polygon_was_opaque(Evas_Object *obj);
-static int evas_object_polygon_is_inside(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
-static int evas_object_polygon_was_inside(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
-
-static const Evas_Object_Func object_func =
-{
-   /* methods (compulsory) */
-   evas_object_polygon_free,
-     evas_object_polygon_render,
-     evas_object_polygon_render_pre,
-     evas_object_polygon_render_post,
-     evas_object_polygon_id_get,
-     evas_object_polygon_visual_id_get,
-     evas_object_polygon_engine_data_get,
-   /* these are optional. NULL = nothing */
-     NULL,
-     NULL,
-     NULL,
-     NULL,
-     evas_object_polygon_is_opaque,
-     evas_object_polygon_was_opaque,
-     evas_object_polygon_is_inside,
-     evas_object_polygon_was_inside,
-     NULL,
-     NULL,
-     NULL,
-     NULL,
-     NULL
-};
-
-/* the actual api call to add a rect */
-/* it has no other api calls as all properties are standard */
-
-EVAS_MEMPOOL(_mp_obj);
-
-EAPI Evas_Object *
-evas_object_polygon_add(Evas *e)
-{
-   Evas_Object *obj;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return NULL;
-   MAGIC_CHECK_END();
-   obj = evas_object_new(e);
-   evas_object_polygon_init(obj);
-   evas_object_inject(obj, e);
-   return obj;
-}
-
-EAPI void
-evas_object_polygon_point_add(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
-{
-   Evas_Object_Polygon *o;
-   Evas_Polygon_Point *p;
-   Evas_Coord min_x, max_x, min_y, max_y;
-   int is, was = 0;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Polygon *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Polygon, MAGIC_OBJ_POLYGON);
-   return;
-   MAGIC_CHECK_END();
-
-   if (obj->layer->evas->events_frozen <= 0)
-     {
-        if (!evas_event_passes_through(obj) &&
-            !evas_event_freezes_through(obj))
-          was = evas_object_is_in_output_rect(obj,
-                                              obj->layer->evas->pointer.x,
-                                              obj->layer->evas->pointer.y,
-                                              1, 1);
-     }
-   if (!o->points)
-     {
-        o->offset.x = obj->cur.geometry.x;
-        o->offset.y = obj->cur.geometry.y;
-     }
-   else
-     {
-        /* Update all points and take offset into account. */
-        Eina_List *over;
-
-        EINA_LIST_FOREACH(o->points, over, p)
-          {
-             p->x += o->offset.x;
-             p->y += o->offset.y;
-          }
-     }
-
-   p = malloc(sizeof(Evas_Polygon_Point));
-   if (!p) return;
-   p->x = x + o->offset.x;
-   p->y = y + o->offset.y;
-
-   if (!o->points)
-     {
-        obj->cur.geometry.x = p->x;
-        obj->cur.geometry.y = p->y;
-        obj->cur.geometry.w = 2;
-        obj->cur.geometry.h = 2;
-     }
-   else
-     {
-        if (p->x < obj->cur.geometry.x) min_x = p->x;
-        else min_x = obj->cur.geometry.x;
-        if (p->x > (obj->cur.geometry.x + obj->cur.geometry.w - 2))
-          max_x = p->x;
-        else max_x = obj->cur.geometry.x + obj->cur.geometry.w - 2;
-        if (p->y < obj->cur.geometry.y) min_y = p->y;
-        else min_y = obj->cur.geometry.y;
-        if (p->y > (obj->cur.geometry.y + obj->cur.geometry.h - 2))
-          max_y = p->y;
-        else max_y = obj->cur.geometry.y + obj->cur.geometry.h - 2;
-        obj->cur.geometry.x = min_x;
-        obj->cur.geometry.y = min_y;
-        obj->cur.geometry.w = max_x - min_x + 2;
-        obj->cur.geometry.h = max_y - min_y + 2;
-     }
-   o->points = eina_list_append(o->points, p);
-
-   o->geometry = obj->cur.geometry;
-   o->offset.x = 0;
-   o->offset.y = 0;
-
-   ////   obj->cur.cache.geometry.validity = 0;
-   o->changed = EINA_TRUE;
-   evas_object_change(obj);
-   evas_object_clip_dirty(obj);
-   evas_object_coords_recalc(obj);
-   if (obj->layer->evas->events_frozen <= 0)
-     {
-        is = evas_object_is_in_output_rect(obj,
-                                           obj->layer->evas->pointer.x,
-                                           obj->layer->evas->pointer.y, 1, 1);
-        if (!evas_event_passes_through(obj) &&
-            !evas_event_freezes_through(obj) )
-          {
-             if ((is ^ was) && obj->cur.visible)
-               evas_event_feed_mouse_move(obj->layer->evas,
-                                          obj->layer->evas->pointer.x,
-                                          obj->layer->evas->pointer.y,
-                                          obj->layer->evas->last_timestamp,
-                                          NULL);
-          }
-     }
-   evas_object_inform_call_move(obj);
-   evas_object_inform_call_resize(obj);
-}
-
-EAPI void
-evas_object_polygon_points_clear(Evas_Object *obj)
-{
-   Evas_Object_Polygon *o;
-   int is, was;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Polygon *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Polygon, MAGIC_OBJ_POLYGON);
-   return;
-   MAGIC_CHECK_END();
-   was = evas_object_is_in_output_rect(obj,
-                                       obj->layer->evas->pointer.x,
-                                       obj->layer->evas->pointer.y, 1, 1);
-   while (o->points)
-     {
-        free(o->points->data);
-        o->points = eina_list_remove(o->points, o->points->data);
-     }
-   obj->cur.geometry.x = 0;
-   obj->cur.geometry.y = 0;
-   obj->cur.geometry.w = 0;
-   obj->cur.geometry.h = 0;
-   ////   obj->cur.cache.geometry.validity = 0;
-   o->changed = EINA_TRUE;
-   evas_object_change(obj);
-   evas_object_clip_dirty(obj);
-   evas_object_coords_recalc(obj);
-   is = evas_object_is_in_output_rect(obj,
-                                      obj->layer->evas->pointer.x,
-                                      obj->layer->evas->pointer.y, 1, 1);
-   if ((is || was) && obj->cur.visible)
-     evas_event_feed_mouse_move(obj->layer->evas,
-                                obj->layer->evas->pointer.x,
-                                obj->layer->evas->pointer.y,
-                                obj->layer->evas->last_timestamp,
-                                NULL);
-   evas_object_inform_call_move(obj);
-   evas_object_inform_call_resize(obj);
-}
-
-/* all nice and private */
-static void
-evas_object_polygon_init(Evas_Object *obj)
-{
-   /* alloc image ob, setup methods and default values */
-   obj->object_data = evas_object_polygon_new();
-   /* set up default settings for this kind of object */
-   obj->cur.color.r = 255;
-   obj->cur.color.g = 255;
-   obj->cur.color.b = 255;
-   obj->cur.color.a = 255;
-   obj->cur.geometry.x = 0;
-   obj->cur.geometry.y = 0;
-   obj->cur.geometry.w = 0;
-   obj->cur.geometry.h = 0;
-   obj->cur.layer = 0;
-   /* set up object-specific settings */
-   obj->prev = obj->cur;
-   /* set up methods (compulsory) */
-   obj->func = &object_func;
-   obj->type = o_type;
-}
-
-static void *
-evas_object_polygon_new(void)
-{
-   Evas_Object_Polygon *o;
-
-   /* alloc obj private data */
-   EVAS_MEMPOOL_INIT(_mp_obj, "evas_object_polygon", Evas_Object_Polygon, 32, NULL);
-   o = EVAS_MEMPOOL_ALLOC(_mp_obj, Evas_Object_Polygon);
-   if (!o) return NULL;
-   EVAS_MEMPOOL_PREP(_mp_obj, o, Evas_Object_Polygon);
-   o->magic = MAGIC_OBJ_POLYGON;
-   return o;
-}
-
-static void
-evas_object_polygon_free(Evas_Object *obj)
-{
-   Evas_Object_Polygon *o;
-
-   /* frees private object data. very simple here */
-   o = (Evas_Object_Polygon *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Polygon, MAGIC_OBJ_POLYGON);
-   return;
-   MAGIC_CHECK_END();
-   /* free obj */
-   while (o->points)
-     {
-        free(o->points->data);
-        o->points = eina_list_remove(o->points, o->points->data);
-     }
-   o->engine_data = obj->layer->evas->engine.func->polygon_points_clear(obj->layer->evas->engine.data.output,
-                                                                        obj->layer->evas->engine.data.context,
-                                                                        o->engine_data);
-   o->magic = 0;
-   EVAS_MEMPOOL_FREE(_mp_obj, o);
-}
-
-static void
-evas_object_polygon_render(Evas_Object *obj, void *output, void *context, void *surface, int x, int y)
-{
-   Evas_Object_Polygon *o;
-   Eina_List *l;
-   Evas_Polygon_Point *p;
-
-   /* render object to surface with context, and offxet by x,y */
-   o = (Evas_Object_Polygon *)(obj->object_data);
-   obj->layer->evas->engine.func->context_color_set(output,
-                                                    context,
-                                                    obj->cur.cache.clip.r,
-                                                    obj->cur.cache.clip.g,
-                                                    obj->cur.cache.clip.b,
-                                                    obj->cur.cache.clip.a);
-   obj->layer->evas->engine.func->context_multiplier_unset(output,
-                                                           context);
-   obj->layer->evas->engine.func->context_render_op_set(output, context,
-                                                        obj->cur.render_op);
-   if (o->changed)
-     {
-        o->engine_data = obj->layer->evas->engine.func->polygon_points_clear(obj->layer->evas->engine.data.output,
-                                                                             obj->layer->evas->engine.data.context,
-                                                                             o->engine_data);
-        EINA_LIST_FOREACH(o->points, l, p)
-          {
-             //px = evas_coord_world_x_to_screen(obj->layer->evas, p->x);
-             //py = evas_coord_world_y_to_screen(obj->layer->evas, p->y);
-             o->engine_data = obj->layer->evas->engine.func->polygon_point_add(obj->layer->evas->engine.data.output,
-                                                                               obj->layer->evas->engine.data.context,
-                                                                               o->engine_data,
-                                                                               p->x, p->y);
-          }
-     }
-
-   if (o->engine_data)
-     obj->layer->evas->engine.func->polygon_draw(output,
-                                                 context,
-                                                 surface,
-                                                 o->engine_data,
-                                                 o->offset.x + x, o->offset.y + y);
-}
-
-static void
-evas_object_polygon_render_pre(Evas_Object *obj)
-{
-   Evas_Object_Polygon *o;
-   int is_v, was_v;
-
-   /* dont pre-render the obj twice! */
-   if (obj->pre_render_done) return;
-   obj->pre_render_done = 1;
-   /* pre-render phase. this does anything an object needs to do just before */
-   /* rendering. this could mean loading the image data, retrieving it from */
-   /* elsewhere, decoding video etc. */
-   /* then when this is done the object needs to figure if it changed and */
-   /* if so what and where and add the appropriate redraw lines */
-   o = (Evas_Object_Polygon *)(obj->object_data);
-   /* if someone is clipping this obj - go calculate the clipper */
-   if (obj->cur.clipper)
-     {
-        if (obj->cur.cache.clip.dirty)
-          evas_object_clip_recalc(obj->cur.clipper);
-        obj->cur.clipper->func->render_pre(obj->cur.clipper);
-     }
-   /* now figure what changed and add draw rects */
-   /* if it just became visible or invisible */
-   is_v = evas_object_is_visible(obj);
-   was_v = evas_object_was_visible(obj);
-   if (is_v != was_v)
-     {
-        evas_object_render_pre_visible_change(&obj->layer->evas->clip_changes, obj, is_v, was_v);
-        goto done;
-     }
-   if ((obj->cur.map != obj->prev.map) ||
-       (obj->cur.usemap != obj->prev.usemap))
-     {
-        evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, obj);
-        goto done;
-     }
-   /* it's not visible - we accounted for it appearing or not so just abort */
-   if (!is_v) goto done;
-   /* clipper changed this is in addition to anything else for obj */
-   evas_object_render_pre_clipper_change(&obj->layer->evas->clip_changes, obj);
-   /* if we restacked (layer or just within a layer) */
-   if (obj->restack)
-     {
-        evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, obj);
-        goto done;
-     }
-   /* if it changed render op */
-   if (obj->cur.render_op != obj->prev.render_op)
-     {
-        evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, obj);
-        goto done;
-     }
-   /* if it changed color */
-   if ((obj->cur.color.r != obj->prev.color.r) ||
-       (obj->cur.color.g != obj->prev.color.g) ||
-       (obj->cur.color.b != obj->prev.color.b) ||
-       (obj->cur.color.a != obj->prev.color.a))
-     {
-        evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, obj);
-        goto done;
-     }
-   /* if it changed geometry - and obviously not visibility or color */
-   /* calculate differences since we have a constant color fill */
-   /* we really only need to update the differences */
-   if ((obj->cur.geometry.x != obj->prev.geometry.x) ||
-       (obj->cur.geometry.y != obj->prev.geometry.y) ||
-       (obj->cur.geometry.w != obj->prev.geometry.w) ||
-       (obj->cur.geometry.h != obj->prev.geometry.h) ||
-       (o->changed))
-     {
-        evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, obj);
-        goto done;
-     }
-   done:
-   if ((obj->cur.geometry.x != obj->prev.geometry.x) ||
-       (obj->cur.geometry.y != obj->prev.geometry.y))
-     {
-        if (!o->changed)
-          {
-             o->offset.x += obj->cur.geometry.x - obj->prev.geometry.x;
-             o->offset.y += obj->cur.geometry.y - obj->prev.geometry.y;
-          }
-        else
-          {
-             o->offset.x += obj->cur.geometry.x - o->geometry.x;
-             o->offset.y += obj->cur.geometry.y - o->geometry.y;
-          }
-     }
-   evas_object_render_pre_effect_updates(&obj->layer->evas->clip_changes, obj, is_v, was_v);
-}
-
-static void
-evas_object_polygon_render_post(Evas_Object *obj)
-{
-   Evas_Object_Polygon *o;
-
-   /* this moves the current data to the previous state parts of the object */
-   /* in whatever way is safest for the object. also if we don't need object */
-   /* data anymore we can free it if the object deems this is a good idea */
-   o = (Evas_Object_Polygon *)(obj->object_data);
-   /* remove those pesky changes */
-   evas_object_clip_changes_clean(obj);
-   /* move cur to prev safely for object data */
-   obj->prev = obj->cur;
-   o->changed = 0;
-}
-
-static unsigned int evas_object_polygon_id_get(Evas_Object *obj)
-{
-   Evas_Object_Polygon *o;
-
-   o = (Evas_Object_Polygon *)(obj->object_data);
-   if (!o) return 0;
-   return MAGIC_OBJ_POLYGON;
-}
-
-static unsigned int evas_object_polygon_visual_id_get(Evas_Object *obj)
-{
-   Evas_Object_Polygon *o;
-
-   o = (Evas_Object_Polygon *)(obj->object_data);
-   if (!o) return 0;
-   return MAGIC_OBJ_SHAPE;
-}
-
-static void *evas_object_polygon_engine_data_get(Evas_Object *obj)
-{
-   Evas_Object_Polygon *o;
-
-   o = (Evas_Object_Polygon *)(obj->object_data);
-   if (!o) return NULL;
-   return o->engine_data;
-}
-
-static int
-evas_object_polygon_is_opaque(Evas_Object *obj __UNUSED__)
-{
-   /* this returns 1 if the internal object data implies that the object is */
-   /* currently fully opaque over the entire line it occupies */
-   return 0;
-}
-
-static int
-evas_object_polygon_was_opaque(Evas_Object *obj __UNUSED__)
-{
-   /* this returns 1 if the internal object data implies that the object was */
-   /* previously fully opaque over the entire line it occupies */
-   return 0;
-}
-
-/* We count the number of edges a "ray" 90 degs upwards from our point
- * intersects with. If it's even, we are outside of the polygon, if it's odd,
- * we are inside of it. */
-static int
-evas_object_polygon_is_inside(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
-{
-   Evas_Object_Polygon *o;
-   int num_edges = 0; /* Number of edges we crossed */
-   Eina_List *itr;
-   Evas_Polygon_Point *p;
-
-   o = (Evas_Object_Polygon *)(obj->object_data);
-   if (!o) return 0;
-   if (!o->points) return 0;
-
-   /* Adjust X and Y according to current geometry */
-   x -= o->offset.x;
-   y -= o->offset.y;
-
-   if (eina_list_count(o->points) == 1)
-     {
-        p = eina_list_data_get(o->points);
-        return ((p->x == x) && (p->y == y));
-     }
-
-   EINA_LIST_FOREACH(o->points, itr, p)
-     {
-        Evas_Coord line_y;
-        Eina_List *next = eina_list_next(itr);
-        Evas_Polygon_Point *p_next;
-        /* Get the next, or if there's no next, take the first */
-        if (next)
-          {
-             p_next = eina_list_data_get(next);
-          }
-        else
-          {
-             p_next = eina_list_data_get(o->points);
-          }
-
-        /* Make sure that we are directly below the edge,
-         * and that p->x != p_next->x */
-        if (((p->x < p_next->x) && (p->x <= x) && (x < p_next->x)) ||
-              ((p->x > p_next->x) && (p_next->x < x) && (x <= p->x)))
-          {
-             line_y = ((double) (p->y - p_next->y) /
-                   (double) (p->x - p_next->x)) *
-                (x - p_next->x) + p_next->y;
-             /* We crossed that edge if the line is directly above us */
-             if (line_y < y)
-                num_edges++;
-          }
-     }
-
-   /* Return true if num_edges is odd */
-   return ((num_edges % 2) == 1);
-}
-
-static int
-evas_object_polygon_was_inside(Evas_Object *obj __UNUSED__, Evas_Coord x __UNUSED__, Evas_Coord y __UNUSED__)
-{
-   /* this returns 1 if the canvas co-ordinates were inside the object based */
-   /* on object private data. not much use for rects, but for polys, images */
-   /* and other complex objects it might be */
-   return 1;
-}
diff --git a/libraries/evas/src/lib/canvas/evas_object_rectangle.c b/libraries/evas/src/lib/canvas/evas_object_rectangle.c
deleted file mode 100644
index 36678e7..0000000
--- a/libraries/evas/src/lib/canvas/evas_object_rectangle.c
+++ /dev/null
@@ -1,387 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-
-/* private magic number for rectangle objects */
-static const char o_type[] = "rectangle";
-
-const char *o_rect_type = o_type;
-
-/* private struct for rectangle object internal data */
-typedef struct _Evas_Object_Rectangle      Evas_Object_Rectangle;
-
-struct _Evas_Object_Rectangle
-{
-   DATA32            magic;
-   void             *engine_data;
-};
-
-/* private methods for rectangle objects */
-static void evas_object_rectangle_init(Evas_Object *obj);
-static void *evas_object_rectangle_new(void);
-static void evas_object_rectangle_render(Evas_Object *obj, void *output, void *context, void *surface, int x, int y);
-static void evas_object_rectangle_free(Evas_Object *obj);
-static void evas_object_rectangle_render_pre(Evas_Object *obj);
-static void evas_object_rectangle_render_post(Evas_Object *obj);
-
-static unsigned int evas_object_rectangle_id_get(Evas_Object *obj);
-static unsigned int evas_object_rectangle_visual_id_get(Evas_Object *obj);
-static void *evas_object_rectangle_engine_data_get(Evas_Object *obj);
-
-static int evas_object_rectangle_is_opaque(Evas_Object *obj);
-static int evas_object_rectangle_was_opaque(Evas_Object *obj);
-
-#if 0 /* usless calls for a rect object. much more useful for images etc. */
-static void evas_object_rectangle_store(Evas_Object *obj);
-static void evas_object_rectangle_unstore(Evas_Object *obj);
-static int evas_object_rectangle_is_visible(Evas_Object *obj);
-static int evas_object_rectangle_was_visible(Evas_Object *obj);
-static int evas_object_rectangle_is_inside(Evas_Object *obj, double x, double y);
-static int evas_object_rectangle_was_inside(Evas_Object *obj, double x, double y);
-#endif
-
-static const Evas_Object_Func object_func =
-{
-   /* methods (compulsory) */
-   evas_object_rectangle_free,
-     evas_object_rectangle_render,
-     evas_object_rectangle_render_pre,
-     evas_object_rectangle_render_post,
-     evas_object_rectangle_id_get,
-     evas_object_rectangle_visual_id_get,
-     evas_object_rectangle_engine_data_get,
-   /* these are optional. NULL = nothing */
-     NULL,
-     NULL,
-     NULL,
-     NULL,
-     evas_object_rectangle_is_opaque,
-     evas_object_rectangle_was_opaque,
-     NULL,
-     NULL,
-     NULL,
-     NULL,
-     NULL,
-     NULL,
-     NULL
-};
-
-/* the actual api call to add a rect */
-/* it has no other api calls as all properties are standard */
-
-EVAS_MEMPOOL(_mp_obj);
-
-EAPI Evas_Object *
-evas_object_rectangle_add(Evas *e)
-{
-   Evas_Object *obj;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return NULL;
-   MAGIC_CHECK_END();
-   obj = evas_object_new(e);
-   evas_object_rectangle_init(obj);
-   evas_object_inject(obj, e);
-   return obj;
-}
-
-/* all nice and private */
-static void
-evas_object_rectangle_init(Evas_Object *obj)
-{
-   /* alloc image ob, setup methods and default values */
-   obj->object_data = evas_object_rectangle_new();
-   /* set up default settings for this kind of object */
-   obj->cur.color.r = 255;
-   obj->cur.color.g = 255;
-   obj->cur.color.b = 255;
-   obj->cur.color.a = 255;
-   obj->cur.geometry.x = 0;
-   obj->cur.geometry.y = 0;
-   obj->cur.geometry.w = 0;
-   obj->cur.geometry.h = 0;
-   obj->cur.layer = 0;
-   obj->cur.render_op = EVAS_RENDER_BLEND;
-   /* set up object-specific settings */
-   obj->prev = obj->cur;
-   /* set up methods (compulsory) */
-   obj->func = &object_func;
-   obj->type = o_type;
-}
-
-static void *
-evas_object_rectangle_new(void)
-{
-   Evas_Object_Rectangle *o;
-
-   /* alloc obj private data */
-   EVAS_MEMPOOL_INIT(_mp_obj, "evas_object_rectangle", Evas_Object_Rectangle, 256, NULL);
-   o = EVAS_MEMPOOL_ALLOC(_mp_obj, Evas_Object_Rectangle);
-   if (!o) return NULL;
-   EVAS_MEMPOOL_PREP(_mp_obj, o, Evas_Object_Rectangle);
-   o->magic = MAGIC_OBJ_RECTANGLE;
-   return o;
-}
-
-static void
-evas_object_rectangle_free(Evas_Object *obj)
-{
-   Evas_Object_Rectangle *o;
-
-   /* frees private object data. very simple here */
-   o = (Evas_Object_Rectangle *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Rectangle, MAGIC_OBJ_RECTANGLE);
-   return;
-   MAGIC_CHECK_END();
-   /* free obj */
-   o->magic = 0;
-   EVAS_MEMPOOL_FREE(_mp_obj, o);
-}
-
-static void
-evas_object_rectangle_render(Evas_Object *obj, void *output, void *context, void *surface, int x, int y)
-{
-   /* render object to surface with context, and offxet by x,y */
-   obj->layer->evas->engine.func->context_color_set(output,
-                                                    context,
-                                                    obj->cur.cache.clip.r,
-                                                    obj->cur.cache.clip.g,
-                                                    obj->cur.cache.clip.b,
-                                                    obj->cur.cache.clip.a);
-   obj->layer->evas->engine.func->context_multiplier_unset(output,
-                                                           context);
-   obj->layer->evas->engine.func->context_render_op_set(output, context,
-                                                        obj->cur.render_op);
-   obj->layer->evas->engine.func->rectangle_draw(output,
-                                                 context,
-                                                 surface,
-                                                 obj->cur.geometry.x + x,
-                                                 obj->cur.geometry.y + y,
-                                                 obj->cur.geometry.w,
-                                                 obj->cur.geometry.h);
-////                                             obj->cur.cache.geometry.x + x,
-////                                             obj->cur.cache.geometry.y + y,
-////                                             obj->cur.cache.geometry.w,
-////                                             obj->cur.cache.geometry.h);
-}
-
-static void
-evas_object_rectangle_render_pre(Evas_Object *obj)
-{
-   int is_v, was_v;
-
-   /* dont pre-render the obj twice! */
-   if (obj->pre_render_done) return;
-   obj->pre_render_done = 1;
-   /* pre-render phase. this does anything an object needs to do just before */
-   /* rendering. this could mean loading the image data, retrieving it from */
-   /* elsewhere, decoding video etc. */
-   /* then when this is done the object needs to figure if it changed and */
-   /* if so what and where and add the appropriate redraw rectangles */
-   /* if someone is clipping this obj - go calculate the clipper */
-   if (obj->cur.clipper)
-     {
-        if (obj->cur.cache.clip.dirty)
-          evas_object_clip_recalc(obj->cur.clipper);
-        obj->cur.clipper->func->render_pre(obj->cur.clipper);
-     }
-   /* now figure what changed and add draw rects */
-   /* if it just became visible or invisible */
-   is_v = evas_object_is_visible(obj);
-   was_v = evas_object_was_visible(obj);
-   if (!(is_v | was_v)) goto done;
-   if (is_v != was_v)
-     {
-        evas_object_render_pre_visible_change(&obj->layer->evas->clip_changes, obj, is_v, was_v);
-        goto done;
-     }
-   if ((obj->cur.map != obj->prev.map) ||
-       (obj->cur.usemap != obj->prev.usemap))
-     {
-        evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, obj);
-        goto done;
-     }
-   /* it's not visible - we accounted for it appearing or not so just abort */
-   if (!is_v) goto done;
-   /* clipper changed this is in addition to anything else for obj */
-   evas_object_render_pre_clipper_change(&obj->layer->evas->clip_changes, obj);
-   /* if we restacked (layer or just within a layer) and don't clip anyone */
-   if ((obj->restack) && (!obj->clip.clipees))
-     {
-        evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, obj);
-        goto done;
-     }
-   /* if it changed render op */
-   if (obj->cur.render_op != obj->prev.render_op)
-     {
-        evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, obj);
-        goto done;
-     }
-   /* if it changed color */
-   if ((obj->cur.color.r != obj->prev.color.r) ||
-       (obj->cur.color.g != obj->prev.color.g) ||
-       (obj->cur.color.b != obj->prev.color.b) ||
-       (obj->cur.color.a != obj->prev.color.a))
-     {
-        evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, obj);
-        goto done;
-     }
-   /* if it changed geometry - and obviously not visibility or color */
-   /* calculate differences since we have a constant color fill */
-   /* we really only need to update the differences */
-   if ((obj->cur.geometry.x != obj->prev.geometry.x) ||
-       (obj->cur.geometry.y != obj->prev.geometry.y) ||
-       (obj->cur.geometry.w != obj->prev.geometry.w) ||
-       (obj->cur.geometry.h != obj->prev.geometry.h))
-     {
-        evas_rects_return_difference_rects(&obj->layer->evas->clip_changes,
-                                           obj->cur.geometry.x,
-                                           obj->cur.geometry.y,
-                                           obj->cur.geometry.w,
-                                           obj->cur.geometry.h,
-                                           obj->prev.geometry.x,
-                                           obj->prev.geometry.y,
-                                           obj->prev.geometry.w,
-                                           obj->prev.geometry.h);
-////    rl = evas_rects_return_difference_rects(obj->cur.cache.geometry.x,
-////                                            obj->cur.cache.geometry.y,
-////                                            obj->cur.cache.geometry.w,
-////                                            obj->cur.cache.geometry.h,
-////                                            obj->prev.cache.geometry.x,
-////                                            obj->prev.cache.geometry.y,
-////                                            obj->prev.cache.geometry.w,
-////                                            obj->prev.cache.geometry.h);
-        goto done;
-     }
-   /* it obviously didn't change - add a NO obscure - this "unupdates"  this */
-   /* area so if there were updates for it they get wiped. don't do it if we */
-   /* arent fully opaque and we are visible */
- /*
-   if (evas_object_is_visible(obj) &&
-       evas_object_is_opaque(obj) &&
-       (!obj->clip.clipees))
-     obj->layer->evas->engine.func->output_redraws_rect_del(obj->layer->evas->engine.data.output,
-                                                            obj->cur.cache.clip.x,
-                                                            obj->cur.cache.clip.y,
-                                                            obj->cur.cache.clip.w,
-                                                            obj->cur.cache.clip.h);
-  */
-   done:
-   evas_object_render_pre_effect_updates(&obj->layer->evas->clip_changes, obj, is_v, was_v);
-}
-
-static void
-evas_object_rectangle_render_post(Evas_Object *obj)
-{
-
-   /* this moves the current data to the previous state parts of the object */
-   /* in whatever way is safest for the object. also if we don't need object */
-   /* data anymore we can free it if the object deems this is a good idea */
-   /* remove those pesky changes */
-   evas_object_clip_changes_clean(obj);
-   /* move cur to prev safely for object data */
-   obj->prev = obj->cur;
-}
-
-static int
-evas_object_rectangle_is_opaque(Evas_Object *obj)
-{
-   /* this returns 1 if the internal object data implies that the object is */
-   /* currently fully opaque over the entire rectangle it occupies */
-   if ((obj->cur.map) && (obj->cur.usemap)) return 0;
-   if (obj->cur.render_op == EVAS_RENDER_COPY)
-        return 1;
-   if (obj->cur.render_op != EVAS_RENDER_BLEND)
-        return 0;
-   return 1;
-}
-
-static int
-evas_object_rectangle_was_opaque(Evas_Object *obj)
-{
-   /* this returns 1 if the internal object data implies that the object was */
-   /* previously fully opaque over the entire rectangle it occupies */
-   if (obj->prev.render_op == EVAS_RENDER_COPY)
-        return 1;
-   if (obj->prev.render_op != EVAS_RENDER_BLEND)
-        return 0;
-   return 1;
-}
-
-static unsigned int evas_object_rectangle_id_get(Evas_Object *obj)
-{
-   Evas_Object_Rectangle *o;
-
-   o = (Evas_Object_Rectangle *)(obj->object_data);
-   if (!o) return 0;
-   return MAGIC_OBJ_RECTANGLE;
-}
-
-static unsigned int evas_object_rectangle_visual_id_get(Evas_Object *obj)
-{
-   Evas_Object_Rectangle *o;
-
-   o = (Evas_Object_Rectangle *)(obj->object_data);
-   if (!o) return 0;
-   return MAGIC_OBJ_SHAPE;
-}
-
-static void *evas_object_rectangle_engine_data_get(Evas_Object *obj)
-{
-   Evas_Object_Rectangle *o;
-
-   o = (Evas_Object_Rectangle *)(obj->object_data);
-   if (!o) return NULL;
-   return o->engine_data;
-}
-
-
-#if 0 /* usless calls for a rect object. much more useful for images etc. */
-static void
-evas_object_rectangle_store(Evas_Object *obj)
-{
-   /* store... nothing for rectangle objects... it's a bit silly */
-   /* but for others that may have expensive caluclations to do to */
-   /* generate the object data, hint that they might want to be pre-calced */
-   /* once and stored */
-}
-
-static void
-evas_object_rectangle_unstore(Evas_Object *obj)
-{
-   /* store... nothing for rectangle objects... it's a bit silly */
-}
-
-static int
-evas_object_rectangle_is_visible(Evas_Object *obj)
-{
-   /* this returns 1 if the internal object data would imply that it is */
-   /* visible (ie drawing it draws something. this is not to do with events */
-   return 1;
-}
-
-static int
-evas_object_rectangle_was_visible(Evas_Object *obj)
-{
-   /* this returns 1 if the internal object data would imply that it was */
-   /* visible (ie drawing it draws something. this is not to do with events */
-   return 1;
-}
-
-static int
-evas_object_rectangle_is_inside(Evas_Object *obj, double x, double y)
-{
-   /* this returns 1 if the canvas co-ordinates are inside the object based */
-   /* on object private data. not much use for rects, but for polys, images */
-   /* and other complex objects it might be */
-   return 1;
-}
-
-static int
-evas_object_rectangle_was_inside(Evas_Object *obj, double x, double y)
-{
-   /* this returns 1 if the canvas co-ordinates were inside the object based */
-   /* on object private data. not much use for rects, but for polys, images */
-   /* and other complex objects it might be */
-   return 1;
-}
-#endif
diff --git a/libraries/evas/src/lib/canvas/evas_object_smart.c b/libraries/evas/src/lib/canvas/evas_object_smart.c
deleted file mode 100644
index 69d7f3b..0000000
--- a/libraries/evas/src/lib/canvas/evas_object_smart.c
+++ /dev/null
@@ -1,951 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-
-typedef struct _Evas_Object_Smart      Evas_Object_Smart;
-typedef struct _Evas_Smart_Callback    Evas_Smart_Callback;
-
-struct _Evas_Object_Smart
-{
-   DATA32            magic;
-   void             *engine_data;
-   void             *data;
-   Eina_List        *callbacks;
-   Eina_Inlist      *contained;
-   Evas_Smart_Cb_Description_Array callbacks_descriptions;
-   int               walking_list;
-   Eina_Bool         deletions_waiting : 1;
-   Eina_Bool         need_recalculate : 1;
-};
-
-struct _Evas_Smart_Callback
-{
-   const char *event;
-   Evas_Smart_Cb func;
-   void *func_data;
-   Evas_Callback_Priority priority;
-   char  delete_me : 1;
-};
-
-/* private methods for smart objects */
-static void evas_object_smart_callbacks_clear(Evas_Object *obj);
-static void evas_object_smart_init(Evas_Object *obj);
-static void *evas_object_smart_new(void);
-static void evas_object_smart_render(Evas_Object *obj, void *output, void *context, void *surface, int x, int y);
-static void evas_object_smart_free(Evas_Object *obj);
-static void evas_object_smart_render_pre(Evas_Object *obj);
-static void evas_object_smart_render_post(Evas_Object *obj);
-
-static unsigned int evas_object_smart_id_get(Evas_Object *obj);
-static unsigned int evas_object_smart_visual_id_get(Evas_Object *obj);
-static void *evas_object_smart_engine_data_get(Evas_Object *obj);
-
-static const Evas_Object_Func object_func =
-{
-   /* methods (compulsory) */
-   evas_object_smart_free,
-   evas_object_smart_render,
-   evas_object_smart_render_pre,
-   evas_object_smart_render_post,
-   evas_object_smart_id_get,
-   evas_object_smart_visual_id_get,
-   evas_object_smart_engine_data_get,
-   /* these are optional. NULL = nothing */
-   NULL,
-   NULL,
-   NULL,
-   NULL,
-   NULL,
-   NULL,
-   NULL,
-   NULL,
-   NULL,
-   NULL,
-   NULL,
-   NULL,
-   NULL
-};
-
-EVAS_MEMPOOL(_mp_obj);
-EVAS_MEMPOOL(_mp_cb);
-
-/* public funcs */
-EAPI void
-evas_object_smart_data_set(Evas_Object *obj, void *data)
-{
-   Evas_Object_Smart *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Smart *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Smart, MAGIC_OBJ_SMART);
-   return;
-   MAGIC_CHECK_END();
-   o->data = data;
-}
-
-EAPI void *
-evas_object_smart_data_get(const Evas_Object *obj)
-{
-   Evas_Object_Smart *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Smart *)(obj->object_data);
-   if (!o) return NULL;
-   return o->data;
-}
-
-EAPI Evas_Smart *
-evas_object_smart_smart_get(const Evas_Object *obj)
-{
-   Evas_Object_Smart *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Smart *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Smart, MAGIC_OBJ_SMART);
-   return NULL;
-   MAGIC_CHECK_END();
-   return obj->smart.smart;
-}
-
-EAPI void
-evas_object_smart_member_add(Evas_Object *obj, Evas_Object *smart_obj)
-{
-   Evas_Object_Smart *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   MAGIC_CHECK(smart_obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Smart *)(smart_obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Smart, MAGIC_OBJ_SMART);
-   return;
-   MAGIC_CHECK_END();
-
-   if (obj->delete_me)
-     {
-        CRIT("Adding deleted object %p to smart obj %p", obj, smart_obj);
-        abort();
-        return;
-     }
-   if (smart_obj->delete_me)
-     {
-        CRIT("Adding object %p to deleted smart obj %p", obj, smart_obj);
-        abort();
-        return;
-     }
-   if (!smart_obj->layer)
-     {
-        CRIT("No evas surface associated with smart object (%p)", smart_obj);
-        abort();
-        return;
-     }
-   if ((obj->layer && smart_obj->layer) &&
-       (obj->layer->evas != smart_obj->layer->evas))
-     {
-        CRIT("Adding object %p from Evas (%p) from another Evas (%p)", obj, obj->layer->evas, smart_obj->layer->evas);
-        abort();
-        return;
-     }
-
-   if (obj->smart.parent == smart_obj) return;
-
-   if (obj->smart.parent) evas_object_smart_member_del(obj);
-
-   evas_object_release(obj, 1);
-   obj->layer = smart_obj->layer;
-   obj->cur.layer = obj->layer->layer;
-   obj->layer->usage++;
-   obj->smart.parent = smart_obj;
-   o->contained = eina_inlist_append(o->contained, EINA_INLIST_GET(obj));
-   evas_object_smart_member_cache_invalidate(obj, EINA_TRUE, EINA_TRUE);
-   obj->restack = 1;
-   evas_object_change(obj);
-   evas_object_mapped_clip_across_mark(obj);
-   if (smart_obj->smart.smart->smart_class->member_add)
-     smart_obj->smart.smart->smart_class->member_add(smart_obj, obj);
-}
-
-EAPI void
-evas_object_smart_member_del(Evas_Object *obj)
-{
-   Evas_Object_Smart *o;
-   Evas_Object *smart_obj;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-
-   if (!obj->smart.parent) return;
-
-   smart_obj = obj->smart.parent;
-   if (smart_obj->smart.smart->smart_class->member_del)
-     smart_obj->smart.smart->smart_class->member_del(smart_obj, obj);
-
-   o = (Evas_Object_Smart *)(obj->smart.parent->object_data);
-   o->contained = eina_inlist_remove(o->contained, EINA_INLIST_GET(obj));
-   obj->smart.parent = NULL;
-   evas_object_smart_member_cache_invalidate(obj, EINA_TRUE, EINA_TRUE);
-   obj->layer->usage--;
-   obj->cur.layer = obj->layer->layer;
-   evas_object_inject(obj, obj->layer->evas);
-   obj->restack = 1;
-   evas_object_change(obj);
-   evas_object_mapped_clip_across_mark(obj);
-}
-
-EAPI Evas_Object *
-evas_object_smart_parent_get(const Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-
-   return obj->smart.parent;
-}
-
-EAPI Eina_Bool
-evas_object_smart_type_check(const Evas_Object *obj, const char *type)
-{
-   const Evas_Smart_Class *sc;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-
-   if (!obj->smart.smart)
-     return EINA_FALSE;
-   sc = obj->smart.smart->smart_class;
-   while (sc)
-     {
-        if (!strcmp(sc->name, type))
-          return EINA_TRUE;
-        sc = sc->parent;
-     }
-
-   return EINA_FALSE;
-}
-
-EAPI Eina_Bool
-evas_object_smart_type_check_ptr(const Evas_Object *obj, const char *type)
-{
-   const Evas_Smart_Class *sc;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-
-   if (!obj->smart.smart)
-     return EINA_FALSE;
-   sc = obj->smart.smart->smart_class;
-   while (sc)
-     {
-        if (sc->name == type)
-          return EINA_TRUE;
-        sc = sc->parent;
-     }
-
-   return EINA_FALSE;
-}
-
-EAPI Eina_List *
-evas_object_smart_members_get(const Evas_Object *obj)
-{
-   Evas_Object_Smart *o;
-   Eina_List *members;
-   Eina_Inlist *member;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Smart *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Smart, MAGIC_OBJ_SMART);
-   return NULL;
-   MAGIC_CHECK_END();
-
-   members = NULL;
-   for (member = o->contained; member; member = member->next)
-     members = eina_list_append(members, member);
-
-   return members;
-}
-
-const Eina_Inlist *
-evas_object_smart_members_get_direct(const Evas_Object *obj)
-{
-   Evas_Object_Smart *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Smart *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Smart, MAGIC_OBJ_SMART);
-   return NULL;
-   MAGIC_CHECK_END();
-   return o->contained;
-}
-
-void
-_evas_object_smart_members_all_del(Evas_Object *obj)
-{
-   Evas_Object_Smart *o = (Evas_Object_Smart *)(obj->object_data);
-   while (o->contained)
-     evas_object_del((Evas_Object *)(o->contained));
-}
-
-EAPI Evas_Object *
-evas_object_smart_add(Evas *e, Evas_Smart *s)
-{
-   Evas_Object *obj;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return NULL;
-   MAGIC_CHECK_END();
-   MAGIC_CHECK(s, Evas_Smart, MAGIC_SMART);
-   return NULL;
-   MAGIC_CHECK_END();
-
-   obj = evas_object_new(e);
-   if (!obj) return NULL;
-   obj->smart.smart = s;
-   obj->type = s->smart_class->name;
-   evas_object_smart_init(obj);
-   evas_object_inject(obj, e);
-
-   evas_object_smart_use(s);
-
-   if (s->smart_class->add) s->smart_class->add(obj);
-
-   return obj;
-}
-
-static int
-_callback_priority_cmp(const void *_a, const void *_b)
-{
-   const Evas_Smart_Callback *a, *b;
-   a = (const Evas_Smart_Callback *) _a;
-   b = (const Evas_Smart_Callback *) _b;
-   if (a->priority < b->priority)
-      return -1;
-   else
-      return 1;
-}
-
-EAPI void
-evas_object_smart_callback_add(Evas_Object *obj, const char *event, Evas_Smart_Cb func, const void *data)
-{
-   evas_object_smart_callback_priority_add(obj, event,
-         EVAS_CALLBACK_PRIORITY_DEFAULT, func, data);
-}
-
-EAPI void
-evas_object_smart_callback_priority_add(Evas_Object *obj, const char *event, Evas_Callback_Priority priority, Evas_Smart_Cb func, const void *data)
-{
-   Evas_Object_Smart *o;
-   Evas_Smart_Callback *cb;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Smart *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Smart, MAGIC_OBJ_SMART);
-   return;
-   MAGIC_CHECK_END();
-   if (!event) return;
-   if (!func) return;
-   EVAS_MEMPOOL_INIT(_mp_cb, "evas_smart_callback", Evas_Smart_Callback, 512, );
-   cb = EVAS_MEMPOOL_ALLOC(_mp_cb, Evas_Smart_Callback);
-   if (!cb) return;
-   EVAS_MEMPOOL_PREP(_mp_cb, cb, Evas_Smart_Callback);
-   cb->event = eina_stringshare_add(event);
-   cb->func = func;
-   cb->func_data = (void *)data;
-   cb->priority = priority;
-   o->callbacks = eina_list_sorted_insert(o->callbacks, _callback_priority_cmp,
-         cb);
-}
-
-EAPI void *
-evas_object_smart_callback_del(Evas_Object *obj, const char *event, Evas_Smart_Cb func)
-{
-   Evas_Object_Smart *o;
-   Eina_List *l;
-   Evas_Smart_Callback *cb;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Smart *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Smart, MAGIC_OBJ_SMART);
-   return NULL;
-   MAGIC_CHECK_END();
-   if (!event) return NULL;
-   EINA_LIST_FOREACH(o->callbacks, l, cb)
-     {
-        if ((!strcmp(cb->event, event)) && (cb->func == func))
-          {
-             void *data;
-
-             data = cb->func_data;
-             cb->delete_me = 1;
-             o->deletions_waiting = 1;
-             evas_object_smart_callbacks_clear(obj);
-             return data;
-          }
-     }
-   return NULL;
-}
-
-EAPI void *
-evas_object_smart_callback_del_full(Evas_Object *obj, const char *event, Evas_Smart_Cb func, const void *data)
-{
-   Evas_Object_Smart *o;
-   Eina_List *l;
-   Evas_Smart_Callback *cb;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Smart *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Smart, MAGIC_OBJ_SMART);
-   return NULL;
-   MAGIC_CHECK_END();
-   if (!event) return NULL;
-   EINA_LIST_FOREACH(o->callbacks, l, cb)
-     {
-        if ((!strcmp(cb->event, event)) && (cb->func == func) && (cb->func_data == data))
-          {
-             void *ret;
-
-             ret = cb->func_data;
-             cb->delete_me = 1;
-             o->deletions_waiting = 1;
-             evas_object_smart_callbacks_clear(obj);
-             return ret;
-          }
-     }
-   return NULL;
-}
-
-EAPI void
-evas_object_smart_callback_call(Evas_Object *obj, const char *event, void *event_info)
-{
-   Evas_Object_Smart *o;
-   Eina_List *l;
-   Evas_Smart_Callback *cb;
-   const char *strshare;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Smart *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Smart, MAGIC_OBJ_SMART);
-   return;
-   MAGIC_CHECK_END();
-   if (!event) return;
-   if (obj->delete_me) return;
-   o->walking_list++;
-   strshare = eina_stringshare_add(event);
-   EINA_LIST_FOREACH(o->callbacks, l, cb)
-     {
-        if (!cb->delete_me)
-          {
-             if (cb->event == strshare)
-               cb->func(cb->func_data, obj, event_info);
-          }
-        if (obj->delete_me)
-          break;
-     }
-   eina_stringshare_del(strshare);
-   o->walking_list--;
-   evas_object_smart_callbacks_clear(obj);
-}
-
-EAPI Eina_Bool
-evas_object_smart_callbacks_descriptions_set(Evas_Object *obj, const Evas_Smart_Cb_Description *descriptions)
-{
-   const Evas_Smart_Cb_Description *d;
-   Evas_Object_Smart *o;
-   unsigned int i, count = 0;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Smart *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Smart, MAGIC_OBJ_SMART);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-
-   if ((!descriptions) || (!descriptions->name))
-     {
-        evas_smart_cb_descriptions_resize(&o->callbacks_descriptions, 0);
-        return EINA_TRUE;
-     }
-
-   for (count = 0, d = descriptions; d->name; d++)
-     count++;
-
-   evas_smart_cb_descriptions_resize(&o->callbacks_descriptions, count);
-   if (count == 0) return EINA_TRUE;
-
-   for (i = 0, d = descriptions; i < count; d++, i++)
-     o->callbacks_descriptions.array[i] = d;
-
-   evas_smart_cb_descriptions_fix(&o->callbacks_descriptions);
-
-   return EINA_TRUE;
-}
-
-EAPI void
-evas_object_smart_callbacks_descriptions_get(const Evas_Object *obj, const Evas_Smart_Cb_Description ***class_descriptions, unsigned int *class_count, const Evas_Smart_Cb_Description ***instance_descriptions, unsigned int *instance_count)
-{
-   Evas_Object_Smart *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   if (class_descriptions) *class_descriptions = NULL;
-   if (class_count) *class_count = 0;
-   if (instance_descriptions) *instance_descriptions = NULL;
-   if (instance_count) *instance_count = 0;
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Smart *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Smart, MAGIC_OBJ_SMART);
-   if (class_descriptions) *class_descriptions = NULL;
-   if (class_count) *class_count = 0;
-   if (instance_descriptions) *instance_descriptions = NULL;
-   if (instance_count) *instance_count = 0;
-   return;
-   MAGIC_CHECK_END();
-
-   if (class_descriptions)
-     *class_descriptions = obj->smart.smart->callbacks.array;
-   if (class_count)
-     *class_count = obj->smart.smart->callbacks.size;
-
-   if (instance_descriptions)
-     *instance_descriptions = o->callbacks_descriptions.array;
-   if (instance_count)
-     *instance_count = o->callbacks_descriptions.size;
-}
-
-EAPI void
-evas_object_smart_callback_description_find(const Evas_Object *obj, const char *name, const Evas_Smart_Cb_Description **class_description, const Evas_Smart_Cb_Description **instance_description)
-{
-   Evas_Object_Smart *o;
-
-   if (!name)
-     {
-        if (class_description) *class_description = NULL;
-        if (instance_description) *instance_description = NULL;
-        return;
-     }
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   if (class_description) *class_description = NULL;
-   if (instance_description) *instance_description = NULL;
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Smart *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Smart, MAGIC_OBJ_SMART);
-   if (class_description) *class_description = NULL;
-   if (instance_description) *instance_description = NULL;
-   return;
-   MAGIC_CHECK_END();
-
-   if (class_description)
-     *class_description = evas_smart_cb_description_find
-        (&obj->smart.smart->callbacks, name);
-
-   if (instance_description)
-     *instance_description = evas_smart_cb_description_find
-        (&o->callbacks_descriptions, name);
-}
-
-EAPI void
-evas_object_smart_need_recalculate_set(Evas_Object *obj, Eina_Bool value)
-{
-   Evas_Object_Smart *o;
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = obj->object_data;
-   MAGIC_CHECK(o, Evas_Object_Smart, MAGIC_OBJ_SMART);
-   return;
-   MAGIC_CHECK_END();
-
-   // XXX: do i need this?
-   if (obj->delete_me) return;
-
-   /* remove this entry from calc_list or processed list */
-   if (eina_clist_element_is_linked(&obj->calc_entry))
-     eina_clist_remove(&obj->calc_entry);
-
-   value = !!value;
-   if (value)
-     eina_clist_add_tail(&obj->layer->evas->calc_list, &obj->calc_entry);
-   else
-     eina_clist_add_tail(&obj->layer->evas->calc_done, &obj->calc_entry);
-
-   if (o->need_recalculate == value) return;
-
-   if (obj->recalculate_cycle > 254)
-     {
-        ERR("Object %p is not stable during recalc loop", obj);
-        return;
-     }
-   if (obj->layer->evas->in_smart_calc) obj->recalculate_cycle++;
-   o->need_recalculate = value;
-}
-
-EAPI Eina_Bool
-evas_object_smart_need_recalculate_get(const Evas_Object *obj)
-{
-   Evas_Object_Smart *o;
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-   o = obj->object_data;
-   MAGIC_CHECK(o, Evas_Object_Smart, MAGIC_OBJ_SMART);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-
-   return o->need_recalculate;
-}
-
-EAPI void
-evas_object_smart_calculate(Evas_Object *obj)
-{
-   Evas_Object_Smart *o;
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = obj->object_data;
-   MAGIC_CHECK(o, Evas_Object_Smart, MAGIC_OBJ_SMART);
-   return;
-   MAGIC_CHECK_END();
-
-   if (!obj->smart.smart->smart_class->calculate)
-     return;
-
-   o->need_recalculate = 0;
-   obj->smart.smart->smart_class->calculate(obj);
-}
-
-EAPI void
-evas_smart_objects_calculate(Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-   evas_call_smarts_calculate(e);
-}
-
-EAPI int
-evas_smart_objects_calculate_count_get(const Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return 0;
-   MAGIC_CHECK_END();
-   return e->smart_calc_count;
-}
-
-/**
- * Call calculate() on all smart objects that need_recalculate.
- *
- * @internal
- */
-void
-evas_call_smarts_calculate(Evas *e)
-{
-   Eina_Clist *elem;
-   Evas_Object *obj;
-
-//   printf("+CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALC-----------v\n");
-   evas_event_freeze(e);
-   e->in_smart_calc++;
-
-   while (NULL != (elem = eina_clist_head(&e->calc_list)))
-     {
-        Evas_Object_Smart *o;
-
-        /* move the item to the processed list */
-        obj = EINA_CLIST_ENTRY(elem, Evas_Object, calc_entry);
-        eina_clist_remove(&obj->calc_entry);
-        if (obj->delete_me) continue;
-        eina_clist_add_tail(&e->calc_done, &obj->calc_entry);
-
-        o = obj->object_data;
-
-        if (o->need_recalculate)
-          {
-             o->need_recalculate = 0;
-             obj->smart.smart->smart_class->calculate(obj);
-          }
-     }
-
-   while (NULL != (elem = eina_clist_head(&e->calc_done)))
-     {
-        obj = EINA_CLIST_ENTRY(elem, Evas_Object, calc_entry);
-        obj->recalculate_cycle = 0;
-        eina_clist_remove(&obj->calc_entry);
-     }
-
-   e->in_smart_calc--;
-   if (e->in_smart_calc == 0) e->smart_calc_count++;
-   evas_event_thaw(e);
-   evas_event_thaw_eval(e);
-}
-
-EAPI void
-evas_object_smart_changed(Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   evas_object_change(obj);
-   evas_object_smart_need_recalculate_set(obj, 1);
-}
-
-/* internal calls */
-static void
-evas_object_smart_callbacks_clear(Evas_Object *obj)
-{
-   Evas_Object_Smart *o;
-   Eina_List *l;
-   Evas_Smart_Callback *cb;
-
-   o = (Evas_Object_Smart *)(obj->object_data);
-
-   if (o->walking_list) return;
-   if (!o->deletions_waiting) return;
-   for (l = o->callbacks; l;)
-     {
-        cb = eina_list_data_get(l);
-        l = eina_list_next(l);
-        if (cb->delete_me)
-          {
-             o->callbacks = eina_list_remove(o->callbacks, cb);
-             if (cb->event) eina_stringshare_del(cb->event);
-             EVAS_MEMPOOL_FREE(_mp_cb, cb);
-          }
-     }
-}
-
-void
-evas_object_smart_del(Evas_Object *obj)
-{
-   Evas_Smart *s;
-
-   if (obj->delete_me) return;
-   s = obj->smart.smart;
-   if ((s) && (s->smart_class->del)) s->smart_class->del(obj);
-   if (obj->smart.parent) evas_object_smart_member_del(obj);
-   if (s) evas_object_smart_unuse(s);
-}
-
-void
-evas_object_smart_cleanup(Evas_Object *obj)
-{
-   Evas_Object_Smart *o;
-
-   if (obj->smart.parent)
-     evas_object_smart_member_del(obj);
-
-   o = (Evas_Object_Smart *)(obj->object_data);
-   if (o->magic == MAGIC_OBJ_SMART)
-     {
-        if (obj->calc_entry.next)
-          eina_clist_remove(&obj->calc_entry);
-
-        while (o->contained)
-           evas_object_smart_member_del((Evas_Object *)o->contained);
-
-        while (o->callbacks)
-          {
-             Evas_Smart_Callback *cb = o->callbacks->data;
-             o->callbacks = eina_list_remove(o->callbacks, cb);
-             if (cb->event) eina_stringshare_del(cb->event);
-             EVAS_MEMPOOL_FREE(_mp_cb, cb);
-          }
-
-        evas_smart_cb_descriptions_resize(&o->callbacks_descriptions, 0);
-        o->data = NULL;
-     }
-
-   obj->smart.parent = NULL;
-   obj->smart.smart = NULL;
-}
-
-void
-evas_object_smart_member_cache_invalidate(Evas_Object *obj,
-                                          Eina_Bool pass_events,
-                                          Eina_Bool freeze_events)
-{
-   Evas_Object_Smart *o;
-   Evas_Object *member;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-
-   if (pass_events)
-     obj->parent_cache.pass_events_valid = EINA_FALSE;
-   if (freeze_events)
-     obj->parent_cache.freeze_events_valid = EINA_FALSE;
-
-   o = obj->object_data;
-   if (o->magic != MAGIC_OBJ_SMART) return;
-
-   EINA_INLIST_FOREACH(o->contained, member)
-     evas_object_smart_member_cache_invalidate(member,
-                                               pass_events,
-                                               freeze_events);
-}
-
-void
-evas_object_smart_member_raise(Evas_Object *member)
-{
-   Evas_Object_Smart *o;
-
-   o = (Evas_Object_Smart *)(member->smart.parent->object_data);
-   o->contained = eina_inlist_demote(o->contained, EINA_INLIST_GET(member));
-}
-
-void
-evas_object_smart_member_lower(Evas_Object *member)
-{
-   Evas_Object_Smart *o;
-
-   o = (Evas_Object_Smart *)(member->smart.parent->object_data);
-   o->contained = eina_inlist_promote(o->contained, EINA_INLIST_GET(member));
-}
-
-void
-evas_object_smart_member_stack_above(Evas_Object *member, Evas_Object *other)
-{
-   Evas_Object_Smart *o;
-
-   o = (Evas_Object_Smart *)(member->smart.parent->object_data);
-   o->contained = eina_inlist_remove(o->contained, EINA_INLIST_GET(member));
-   o->contained = eina_inlist_append_relative(o->contained, EINA_INLIST_GET(member), EINA_INLIST_GET(other));
-}
-
-void
-evas_object_smart_member_stack_below(Evas_Object *member, Evas_Object *other)
-{
-   Evas_Object_Smart *o;
-
-   o = (Evas_Object_Smart *)(member->smart.parent->object_data);
-   o->contained = eina_inlist_remove(o->contained, EINA_INLIST_GET(member));
-   o->contained = eina_inlist_prepend_relative(o->contained, EINA_INLIST_GET(member), EINA_INLIST_GET(other));
-}
-
-/* all nice and private */
-static void
-evas_object_smart_init(Evas_Object *obj)
-{
-   /* alloc smart obj, setup methods and default values */
-   obj->object_data = evas_object_smart_new();
-   /* set up default settings for this kind of object */
-   obj->cur.color.r = 255;
-   obj->cur.color.g = 255;
-   obj->cur.color.b = 255;
-   obj->cur.color.a = 255;
-   obj->cur.geometry.x = 0;
-   obj->cur.geometry.y = 0;
-   obj->cur.geometry.w = 0;
-   obj->cur.geometry.h = 0;
-   obj->cur.layer = 0;
-   /* set up object-specific settings */
-   obj->prev = obj->cur;
-   /* set up methods (compulsory) */
-   obj->func = &object_func;
-}
-
-static void *
-evas_object_smart_new(void)
-{
-   Evas_Object_Smart *o;
-
-   /* alloc obj private data */
-   EVAS_MEMPOOL_INIT(_mp_obj, "evas_object_smart", Evas_Object_Smart, 256, NULL);
-   o = EVAS_MEMPOOL_ALLOC(_mp_obj, Evas_Object_Smart);
-   if (!o) return NULL;
-   EVAS_MEMPOOL_PREP(_mp_obj, o, Evas_Object_Smart);
-   o->magic = MAGIC_OBJ_SMART;
-   return o;
-}
-
-static void
-evas_object_smart_free(Evas_Object *obj)
-{
-   Evas_Object_Smart *o;
-
-   /* frees private object data. very simple here */
-   o = (Evas_Object_Smart *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Smart, MAGIC_OBJ_SMART);
-   return;
-   MAGIC_CHECK_END();
-   /* free obj */
-   o->magic = 0;
-   EVAS_MEMPOOL_FREE(_mp_obj, o);
-}
-
-static void
-evas_object_smart_render(Evas_Object *obj __UNUSED__, void *output __UNUSED__, void *context __UNUSED__, void *surface __UNUSED__, int x __UNUSED__, int y __UNUSED__)
-{
-   return;
-}
-
-static void
-evas_object_smart_render_pre(Evas_Object *obj)
-{
-   if (obj->pre_render_done) return;
-   if ((obj->cur.map != obj->prev.map) ||
-       (obj->cur.usemap != obj->prev.usemap))
-     {
-        evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, obj);
-        goto done;
-     }
-done:
-   obj->pre_render_done = 1;
-}
-
-static void
-evas_object_smart_render_post(Evas_Object *obj)
-{
-   obj->prev = obj->cur;
-}
-
-static unsigned int evas_object_smart_id_get(Evas_Object *obj)
-{
-   Evas_Object_Smart *o;
-
-   o = (Evas_Object_Smart *)(obj->object_data);
-   if (!o) return 0;
-   return MAGIC_OBJ_SMART;
-}
-
-static unsigned int evas_object_smart_visual_id_get(Evas_Object *obj)
-{
-   Evas_Object_Smart *o;
-
-   o = (Evas_Object_Smart *)(obj->object_data);
-   if (!o) return 0;
-   return MAGIC_OBJ_CONTAINER;
-}
-
-static void *evas_object_smart_engine_data_get(Evas_Object *obj)
-{
-   Evas_Object_Smart *o;
-
-   o = (Evas_Object_Smart *)(obj->object_data);
-   if (!o) return NULL;
-   return o->engine_data;
-}
diff --git a/libraries/evas/src/lib/canvas/evas_object_smart_clipped.c b/libraries/evas/src/lib/canvas/evas_object_smart_clipped.c
deleted file mode 100644
index 9b9fa6d..0000000
--- a/libraries/evas/src/lib/canvas/evas_object_smart_clipped.c
+++ /dev/null
@@ -1,183 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-
-#define CSO_DATA_GET_OR_RETURN(obj, ptr)                                 \
-  Evas_Object_Smart_Clipped_Data *ptr = evas_object_smart_data_get(obj); \
-  if (!ptr) return;
-
-EAPI void
-evas_object_smart_move_children_relative(Evas_Object *obj, Evas_Coord dx, Evas_Coord dy)
-{
-   const Eina_Inlist *lst;
-   Evas_Object *child;
-
-   if ((dx == 0) && (dy == 0))
-     return;
-
-   lst = evas_object_smart_members_get_direct(obj);
-   EINA_INLIST_FOREACH(lst, child)
-     {
-        Evas_Coord orig_x, orig_y;
-
-// shortcut as we are in evas        
-//      evas_object_geometry_get(child, &orig_x, &orig_y, NULL, NULL);
-        if (child->delete_me) continue;
-        if (child->is_static_clip) continue;
-        orig_x = child->cur.geometry.x;
-        orig_y = child->cur.geometry.y;
-        evas_object_move(child, orig_x + dx, orig_y + dy);
-     }
-}
-
-EAPI Evas_Object *
-evas_object_smart_clipped_clipper_get(Evas_Object *obj)
-{
-   Evas_Object_Smart_Clipped_Data *cso = evas_object_smart_data_get(obj);
-   if (!cso)
-     return NULL;
-
-   return cso->clipper;
-}
-
-static void
-evas_object_smart_clipped_smart_add(Evas_Object *obj)
-{
-   Evas_Object_Smart_Clipped_Data *cso;
-   Evas_Object *clipper;
-
-   cso = evas_object_smart_data_get(obj);
-   if (!cso)
-     cso = calloc(1, sizeof(*cso)); /* users can provide it or realloc() later */
-
-   cso->evas = evas_object_evas_get(obj);
-   clipper = evas_object_rectangle_add(cso->evas);
-   evas_object_static_clip_set(clipper, 1);
-   cso->clipper = NULL;
-   evas_object_smart_member_add(clipper, obj);
-   cso->clipper = clipper;
-   evas_object_color_set(cso->clipper, 255, 255, 255, 255);
-   evas_object_move(cso->clipper, -100000, -100000);
-   evas_object_resize(cso->clipper, 200000, 200000);
-   evas_object_pass_events_set(cso->clipper, 1);
-   evas_object_hide(cso->clipper); /* show when have something clipped to it */
-
-   evas_object_smart_data_set(obj, cso);
-}
-
-static void
-evas_object_smart_clipped_smart_del(Evas_Object *obj)
-{
-   CSO_DATA_GET_OR_RETURN(obj, cso);
-
-   if (cso->clipper)
-     {
-        Evas_Object *clipper = cso->clipper;
-        cso->clipper = NULL;
-        evas_object_del(clipper);
-     }
-
-   _evas_object_smart_members_all_del(obj);
-
-   free(cso);
-   evas_object_smart_data_set(obj, NULL);
-}
-
-static void
-evas_object_smart_clipped_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
-{
-   Evas_Coord orig_x, orig_y;
-
-   evas_object_geometry_get(obj, &orig_x, &orig_y, NULL, NULL);
-   evas_object_smart_move_children_relative(obj, x - orig_x, y - orig_y);
-}
-
-static void
-evas_object_smart_clipped_smart_show(Evas_Object *obj)
-{
-   CSO_DATA_GET_OR_RETURN(obj, cso);
-   if (evas_object_clipees_get(cso->clipper))
-     evas_object_show(cso->clipper); /* just show if clipper being used */
-}
-
-static void
-evas_object_smart_clipped_smart_hide(Evas_Object *obj)
-{
-   CSO_DATA_GET_OR_RETURN(obj, cso);
-   evas_object_hide(cso->clipper);
-}
-
-static void
-evas_object_smart_clipped_smart_color_set(Evas_Object *obj, int r, int g, int b, int a)
-{
-   CSO_DATA_GET_OR_RETURN(obj, cso);
-   evas_object_color_set(cso->clipper, r, g, b, a);
-}
-
-static void
-evas_object_smart_clipped_smart_clip_set(Evas_Object *obj, Evas_Object *clip)
-{
-   CSO_DATA_GET_OR_RETURN(obj, cso);
-   evas_object_clip_set(cso->clipper, clip);
-}
-
-static void
-evas_object_smart_clipped_smart_clip_unset(Evas_Object *obj)
-{
-   CSO_DATA_GET_OR_RETURN(obj, cso);
-   evas_object_clip_unset(cso->clipper);
-}
-
-static void
-evas_object_smart_clipped_smart_member_add(Evas_Object *obj, Evas_Object *member)
-{
-   CSO_DATA_GET_OR_RETURN(obj, cso);
-   if (!cso->clipper)
-     return;
-   evas_object_clip_set(member, cso->clipper);
-   if (evas_object_visible_get(obj))
-     evas_object_show(cso->clipper);
-}
-
-static void
-evas_object_smart_clipped_smart_member_del(Evas_Object *obj, Evas_Object *member)
-{
-   CSO_DATA_GET_OR_RETURN(obj, cso);
-   if (!cso->clipper)
-     return;
-   evas_object_clip_unset(member);
-   if (!evas_object_clipees_get(cso->clipper))
-     evas_object_hide(cso->clipper);
-}
-
-EAPI void
-evas_object_smart_clipped_smart_set(Evas_Smart_Class *sc)
-{
-   if (!sc)
-     return;
-
-   sc->add = evas_object_smart_clipped_smart_add;
-   sc->del = evas_object_smart_clipped_smart_del;
-   sc->move = evas_object_smart_clipped_smart_move;
-   sc->show = evas_object_smart_clipped_smart_show;
-   sc->hide = evas_object_smart_clipped_smart_hide;
-   sc->color_set = evas_object_smart_clipped_smart_color_set;
-   sc->clip_set = evas_object_smart_clipped_smart_clip_set;
-   sc->clip_unset = evas_object_smart_clipped_smart_clip_unset;
-   sc->calculate = NULL;
-   sc->member_add = evas_object_smart_clipped_smart_member_add;
-   sc->member_del = evas_object_smart_clipped_smart_member_del;
-}
-
-EAPI const Evas_Smart_Class *
-evas_object_smart_clipped_class_get(void)
-{
-   static Evas_Smart_Class _sc = EVAS_SMART_CLASS_INIT_NAME_VERSION("EvasObjectSmartClipped");
-   static const Evas_Smart_Class *class = NULL;
-
-   if (class)
-     return class;
-
-   evas_object_smart_clipped_smart_set(&_sc);
-   class = &_sc;
-   return class;
-}
diff --git a/libraries/evas/src/lib/canvas/evas_object_table.c b/libraries/evas/src/lib/canvas/evas_object_table.c
deleted file mode 100644
index cdfa07f..0000000
--- a/libraries/evas/src/lib/canvas/evas_object_table.c
+++ /dev/null
@@ -1,1373 +0,0 @@
-#include "evas_common.h"
-#include <errno.h>
-
-typedef struct _Evas_Object_Table_Data       Evas_Object_Table_Data;
-typedef struct _Evas_Object_Table_Option     Evas_Object_Table_Option;
-typedef struct _Evas_Object_Table_Cache      Evas_Object_Table_Cache;
-typedef struct _Evas_Object_Table_Iterator   Evas_Object_Table_Iterator;
-typedef struct _Evas_Object_Table_Accessor   Evas_Object_Table_Accessor;
-
-struct _Evas_Object_Table_Option
-{
-   Evas_Object *obj;
-   unsigned short col, row, colspan, rowspan, end_col, end_row;
-   struct {
-      Evas_Coord w, h;
-   } min, max;
-   struct {
-      double h, v;
-   } align;
-   struct {
-      Evas_Coord l, r, t, b;
-   } pad;
-   Eina_Bool expand_h : 1; /* XXX required? */
-   Eina_Bool expand_v : 1; /* XXX required? */
-   Eina_Bool fill_h : 1;
-   Eina_Bool fill_v : 1;
-};
-
-struct _Evas_Object_Table_Cache
-{
-   struct {
-      struct {
-         double h, v;
-      } weights;
-      struct {
-         int h, v;
-      } expands;
-      struct {
-         Evas_Coord w, h;
-      } min;
-   } total;
-   struct {
-      double *h, *v;
-   } weights;
-   struct {
-      Evas_Coord *h, *v;
-   } sizes;
-   struct {
-      Eina_Bool *h, *v;
-   } expands;
-   double ___pad; // padding to make sure doubles at end can be aligned
-};
-
-struct _Evas_Object_Table_Data
-{
-   Evas_Object_Smart_Clipped_Data base;
-   Eina_List *children;
-   struct {
-      Evas_Coord h, v;
-   } pad;
-   struct {
-      double h, v;
-   } align;
-   struct {
-      int cols, rows;
-   } size;
-   Evas_Object_Table_Cache *cache;
-   Evas_Object_Table_Homogeneous_Mode homogeneous;
-   Eina_Bool hints_changed : 1;
-   Eina_Bool expand_h : 1;
-   Eina_Bool expand_v : 1;
-   Eina_Bool is_mirrored : 1;
-};
-
-struct _Evas_Object_Table_Iterator
-{
-   Eina_Iterator iterator;
-
-   Eina_Iterator *real_iterator;
-   const Evas_Object *table;
-};
-
-struct _Evas_Object_Table_Accessor
-{
-   Eina_Accessor accessor;
-
-   Eina_Accessor *real_accessor;
-   const Evas_Object *table;
-};
-
-#define EVAS_OBJECT_TABLE_DATA_GET(o, ptr)                      \
-  Evas_Object_Table_Data *ptr = evas_object_smart_data_get(o)
-
-#define EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN(o, ptr)                    \
-  EVAS_OBJECT_TABLE_DATA_GET(o, ptr);                                   \
-  if (!ptr)                                                             \
-    {                                                                   \
-      CRIT("no widget data for object %p (%s)",         \
-           o, evas_object_type_get(o));                                 \
-       abort();                                                         \
-       return;                                                          \
-}
-
-#define EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN_VAL(o, ptr, val)           \
-  EVAS_OBJECT_TABLE_DATA_GET(o, ptr);                                   \
-  if (!ptr)                                                             \
-    {                                                                   \
-       CRIT("No widget data for object %p (%s)",                        \
-               o, evas_object_type_get(o));                             \
-       abort();                                                         \
-       return val;                                                      \
-    }
-
-static const char EVAS_OBJECT_TABLE_OPTION_KEY[] = "|EvTb";
-
-static Eina_Bool
-_evas_object_table_iterator_next(Evas_Object_Table_Iterator *it, void **data)
-{
-   Evas_Object_Table_Option *opt;
-
-   if (!eina_iterator_next(it->real_iterator, (void **)&opt))
-     return EINA_FALSE;
-   if (data) *data = opt->obj;
-   return EINA_TRUE;
-}
-
-static Evas_Object *
-_evas_object_table_iterator_get_container(Evas_Object_Table_Iterator *it)
-{
-   return (Evas_Object *)it->table;
-}
-
-static void
-_evas_object_table_iterator_free(Evas_Object_Table_Iterator *it)
-{
-   eina_iterator_free(it->real_iterator);
-   free(it);
-}
-
-static Eina_Bool
-_evas_object_table_accessor_get_at(Evas_Object_Table_Accessor *it, unsigned int idx, void **data)
-{
-   Evas_Object_Table_Option *opt = NULL;
-
-   if (!eina_accessor_data_get(it->real_accessor, idx, (void **)&opt))
-     return EINA_FALSE;
-   if (data) *data = opt->obj;
-   return EINA_TRUE;
-}
-
-static Evas_Object *
-_evas_object_table_accessor_get_container(Evas_Object_Table_Accessor *it)
-{
-   return (Evas_Object *)it->table;
-}
-
-static void
-_evas_object_table_accessor_free(Evas_Object_Table_Accessor *it)
-{
-   eina_accessor_free(it->real_accessor);
-   free(it);
-}
-
-static Evas_Object_Table_Cache *
-_evas_object_table_cache_alloc(int cols, int rows)
-{
-   Evas_Object_Table_Cache *cache;
-   int size;
-
-   size = sizeof(Evas_Object_Table_Cache) +
-      ((cols + rows) * 
-          (sizeof(double) + sizeof(Evas_Coord) + sizeof(Eina_Bool)));
-   cache = malloc(size);
-   if (!cache)
-     {
-        ERR("Could not allocate table cache %dx%d (%d bytes): %s",
-              cols, rows, size, strerror(errno));
-        return NULL;
-     }
-
-   cache->weights.h = (double *)(cache + 1);
-   cache->weights.v = (double *)(cache->weights.h + cols);
-   cache->sizes.h = (Evas_Coord *)(cache->weights.v + rows);
-   cache->sizes.v = (Evas_Coord *)(cache->sizes.h + cols);
-   cache->expands.h = (Eina_Bool *)(cache->sizes.v + rows);
-   cache->expands.v = (Eina_Bool *)(cache->expands.h + cols);
-
-   return cache;
-}
-
-static void
-_evas_object_table_cache_free(Evas_Object_Table_Cache *cache)
-{
-   free(cache);
-}
-
-static void
-_evas_object_table_cache_reset(Evas_Object_Table_Data *priv)
-{
-   Evas_Object_Table_Cache *c = priv->cache;
-   int size;
-
-   c->total.expands.v = 0;
-   c->total.expands.h = 0;
-   c->total.min.w = 0;
-   c->total.min.h = 0;
-
-   size = ((priv->size.rows + priv->size.cols) *
-           (sizeof(double) + sizeof(Evas_Coord) + sizeof(Eina_Bool)));
-   memset(c + 1, 0, size);
-}
-
-static void
-_evas_object_table_cache_invalidate(Evas_Object_Table_Data *priv)
-{
-   priv->hints_changed = 1;
-   if (priv->cache)
-     {
-        _evas_object_table_cache_free(priv->cache);
-        priv->cache = NULL;
-     }
-}
-
-static Evas_Object_Table_Option *
-_evas_object_table_option_get(Evas_Object *o)
-{
-   return evas_object_data_get(o, EVAS_OBJECT_TABLE_OPTION_KEY);
-}
-
-static void
-_evas_object_table_option_set(Evas_Object *o, const Evas_Object_Table_Option *opt)
-{
-   evas_object_data_set(o, EVAS_OBJECT_TABLE_OPTION_KEY, opt);
-}
-
-static Evas_Object_Table_Option *
-_evas_object_table_option_del(Evas_Object *o)
-{
-   return evas_object_data_del(o, EVAS_OBJECT_TABLE_OPTION_KEY);
-}
-
-static void
-_on_child_del(void *data, Evas *evas __UNUSED__, Evas_Object *child, void *einfo __UNUSED__)
-{
-   Evas_Object *table = data;
-   evas_object_table_unpack(table, child);
-}
-
-static void
-_on_child_hints_changed(void *data, Evas *evas __UNUSED__, Evas_Object *child __UNUSED__, void *einfo __UNUSED__)
-{
-   Evas_Object *table = data;
-   EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN(table, priv);
-   _evas_object_table_cache_invalidate(priv);
-   evas_object_smart_changed(table);
-}
-
-static void
-_evas_object_table_child_connect(Evas_Object *o, Evas_Object *child)
-{
-   evas_object_event_callback_add
-     (child, EVAS_CALLBACK_DEL, _on_child_del, o);
-   evas_object_event_callback_add
-     (child, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_child_hints_changed, o);
-}
-
-static void
-_evas_object_table_child_disconnect(Evas_Object *o, Evas_Object *child)
-{
-   evas_object_event_callback_del_full
-     (child, EVAS_CALLBACK_DEL, _on_child_del, o);
-   evas_object_event_callback_del_full
-     (child, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_child_hints_changed, o);
-}
-
-static void
-_evas_object_table_calculate_cell(const Evas_Object_Table_Option *opt, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
-{
-   Evas_Coord cw, ch;
-
-   *w -= opt->pad.l + opt->pad.r;
-   if (*w < opt->min.w)
-     cw = opt->min.w;
-   else if ((opt->max.w > -1) && (*w > opt->max.w))
-     cw = opt->max.w;
-   else if (opt->fill_h)
-     cw = *w;
-   else
-     cw = opt->min.w;
-
-   *h -= opt->pad.t + opt->pad.b;
-   if (*h < opt->min.h)
-     ch = opt->min.h;
-   else if ((opt->max.h > -1) && (*h > opt->max.h))
-     ch = opt->max.h;
-   else if (opt->fill_v)
-     ch = *h;
-   else
-     ch = opt->min.h;
-
-   *x += opt->pad.l;
-   if (cw != *w)
-     {
-        *x += (*w - cw) * opt->align.h;
-        *w = cw;
-     }
-
-   *y += opt->pad.t;
-   if (ch != *h)
-     {
-        *y += (*h - ch) * opt->align.v;
-        *h = ch;
-     }
-}
-
-static void
-_evas_object_table_calculate_hints_homogeneous(Evas_Object *o, Evas_Object_Table_Data *priv)
-{
-   Eina_List *l;
-   Evas_Object_Table_Option *opt;
-   Evas_Coord minw, minh, o_minw, o_minh;
-   Eina_Bool expand_h, expand_v;
-
-   o_minw = 0;
-   o_minh = 0;
-   minw = 0;
-   minh = 0;
-   expand_h = 0;
-   expand_v = 0;
-
-   EINA_LIST_FOREACH(priv->children, l, opt)
-     {
-        Evas_Object *child = opt->obj;
-        Evas_Coord child_minw, child_minh, cell_minw, cell_minh;
-        double weightw, weighth;
-
-        evas_object_size_hint_min_get(child, &opt->min.w, &opt->min.h);
-        evas_object_size_hint_max_get(child, &opt->max.w, &opt->max.h);
-        evas_object_size_hint_padding_get
-          (child, &opt->pad.l, &opt->pad.r, &opt->pad.t, &opt->pad.b);
-        evas_object_size_hint_align_get(child, &opt->align.h, &opt->align.v);
-        evas_object_size_hint_weight_get(child, &weightw, &weighth);
-
-        child_minw = opt->min.w + opt->pad.l + opt->pad.r;
-        child_minh = opt->min.h + opt->pad.t + opt->pad.b;
-
-        cell_minw = (child_minw + opt->colspan - 1) / opt->colspan;
-        cell_minh = (child_minh + opt->rowspan - 1) / opt->rowspan;
-
-        opt->expand_h = 0;
-        if ((weightw > 0.0) &&
-            ((opt->max.w < 0) ||
-             ((opt->max.w > -1) && (opt->min.w < opt->max.w))))
-          {
-             opt->expand_h = 1;
-             expand_h = 1;
-          }
-
-        opt->expand_v = 0;
-        if ((weighth > 0.0) &&
-            ((opt->max.h < 0) ||
-             ((opt->max.h > -1) && (opt->min.h < opt->max.h))))
-          {
-             opt->expand_v = 1;
-             expand_v = 1;
-          }
-
-        opt->fill_h = 0;
-        if (opt->align.h < 0.0)
-          {
-             opt->align.h = 0.5;
-             opt->fill_h = 1;
-          }
-        opt->fill_v = 0;
-        if (opt->align.v < 0.0)
-          {
-             opt->align.v = 0.5;
-             opt->fill_v = 1;
-          }
-
-        /* greatest mininum values, with paddings */
-        if (minw < cell_minw)
-          minw = cell_minw;
-        if (minh < cell_minh)
-          minh = cell_minh;
-        /* greatest mininum values, without paddings */
-        if (o_minw < opt->min.w)
-          o_minw = opt->min.w;
-        if (o_minh < opt->min.h)
-          o_minh = opt->min.h;
-     }
-
-   if (priv->homogeneous == EVAS_OBJECT_TABLE_HOMOGENEOUS_ITEM)
-     {
-        if (o_minw < 1)
-          {
-             ERR("homogeneous table based on item size but no "
-                   "horizontal mininum size specified! Using expand.");
-             expand_h = 1;
-          }
-        if (o_minh < 1)
-          {
-             ERR("homogeneous table based on item size but no "
-                   "vertical mininum size specified! Using expand.");
-             expand_v = 1;
-          }
-     }
-
-   minw = priv->size.cols * (minw + priv->pad.h) - priv->pad.h;
-   minh = priv->size.rows * (minh + priv->pad.v) - priv->pad.v;
-
-   priv->hints_changed = 0;
-   priv->expand_h = expand_h;
-   priv->expand_v = expand_v;
-
-   if ((minw > 0 ) || (minh > 0))
-     evas_object_size_hint_min_set(o, minw, minh);
-
-   // XXX hint max?
-}
-
-static void
-_evas_object_table_calculate_layout_homogeneous_sizes_item(const Evas_Object *o, const Evas_Object_Table_Data *priv, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
-{
-   Evas_Coord minw, minh;
-   Eina_Bool expand_h, expand_v;
-
-   evas_object_size_hint_min_get(o, &minw, &minh);
-   expand_h = priv->expand_h;
-   expand_v = priv->expand_v;
-
-   if (*w < minw)
-     expand_h = 0;
-   if (!expand_h)
-     {
-        *x += (*w - minw) * priv->align.h;
-        *w = minw;
-     }
-
-   if (*h < minh)
-     expand_v = 0;
-   if (!expand_v)
-     {
-        *y += (*h - minh) * priv->align.v;
-        *h = minh;
-     }
-}
-
-static void
-_evas_object_table_calculate_layout_homogeneous_sizes(const Evas_Object *o, const Evas_Object_Table_Data *priv, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h, Evas_Coord *cellw, Evas_Coord *cellh)
-{
-   evas_object_geometry_get(o, x, y, w, h);
-   if (priv->homogeneous == EVAS_OBJECT_TABLE_HOMOGENEOUS_ITEM)
-     _evas_object_table_calculate_layout_homogeneous_sizes_item
-       (o, priv, x, y, w, h);
-
-   *cellw = (*w + priv->size.cols - 1) / priv->size.cols;
-   *cellh = (*h + priv->size.rows - 1) / priv->size.rows;
-}
-
-static void
-_evas_object_table_calculate_layout_homogeneous(Evas_Object *o, Evas_Object_Table_Data *priv)
-{
-   Evas_Coord x = 0, y = 0, w = 0, h = 0, ww, hh, cellw = 0, cellh = 0;
-   Eina_List *l;
-   Evas_Object_Table_Option *opt;
-   
-   _evas_object_table_calculate_layout_homogeneous_sizes
-     (o, priv, &x, &y, &w, &h, &cellw, &cellh);
-   
-   ww = w - ((priv->size.cols - 1) * priv->pad.h);
-   hh = h - ((priv->size.rows - 1) * priv->pad.v);
-   
-   if (ww < 0) ww = 0;
-   if (ww < 0) ww = 0;
-   
-   EINA_LIST_FOREACH(priv->children, l, opt)
-     {
-        Evas_Object *child = opt->obj;
-        Evas_Coord cx, cy, cw, ch, cox, coy, cow, coh;
-
-        cx = x + ((opt->col * ww) / priv->size.cols);
-        cw = x + (((opt->col + opt->colspan) * ww) / priv->size.cols) - cx;
-        cy = y + ((opt->row * hh) / priv->size.rows);
-        ch = y + (((opt->row + opt->rowspan) * hh) / priv->size.rows) - cy;
-
-        cx += (opt->col) * priv->pad.h;
-        cy += (opt->row) * priv->pad.v;
-        
-        cox = cx;
-        coy = cy;
-        cow = cw;
-        coh = ch;
-
-        _evas_object_table_calculate_cell(opt, &cx, &cy, &cw, &ch);
-        if (cw > cow)
-          {
-             cx = cox;
-             cw = cow;
-          }
-        if (ch > coh)
-          {
-             cy = coy;
-             ch = coh;
-          }
-
-        if (priv->is_mirrored)
-          {
-             evas_object_move(opt->obj, x + w - (cx - x + cw), cy);
-          }
-        else
-          {
-             evas_object_move(child, cx, cy);
-          }
-        evas_object_resize(child, cw, ch);
-     }
-}
-
-static void
-_evas_object_table_smart_calculate_homogeneous(Evas_Object *o, Evas_Object_Table_Data *priv)
-{
-   if (priv->hints_changed)
-     _evas_object_table_calculate_hints_homogeneous(o, priv);
-   _evas_object_table_calculate_layout_homogeneous(o, priv);
-}
-
-static int
-_evas_object_table_count_expands(const Eina_Bool *expands, int start, int end)
-{
-   const Eina_Bool *itr = expands + start, *itr_end = expands + end;
-   int count = 0;
-
-   for (; itr < itr_end; itr++)
-     {
-        if (*itr)
-           count++;
-     }
-
-   return count;
-}
-
-static Evas_Coord
-_evas_object_table_sum_sizes(const Evas_Coord *sizes, int start, int end)
-{
-   const Evas_Coord *itr = sizes + start, *itr_end = sizes + end;
-   Evas_Coord sum = 0;
-
-   for (; itr < itr_end; itr++)
-     sum += *itr;
-
-   return sum;
-}
-
-static void
-_evas_object_table_sizes_calc_noexpand(Evas_Coord *sizes, int start, int end, Evas_Coord space)
-{
-   Evas_Coord *itr = sizes + start, *itr_end = sizes + end - 1;
-   Evas_Coord step;
-   int units;
-
-   /* XXX move to fixed point math and spread errors among cells */
-   units = end - start;
-   step = space / units;
-   for (; itr < itr_end; itr++)
-     *itr += step;
-
-   *itr += space - step * (units - 1);
-}
-
-static void
-_evas_object_table_sizes_calc_expand(Evas_Coord *sizes, int start, int end, Evas_Coord space, const Eina_Bool *expands, int expand_count, double *weights, double weighttot)
-{
-   Evas_Coord *itr = sizes + start, *itr_end = sizes + end;
-   const Eina_Bool *itr_expand = expands + start;
-   Evas_Coord step = 0, last_space = 0;
-   int total = 0, i = start;
-   
-   /* XXX move to fixed point math and spread errors among cells */
-   if (weighttot > 0.0)
-     {
-        step = space / expand_count;
-        last_space = space - step * (expand_count - 1);
-     }
-
-   for (; itr < itr_end; itr++, itr_expand++, i++)
-     {
-        if (weighttot <= 0.0)
-          {
-             if (*itr_expand)
-               {
-                  expand_count--;
-                  if (expand_count > 0)
-                     *itr += step;
-                  else
-                    {
-                       *itr += last_space;
-                       break;
-                    }
-               }
-          }
-        else
-          {
-             if (*itr_expand)
-               {
-                  expand_count--;
-                  if (expand_count > 0)
-                    {
-                       step = (weights[i] / weighttot) * space;
-                       *itr += step;
-                       total += step;
-                    }
-                  else
-                    {
-                       *itr += space - total;
-                       break;
-                    }
-               }
-          }
-     }
-}
-
-static void
-_evas_object_table_calculate_hints_regular(Evas_Object *o, Evas_Object_Table_Data *priv)
-{
-   Evas_Object_Table_Option *opt;
-   Evas_Object_Table_Cache *c;
-   Eina_List *l;
-   double totweightw = 0.0, totweighth = 0.0;
-   int i;
-   
-   if (!priv->cache)
-     {
-        priv->cache = _evas_object_table_cache_alloc
-          (priv->size.cols, priv->size.rows);
-        if (!priv->cache)
-          return;
-     }
-   c = priv->cache;
-   _evas_object_table_cache_reset(priv);
-
-   /* cache interesting data */
-   memset(c->expands.h, 1, priv->size.cols);
-   memset(c->expands.v, 1, priv->size.rows);
-   memset(c->weights.h, 0, priv->size.cols);
-   memset(c->weights.v, 0, priv->size.rows);
-   EINA_LIST_FOREACH(priv->children, l, opt)
-     {
-        Evas_Object *child = opt->obj;
-        double weightw, weighth;
-
-        evas_object_size_hint_min_get(child, &opt->min.w, &opt->min.h);
-        evas_object_size_hint_max_get(child, &opt->max.w, &opt->max.h);
-        evas_object_size_hint_padding_get
-          (child, &opt->pad.l, &opt->pad.r, &opt->pad.t, &opt->pad.b);
-        evas_object_size_hint_align_get(child, &opt->align.h, &opt->align.v);
-        evas_object_size_hint_weight_get(child, &weightw, &weighth);
-
-        opt->expand_h = 0;
-        if ((weightw > 0.0) &&
-            ((opt->max.w < 0) ||
-             ((opt->max.w > -1) && (opt->min.w < opt->max.w))))
-          opt->expand_h = 1;
-
-        opt->expand_v = 0;
-        if ((weighth > 0.0) &&
-            ((opt->max.h < 0) ||
-             ((opt->max.h > -1) && (opt->min.h < opt->max.h))))
-          opt->expand_v = 1;
-        
-        opt->fill_h = 0;
-        if (opt->align.h < 0.0)
-          {
-             opt->align.h = 0.5;
-             opt->fill_h = 1;
-          }
-        opt->fill_v = 0;
-        if (opt->align.v < 0.0)
-          {
-             opt->align.v = 0.5;
-             opt->fill_v = 1;
-          }
-
-        if (!opt->expand_h)
-          memset(c->expands.h + opt->col, 0, opt->colspan);
-        else
-          {
-             for (i = opt->col; i < opt->col + opt->colspan; i++)
-                c->weights.h[i] += (weightw / (double)opt->colspan);
-          }
-        if (!opt->expand_v)
-          memset(c->expands.v + opt->row, 0, opt->rowspan);
-        else
-          {
-             for (i = opt->row; i < opt->row + opt->rowspan; i++)
-                c->weights.v[i] += (weighth / (double)opt->rowspan);
-          }
-     }
-   for (i = 0; i < priv->size.cols; i++) totweightw += c->weights.h[i];
-   for (i = 0; i < priv->size.rows; i++) totweighth += c->weights.v[i];
-
-   /* calculate sizes for each row and column */
-   EINA_LIST_FOREACH(priv->children, l, opt)
-     {
-        Evas_Coord tot, need;
-
-        /* handle horizontal */
-        tot = _evas_object_table_sum_sizes(c->sizes.h, opt->col, opt->end_col);
-        need = opt->min.w + opt->pad.l + opt->pad.r;
-        if (tot < need)
-          {
-             Evas_Coord space = need - tot;
-             int count;
-
-             count = _evas_object_table_count_expands
-               (c->expands.h, opt->col, opt->end_col);
-
-             if (count > 0)
-               _evas_object_table_sizes_calc_expand
-                 (c->sizes.h, opt->col, opt->end_col, space,
-                  c->expands.h, count, c->weights.h, totweightw);
-             else
-               _evas_object_table_sizes_calc_noexpand
-                 (c->sizes.h, opt->col, opt->end_col, space);
-          }
-
-        /* handle vertical */
-        tot = _evas_object_table_sum_sizes(c->sizes.v, opt->row, opt->end_row);
-        need = opt->min.h + opt->pad.t + opt->pad.b;
-        if (tot < opt->min.h)
-          {
-             Evas_Coord space = need - tot;
-             int count;
-
-             count = _evas_object_table_count_expands
-               (c->expands.v, opt->row, opt->end_row);
-
-             if (count > 0)
-               _evas_object_table_sizes_calc_expand
-                 (c->sizes.v, opt->row, opt->end_row, space,
-                  c->expands.v, count, c->weights.v, totweighth);
-             else
-               _evas_object_table_sizes_calc_noexpand
-                 (c->sizes.v, opt->row, opt->end_row, space);
-          }
-     }
-
-   c->total.weights.h = totweightw;
-   c->total.weights.v = totweighth;
-   
-   c->total.expands.h = _evas_object_table_count_expands
-     (c->expands.h, 0, priv->size.cols);
-   c->total.expands.v = _evas_object_table_count_expands
-     (c->expands.v, 0, priv->size.rows);
-
-   c->total.min.w = _evas_object_table_sum_sizes
-     (c->sizes.h, 0, priv->size.cols);
-   c->total.min.h = _evas_object_table_sum_sizes
-     (c->sizes.v, 0, priv->size.rows);
-
-   c->total.min.w += priv->pad.h * (priv->size.cols - 1);
-   c->total.min.h += priv->pad.v * (priv->size.rows - 1);
-
-   if ((c->total.min.w > 0) || (c->total.min.h > 0))
-     evas_object_size_hint_min_set(o, c->total.min.w, c->total.min.h);
-
-   // XXX hint max?
-}
-
-static void
-_evas_object_table_calculate_layout_regular(Evas_Object *o, Evas_Object_Table_Data *priv)
-{
-   Evas_Object_Table_Option *opt;
-   Evas_Object_Table_Cache *c;
-   Eina_List *l;
-   Evas_Coord *cols = NULL, *rows = NULL;
-   Evas_Coord x, y, w, h;
-
-   evas_object_geometry_get(o, &x, &y, &w, &h);
-   c = priv->cache;
-
-   /* handle horizontal */
-   if ((c->total.expands.h <= 0) || (c->total.min.w >= w))
-     {
-        x += (w - c->total.min.w) * priv->align.h;
-        w = c->total.min.w;
-        cols = c->sizes.h;
-     }
-   else
-     {
-        int size = priv->size.cols * sizeof(Evas_Coord);
-        cols = malloc(size);
-        if (!cols)
-          {
-             ERR("Could not allocate temp columns (%d bytes): %s",
-                 size, strerror(errno));
-             goto end;
-          }
-        memcpy(cols, c->sizes.h, size);
-        _evas_object_table_sizes_calc_expand
-          (cols, 0, priv->size.cols, w - c->total.min.w,
-           c->expands.h, c->total.expands.h, c->weights.h, c->total.weights.h);
-     }
-
-   /* handle vertical */
-   if ((c->total.expands.v <= 0) || (c->total.min.h >= h))
-     {
-        y += (h - c->total.min.h) * priv->align.v;
-        h = c->total.min.h;
-        rows = c->sizes.v;
-     }
-   else
-     {
-        int size = priv->size.rows * sizeof(Evas_Coord);
-        rows = malloc(size);
-        if (!rows)
-          {
-             ERR("could not allocate temp rows (%d bytes): %s",
-                 size, strerror(errno));
-             goto end;
-          }
-        memcpy(rows, c->sizes.v, size);
-        _evas_object_table_sizes_calc_expand
-          (rows, 0, priv->size.rows, h - c->total.min.h,
-           c->expands.v, c->total.expands.v, c->weights.v, c->total.weights.v);
-     }
-
-   EINA_LIST_FOREACH(priv->children, l, opt)
-     {
-        Evas_Object *child = opt->obj;
-        Evas_Coord cx, cy, cw, ch;
-
-        cx = x + opt->col * (priv->pad.h);
-        cx += _evas_object_table_sum_sizes(cols, 0, opt->col);
-        cw = _evas_object_table_sum_sizes(cols, opt->col, opt->end_col);
-
-        cy = y + opt->row * (priv->pad.v);
-        cy += _evas_object_table_sum_sizes(rows, 0, opt->row);
-        ch = _evas_object_table_sum_sizes(rows, opt->row, opt->end_row);
-
-        _evas_object_table_calculate_cell(opt, &cx, &cy, &cw, &ch);
-
-        if (priv->is_mirrored)
-          {
-             evas_object_move(opt->obj, x + w - (cx - x + cw), cy);
-          }
-        else
-          {
-             evas_object_move(child, cx, cy);
-          }
-        evas_object_resize(child, cw, ch);
-     }
-
- end:
-   if (cols != c->sizes.h)
-     {
-        if (cols) free(cols);
-     }
-   if (rows != c->sizes.v)
-     {
-        if (rows) free(rows);
-     }
-}
-
-static void
-_evas_object_table_smart_calculate_regular(Evas_Object *o, Evas_Object_Table_Data *priv)
-{
-   if (priv->hints_changed)
-     _evas_object_table_calculate_hints_regular(o, priv);
-   _evas_object_table_calculate_layout_regular(o, priv);
-}
-
-EVAS_SMART_SUBCLASS_NEW("Evas_Object_Table", _evas_object_table,
-                        Evas_Smart_Class, Evas_Smart_Class,
-                        evas_object_smart_clipped_class_get, NULL)
-
-static void
-_evas_object_table_smart_add(Evas_Object *o)
-{
-   EVAS_SMART_DATA_ALLOC(o, Evas_Object_Table_Data)
-
-   priv->pad.h = 0;
-   priv->pad.v = 0;
-   priv->align.h = 0.5;
-   priv->align.v = 0.5;
-   priv->size.cols = 0;
-   priv->size.rows = 0;
-   priv->cache = NULL;
-   priv->homogeneous = EVAS_OBJECT_TABLE_HOMOGENEOUS_NONE;
-   priv->hints_changed = 1;
-   priv->expand_h = 0;
-   priv->expand_v = 0;
-
-   _evas_object_table_parent_sc->add(o);
-}
-
-static void
-_evas_object_table_smart_del(Evas_Object *o)
-{
-   EVAS_OBJECT_TABLE_DATA_GET(o, priv);
-   Eina_List *l;
-
-   l = priv->children;
-   while (l)
-     {
-        Evas_Object_Table_Option *opt = l->data;
-        _evas_object_table_child_disconnect(o, opt->obj);
-        _evas_object_table_option_del(opt->obj);
-        free(opt);
-        l = eina_list_remove_list(l, l);
-     }
-
-   if (priv->cache)
-     {
-        _evas_object_table_cache_free(priv->cache);
-        priv->cache = NULL;
-     }
-
-   _evas_object_table_parent_sc->del(o);
-}
-
-static void
-_evas_object_table_smart_resize(Evas_Object *o, Evas_Coord w, Evas_Coord h)
-{
-   Evas_Coord ow, oh;
-   evas_object_geometry_get(o, NULL, NULL, &ow, &oh);
-   if ((ow == w) && (oh == h)) return;
-   evas_object_smart_changed(o);
-}
-
-static void
-_evas_object_table_smart_calculate(Evas_Object *o)
-{
-   EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN(o, priv);
-
-   if ((priv->size.cols < 1) || (priv->size.rows < 1))
-     {
-        DBG("Nothing to do: cols=%d, rows=%d",
-              priv->size.cols, priv->size.rows);
-        return;
-     }
-
-   if (priv->homogeneous)
-     _evas_object_table_smart_calculate_homogeneous(o, priv);
-   else
-     _evas_object_table_smart_calculate_regular(o, priv);
-}
-
-static void
-_evas_object_table_smart_set_user(Evas_Smart_Class *sc)
-{
-   sc->add = _evas_object_table_smart_add;
-   sc->del = _evas_object_table_smart_del;
-   sc->resize = _evas_object_table_smart_resize;
-   sc->calculate = _evas_object_table_smart_calculate;
-}
-
-EAPI Evas_Object *
-evas_object_table_add(Evas *evas)
-{
-   return evas_object_smart_add(evas, _evas_object_table_smart_class_new());
-}
-
-EAPI Evas_Object *
-evas_object_table_add_to(Evas_Object *parent)
-{
-   Evas *evas;
-   Evas_Object *o;
-
-   evas = evas_object_evas_get(parent);
-   o = evas_object_table_add(evas);
-   evas_object_smart_member_add(o, parent);
-   return o;
-}
-
-EAPI void
-evas_object_table_homogeneous_set(Evas_Object *o, Evas_Object_Table_Homogeneous_Mode homogeneous)
-{
-   EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN(o, priv);
-   if (priv->homogeneous == homogeneous)
-     return;
-   priv->homogeneous = homogeneous;
-   _evas_object_table_cache_invalidate(priv);
-   evas_object_smart_changed(o);
-}
-
-EAPI Evas_Object_Table_Homogeneous_Mode
-evas_object_table_homogeneous_get(const Evas_Object *o)
-{
-   EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN_VAL(o, priv, 0);
-   return priv->homogeneous;
-}
-
-EAPI void
-evas_object_table_align_set(Evas_Object *o, double horizontal, double vertical)
-{
-   EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN(o, priv);
-   if (priv->align.h == horizontal && priv->align.v == vertical)
-     return;
-   priv->align.h = horizontal;
-   priv->align.v = vertical;
-   evas_object_smart_changed(o);
-}
-
-EAPI void
-evas_object_table_align_get(const Evas_Object *o, double *horizontal, double *vertical)
-{
-   EVAS_OBJECT_TABLE_DATA_GET(o, priv);
-   if (priv)
-     {
-        if (horizontal) *horizontal = priv->align.h;
-        if (vertical) *vertical = priv->align.v;
-     }
-   else
-     {
-        if (horizontal) *horizontal = 0.5;
-        if (vertical) *vertical = 0.5;
-     }
-}
-
-EAPI void
-evas_object_table_padding_set(Evas_Object *o, Evas_Coord horizontal, Evas_Coord vertical)
-{
-   EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN(o, priv);
-   if (priv->pad.h == horizontal && priv->pad.v == vertical)
-     return;
-   priv->pad.h = horizontal;
-   priv->pad.v = vertical;
-   _evas_object_table_cache_invalidate(priv);
-   evas_object_smart_changed(o);
-}
-
-EAPI void
-evas_object_table_padding_get(const Evas_Object *o, Evas_Coord *horizontal, Evas_Coord *vertical)
-{
-   EVAS_OBJECT_TABLE_DATA_GET(o, priv);
-   if (priv)
-     {
-        if (horizontal) *horizontal = priv->pad.h;
-        if (vertical) *vertical = priv->pad.v;
-     }
-   else
-     {
-        if (horizontal) *horizontal = 0;
-        if (vertical) *vertical = 0;
-     }
-}
-
-EAPI Eina_Bool
-evas_object_table_pack_get(Evas_Object *o, Evas_Object *child, unsigned short *col, unsigned short *row, unsigned short *colspan, unsigned short *rowspan)
-{
-   Evas_Object_Table_Option *opt;
-
-   EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN_VAL(o, priv, 0);
-   opt = _evas_object_table_option_get(child);
-   if (!opt)
-     {
-        if (col) *col = 0;
-        if (row) *row = 0;
-        if (colspan) *colspan = 0;
-        if (rowspan) *rowspan = 0;
-        return EINA_FALSE;
-     }
-   if (col) *col = opt->col;
-   if (row) *row = opt->row;
-   if (colspan) *colspan = opt->colspan;
-   if (rowspan) *rowspan = opt->rowspan;
-   return EINA_TRUE;
-}
-
-EAPI Eina_Bool
-evas_object_table_pack(Evas_Object *o, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan)
-{
-   Evas_Object_Table_Option *opt;
-
-   EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN_VAL(o, priv, 0);
-
-   if (rowspan < 1)
-     {
-        ERR("rowspan < 1");
-        return EINA_FALSE;
-     }
-   if (colspan < 1)
-     {
-        ERR("colspan < 1");
-        return EINA_FALSE;
-     }
-
-   opt = _evas_object_table_option_get(child);
-   if (!opt)
-     {
-        opt = malloc(sizeof(*opt));
-        if (!opt)
-          {
-             ERR("could not allocate table option data.");
-             return EINA_FALSE;
-          }
-     }
-
-   opt->obj = child;
-   opt->col = col;
-   opt->row = row;
-   opt->colspan = colspan;
-   opt->rowspan = rowspan;
-   opt->end_col = col + colspan;
-   opt->end_row = row + rowspan;
-   
-   if (evas_object_smart_parent_get(child) == o)
-     {
-        Eina_Bool need_shrink = EINA_FALSE;
-        
-        if (priv->size.cols < opt->end_col)
-           priv->size.cols = opt->end_col;
-        else
-           need_shrink = EINA_TRUE;
-        if (priv->size.rows < opt->end_row)
-           priv->size.rows = opt->end_row;
-        else
-          need_shrink = EINA_TRUE;
-
-        if (need_shrink)
-          {
-             Eina_List *l;
-             Evas_Object_Table_Option *opt2;
-             int max_row = 0, max_col = 0;
-             
-             EINA_LIST_FOREACH(priv->children, l, opt2)
-               {
-                  if (max_col < opt2->end_col) max_col = opt2->end_col;
-                  if (max_row < opt2->end_row) max_row = opt2->end_row;
-               }
-             priv->size.cols = max_col;
-             priv->size.rows = max_row;
-          }
-     }
-   else
-     {
-        opt->min.w = 0;
-        opt->min.h = 0;
-        opt->max.w = 0;
-        opt->max.h = 0;
-        opt->align.h = 0.5;
-        opt->align.v = 0.5;
-        opt->pad.l = 0;
-        opt->pad.r = 0;
-        opt->pad.t = 0;
-        opt->pad.b = 0;
-        opt->expand_h = 0;
-        opt->expand_v = 0;
-
-        priv->children = eina_list_append(priv->children, opt);
-        
-        if (priv->size.cols < opt->end_col)
-           priv->size.cols = opt->end_col;
-        if (priv->size.rows < opt->end_row)
-           priv->size.rows = opt->end_row;
-        
-        _evas_object_table_option_set(child, opt);
-        evas_object_smart_member_add(child, o);
-        _evas_object_table_child_connect(o, child);
-     }
-   _evas_object_table_cache_invalidate(priv);
-   evas_object_smart_changed(o);
-   return EINA_TRUE;
-}
-
-static void
-_evas_object_table_remove_opt(Evas_Object_Table_Data *priv, Evas_Object_Table_Option *opt)
-{
-   Eina_List *l;
-   int max_row, max_col, was_greatest;
-
-   max_row = 0;
-   max_col = 0;
-   was_greatest = 0;
-   l = priv->children;
-   while (l)
-     {
-        Evas_Object_Table_Option *cur_opt = l->data;
-
-        if (cur_opt != opt)
-          {
-             if (max_col < cur_opt->end_col)
-               max_col = cur_opt->end_col;
-             if (max_row < cur_opt->end_row)
-               max_row = cur_opt->end_row;
-
-             l = l->next;
-          }
-        else
-          {
-             Eina_List *tmp = l->next;
-             priv->children = eina_list_remove_list(priv->children, l);
-
-             if ((priv->size.cols > opt->end_col) &&
-                 (priv->size.rows > opt->end_row))
-               break;
-             else
-               {
-                  was_greatest = 1;
-                  l = tmp;
-               }
-          }
-     }
-
-   if (was_greatest)
-     {
-        priv->size.cols = max_col;
-        priv->size.rows = max_row;
-     }
-}
-
-EAPI Eina_Bool
-evas_object_table_unpack(Evas_Object *o, Evas_Object *child)
-{
-   Evas_Object_Table_Option *opt;
-
-   EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN_VAL(o, priv, 0);
-
-   if (o != evas_object_smart_parent_get(child))
-     {
-        ERR("cannot unpack child from incorrect table!");
-        return EINA_FALSE;
-     }
-
-   opt = _evas_object_table_option_del(child);
-   if (!opt)
-     {
-        ERR("cannot unpack child with no packing option!");
-        return EINA_FALSE;
-     }
-
-   _evas_object_table_child_disconnect(o, child);
-   _evas_object_table_remove_opt(priv, opt);
-   evas_object_smart_member_del(child);
-   free(opt);
-   _evas_object_table_cache_invalidate(priv);
-   evas_object_smart_changed(o);
-
-   return EINA_TRUE;
-}
-
-EAPI void
-evas_object_table_clear(Evas_Object *o, Eina_Bool clear)
-{
-   Evas_Object_Table_Option *opt;
-
-   EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN(o, priv);
-
-   EINA_LIST_FREE(priv->children, opt)
-     {
-        _evas_object_table_child_disconnect(o, opt->obj);
-        _evas_object_table_option_del(opt->obj);
-        evas_object_smart_member_del(opt->obj);
-        if (clear)
-          evas_object_del(opt->obj);
-        free(opt);
-     }
-   priv->size.cols = 0;
-   priv->size.rows = 0;
-   _evas_object_table_cache_invalidate(priv);
-   evas_object_smart_changed(o);
-}
-
-EAPI void
-evas_object_table_col_row_size_get(const Evas_Object *o, int *cols, int *rows)
-{
-   EVAS_OBJECT_TABLE_DATA_GET(o, priv);
-   if (priv)
-     {
-        if (cols) *cols = priv->size.cols;
-        if (rows) *rows = priv->size.rows;
-     }
-   else
-     {
-        if (cols) *cols = -1;
-        if (rows) *rows = -1;
-     }
-}
-
-EAPI Eina_Iterator *
-evas_object_table_iterator_new(const Evas_Object *o)
-{
-   Evas_Object_Table_Iterator *it;
-
-   EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN_VAL(o, priv, NULL);
-
-   if (!priv->children) return NULL;
-
-   it = calloc(1, sizeof(Evas_Object_Table_Iterator));
-   if (!it) return NULL;
-
-   EINA_MAGIC_SET(&it->iterator, EINA_MAGIC_ITERATOR);
-
-   it->real_iterator = eina_list_iterator_new(priv->children);
-   it->table = o;
-
-   it->iterator.next = FUNC_ITERATOR_NEXT(_evas_object_table_iterator_next);
-   it->iterator.get_container = FUNC_ITERATOR_GET_CONTAINER(_evas_object_table_iterator_get_container);
-   it->iterator.free = FUNC_ITERATOR_FREE(_evas_object_table_iterator_free);
-
-   return &it->iterator;
-}
-
-EAPI Eina_Accessor *
-evas_object_table_accessor_new(const Evas_Object *o)
-{
-   Evas_Object_Table_Accessor *it;
-
-   EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN_VAL(o, priv, NULL);
-
-   if (!priv->children) return NULL;
-
-   it = calloc(1, sizeof(Evas_Object_Table_Accessor));
-   if (!it) return NULL;
-
-   EINA_MAGIC_SET(&it->accessor, EINA_MAGIC_ACCESSOR);
-
-   it->real_accessor = eina_list_accessor_new(priv->children);
-   it->table = o;
-
-   it->accessor.get_at = FUNC_ACCESSOR_GET_AT(_evas_object_table_accessor_get_at);
-   it->accessor.get_container = FUNC_ACCESSOR_GET_CONTAINER(_evas_object_table_accessor_get_container);
-   it->accessor.free = FUNC_ACCESSOR_FREE(_evas_object_table_accessor_free);
-
-   return &it->accessor;
-}
-
-EAPI Eina_List *
-evas_object_table_children_get(const Evas_Object *o)
-{
-   Eina_List *new_list = NULL, *l;
-   Evas_Object_Table_Option *opt;
-
-   EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN_VAL(o, priv, NULL);
-
-   EINA_LIST_FOREACH(priv->children, l, opt)
-      new_list = eina_list_append(new_list, opt->obj);
-
-   return new_list;
-}
-
-Evas_Object *
-evas_object_table_child_get(const Evas_Object *o, unsigned short col, unsigned short row)
-{
-   Eina_List *l;
-   Evas_Object_Table_Option *opt;
-
-   EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN_VAL(o, priv, NULL);
-
-   EINA_LIST_FOREACH(priv->children, l, opt)
-      if (opt->col == col && opt->row == row)
-         return opt->obj;
-   return NULL;
-}
-
-EAPI Eina_Bool
-evas_object_table_mirrored_get(const Evas_Object *obj)
-{
-   EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN_VAL(obj, priv, EINA_FALSE);
-
-   return priv->is_mirrored;
-}
-
-EAPI void
-evas_object_table_mirrored_set(Evas_Object *obj, Eina_Bool mirrored)
-{
-   EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN(obj, priv);
-   if (priv->is_mirrored != mirrored)
-     {
-        priv->is_mirrored = mirrored;
-        _evas_object_table_smart_calculate(obj);
-     }
-}
diff --git a/libraries/evas/src/lib/canvas/evas_object_text.c b/libraries/evas/src/lib/canvas/evas_object_text.c
deleted file mode 100644
index dbe5e08..0000000
--- a/libraries/evas/src/lib/canvas/evas_object_text.c
+++ /dev/null
@@ -1,1943 +0,0 @@
-#include "evas_common.h" /* Includes evas_bidi_utils stuff. */
-#include "evas_private.h"
-
-/* save typing */
-#define ENFN obj->layer->evas->engine.func
-#define ENDT obj->layer->evas->engine.data.output
-
-/* private magic number for text objects */
-static const char o_type[] = "text";
-
-/* private struct for text object internal data */
-typedef struct _Evas_Object_Text Evas_Object_Text;
-typedef struct _Evas_Object_Text_Item Evas_Object_Text_Item;
-
-struct _Evas_Object_Text
-{
-   DATA32               magic;
-
-   struct {
-      const char          *utf8_text; /* The text exposed to the API */
-      const char          *font;
-      Evas_Font_Description *fdesc;
-      const char          *source;
-      Evas_Font_Size       size;
-      struct {
-         unsigned char  r, g, b, a;
-      } outline, shadow, glow, glow2;
-
-      unsigned char        style;
-   } cur, prev;
-
-   float                       ascent, descent;
-   float                       max_ascent, max_descent;
-   Evas_BiDi_Paragraph_Props  *bidi_par_props;
-   const char                 *bidi_delimiters;
-   Evas_Object_Text_Item      *items;
-
-   Evas_Font_Set              *font;
-
-   char                        changed : 1;
-};
-
-struct _Evas_Object_Text_Item
-{
-   EINA_INLIST;
-
-   size_t               text_pos;
-   size_t               visual_pos;
-   Evas_Text_Props      text_props;
-   Evas_Coord           x, w, h, adv;
-};
-
-/* private methods for text objects */
-static void evas_object_text_init(Evas_Object *obj);
-static void *evas_object_text_new(void);
-static void evas_object_text_render(Evas_Object *obj, void *output, void *context, void *surface, int x, int y);
-static void evas_object_text_free(Evas_Object *obj);
-static void evas_object_text_render_pre(Evas_Object *obj);
-static void evas_object_text_render_post(Evas_Object *obj);
-
-static unsigned int evas_object_text_id_get(Evas_Object *obj);
-static unsigned int evas_object_text_visual_id_get(Evas_Object *obj);
-static void *evas_object_text_engine_data_get(Evas_Object *obj);
-
-static int evas_object_text_is_opaque(Evas_Object *obj);
-static int evas_object_text_was_opaque(Evas_Object *obj);
-
-static void evas_object_text_scale_update(Evas_Object *obj);
-static void _evas_object_text_recalc(Evas_Object *obj);
-
-static const Evas_Object_Func object_func =
-{
-   /* methods (compulsory) */
-   evas_object_text_free,
-     evas_object_text_render,
-     evas_object_text_render_pre,
-     evas_object_text_render_post,
-     evas_object_text_id_get,
-     evas_object_text_visual_id_get,
-     evas_object_text_engine_data_get,
-   /* these are optional. NULL = nothing */
-     NULL,
-     NULL,
-     NULL,
-     NULL,
-     evas_object_text_is_opaque,
-     evas_object_text_was_opaque,
-     NULL,
-     NULL,
-     NULL,
-     evas_object_text_scale_update,
-     NULL,
-     NULL,
-     NULL
-};
-
-/* the actual api call to add a rect */
-/* it has no other api calls as all properties are standard */
-
-EVAS_MEMPOOL(_mp_obj);
-
-static int
-_evas_object_text_char_coords_get(const Evas_Object *obj,
-      const Evas_Object_Text *o,
-      size_t pos, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
-{
-   Evas_Object_Text_Item *it;
-
-   EINA_INLIST_FOREACH(EINA_INLIST_GET(o->items), it)
-     {
-        if ((it->text_pos <= pos) &&
-              (pos < (it->text_pos + it->text_props.text_len)))
-          {
-             int ret;
-             ret = ENFN->font_char_coords_get(ENDT, o->font,
-                   &it->text_props, pos - it->text_pos, x, y, w, h);
-             if (x) *x += it->x;
-             return ret;
-          }
-     }
-   return 0;
-}
-
-static void
-_evas_object_text_item_clean(Evas_Object_Text_Item *it)
-{
-   evas_common_text_props_content_unref(&it->text_props);
-}
-
-static void
-_evas_object_text_items_clear(Evas_Object_Text *o)
-{
-   Evas_Object_Text_Item *it;
-
-   while (o->items)
-     {
-        it = o->items;
-        o->items = (Evas_Object_Text_Item *) eina_inlist_remove(
-              EINA_INLIST_GET(o->items),
-              EINA_INLIST_GET(it));
-        _evas_object_text_item_clean(it);
-        free(it);
-     }
-}
-
-#ifdef BIDI_SUPPORT
-static int
-_evas_object_text_it_compare_logical(const void *_it1, const void *_it2)
-{
-   const Evas_Object_Text_Item *it1 = _it1, *it2 = _it2;
-   if (it1->text_pos < it2->text_pos)
-     return -1;
-   else if (it1->text_pos == it2->text_pos)
-     return 0;
-   else
-     return 1;
-
-}
-#endif
-
-static int
-_evas_object_text_last_up_to_pos(const Evas_Object *obj,
-      const Evas_Object_Text *o, Evas_Coord cx, Evas_Coord cy)
-{
-   Evas_Object_Text_Item *it;
-
-#ifdef BIDI_SUPPORT
-   /*FIXME: not very efficient, sort the items arrays. */
-   /* Reorder if it's a bidi text */
-   if (o->bidi_par_props)
-     {
-        Eina_List *logical_it = NULL;
-        Evas_Object_Text_Item *i;
-        Eina_List *itr;
-        Evas_Coord x = 0;
-        /* Insert all to the logical list */
-        EINA_INLIST_FOREACH(o->items, i)
-          {
-             logical_it = eina_list_sorted_insert(logical_it,
-                   _evas_object_text_it_compare_logical, i);
-          }
-        EINA_LIST_FOREACH(logical_it, itr, it)
-          {
-             if ((x <= cx) && (cx < x + it->adv))
-               {
-                  return it->text_pos + ENFN->font_last_up_to_pos(ENDT,
-                        o->font,
-                        &it->text_props,
-                        cx - x,
-                        cy);
-               }
-             x += it->adv;
-          }
-        eina_list_free(logical_it);
-     }
-   else
-#endif
-     {
-        EINA_INLIST_FOREACH(EINA_INLIST_GET(o->items), it)
-          {
-             if ((it->x <= cx) && (cx < it->x + it->adv))
-               {
-                  return it->text_pos + ENFN->font_last_up_to_pos(ENDT,
-                        o->font,
-                        &it->text_props,
-                        cx - it->x,
-                        cy);
-               }
-          }
-     }
-   return -1;
-}
-
-static int
-_evas_object_text_char_at_coords(const Evas_Object *obj,
-      const Evas_Object_Text *o, Evas_Coord cx, Evas_Coord cy,
-      Evas_Coord *rx, Evas_Coord *ry, Evas_Coord *rw, Evas_Coord *rh)
-{
-   Evas_Object_Text_Item *it;
-
-   EINA_INLIST_FOREACH(EINA_INLIST_GET(o->items), it)
-     {
-        if ((it->x <= cx) && (cx < it->x + it->adv))
-          {
-             return it->text_pos + ENFN->font_char_at_coords_get(ENDT,
-                   o->font,
-                   &it->text_props,
-                   cx - it->x,
-                   cy,
-                   rx, ry,
-                   rw, rh);
-          }
-     }
-   return -1;
-}
-
-static Evas_Coord
-_evas_object_text_horiz_advance_get(const Evas_Object *obj,
-      const Evas_Object_Text *o)
-{
-   Evas_Object_Text_Item *it;
-   Evas_Coord adv;
-   (void) obj;
-
-   adv = 0;
-   EINA_INLIST_FOREACH(EINA_INLIST_GET(o->items), it)
-     {
-        adv += it->adv;
-     }
-   return adv;
-}
-
-static Evas_Coord
-_evas_object_text_vert_advance_get(const Evas_Object *obj __UNUSED__,
-      const Evas_Object_Text *o)
-{
-   return o->max_ascent + o->max_descent;
-}
-
-EAPI Evas_Object *
-evas_object_text_add(Evas *e)
-{
-   Evas_Object *obj;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return NULL;
-   MAGIC_CHECK_END();
-   obj = evas_object_new(e);
-   evas_object_text_init(obj);
-   evas_object_inject(obj, e);
-   return obj;
-}
-
-EAPI void
-evas_object_text_font_source_set(Evas_Object *obj, const char *font_source)
-{
-   Evas_Object_Text *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   return;
-   MAGIC_CHECK_END();
-
-   if ((o->cur.source) && (font_source) &&
-       (!strcmp(o->cur.source, font_source)))
-     return;
-   /*
-   if (o->cur.source) eina_stringshare_del(o->cur.source);
-   if (font_source) o->cur.source = eina_stringshare_add(font_source);
-   else o->cur.source = NULL;
-    */
-   eina_stringshare_replace(&o->cur.source, font_source);
-}
-
-EAPI const char *
-evas_object_text_font_source_get(const Evas_Object *obj)
-{
-   Evas_Object_Text *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   return NULL;
-   MAGIC_CHECK_END();
-   return o->cur.source;
-}
-
-EAPI void
-evas_object_text_font_set(Evas_Object *obj, const char *font, Evas_Font_Size size)
-{
-   Evas_Object_Text *o;
-   int is, was = 0, pass = 0, freeze = 0;
-   Evas_Font_Description *fdesc;
-
-   if ((!font) || (size <= 0)) return;
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   return;
-   MAGIC_CHECK_END();
-
-   fdesc = evas_font_desc_new();
-   evas_font_name_parse(fdesc, font);
-   if (o->cur.fdesc && !evas_font_desc_cmp(fdesc, o->cur.fdesc) &&
-         (size == o->cur.size))
-     {
-        evas_font_desc_unref(fdesc);
-        return;
-     }
-
-   if (o->cur.fdesc) evas_font_desc_unref(o->cur.fdesc);
-   o->cur.fdesc = fdesc;
-
-   o->cur.size = size;
-   eina_stringshare_replace(&o->cur.font, font);
-   o->prev.font = NULL;
-
-   if (obj->layer->evas->events_frozen <= 0)
-     {
-        pass = evas_event_passes_through(obj);
-        freeze = evas_event_freezes_through(obj);
-        if ((!pass) && (!freeze))
-          was = evas_object_is_in_output_rect(obj,
-                                              obj->layer->evas->pointer.x,
-                                              obj->layer->evas->pointer.y, 1, 1);
-     }
-
-#ifdef EVAS_FRAME_QUEUING
-   if (o->font)
-      evas_common_pipe_op_text_flush((RGBA_Font *) o->font);
-#endif
-
-   /* DO IT */
-   if (o->font)
-     {
-        evas_font_free(obj->layer->evas, o->font);
-        o->font = NULL;
-     }
-
-   o->font = evas_font_load(obj->layer->evas, o->cur.fdesc, o->cur.source,
-         (int)(((double) o->cur.size) * obj->cur.scale));
-   if (o->font)
-     {
-        o->ascent = ENFN->font_ascent_get(ENDT, o->font);
-        o->descent = ENFN->font_descent_get(ENDT, o->font);
-        o->max_ascent = ENFN->font_max_ascent_get(ENDT, o->font);
-        o->max_descent = ENFN->font_max_descent_get(ENDT, o->font);
-     }
-   else
-     {
-        o->ascent = 0;
-        o->descent = 0;
-        o->max_ascent = 0;
-        o->max_descent = 0;
-     }
-   _evas_object_text_recalc(obj);
-   o->changed = 1;
-   evas_object_change(obj);
-   evas_object_clip_dirty(obj);
-   evas_object_coords_recalc(obj);
-   if (obj->layer->evas->events_frozen <= 0)
-     {
-        if ((!pass) && (!freeze))
-          {
-             is = evas_object_is_in_output_rect(obj,
-                                                obj->layer->evas->pointer.x,
-                                                obj->layer->evas->pointer.y,
-                                                1, 1);
-             if ((is ^ was) && obj->cur.visible)
-               evas_event_feed_mouse_move(obj->layer->evas,
-                                          obj->layer->evas->pointer.x,
-                                          obj->layer->evas->pointer.y,
-                                          obj->layer->evas->last_timestamp,
-                                          NULL);
-          }
-     }
-   evas_object_inform_call_resize(obj);
-}
-
-EAPI void
-evas_object_text_font_get(const Evas_Object *obj, const char **font, Evas_Font_Size *size)
-{
-   Evas_Object_Text *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   if (font) *font = "";
-   if (size) *size = 0;
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   if (font) *font = "";
-   if (size) *size = 0;
-   return;
-   MAGIC_CHECK_END();
-   if (font) *font = o->cur.font;
-   if (size) *size = o->cur.size;
-}
-
-
-/**
- * @internal
- * Create a new text layout item from the string and the format.
- *
- * @param c the context to work on - Not NULL.
- * @param fmt the format to use.
- * @param str the string to use.
- */
-static Evas_Object_Text_Item *
-_evas_object_text_item_new(Evas_Object *obj, Evas_Object_Text *o,
-      Evas_Font_Instance *fi, const Eina_Unicode *str, Evas_Script_Type script,
-      size_t pos, size_t visual_pos, size_t len)
-{
-   Evas_Object_Text_Item *it;
-
-   it = calloc(1, sizeof(Evas_Object_Text_Item));
-   it->text_pos = pos;
-   it->visual_pos = visual_pos;
-   evas_common_text_props_bidi_set(&it->text_props, o->bidi_par_props,
-         it->text_pos);
-   evas_common_text_props_script_set(&it->text_props, script);
-
-   if (fi)
-     {
-        ENFN->font_text_props_info_create(ENDT,
-              fi, str + pos, &it->text_props,
-              o->bidi_par_props, it->text_pos, len);
-
-        ENFN->font_string_size_get(ENDT,
-              o->font,
-              &it->text_props,
-              &it->w, &it->h);
-        it->adv = ENFN->font_h_advance_get(ENDT, o->font,
-              &it->text_props);
-     }
-   o->items = (Evas_Object_Text_Item *)
-      eina_inlist_append(EINA_INLIST_GET(o->items), EINA_INLIST_GET(it));
-   return it;
-}
-
-/**
- * @internal
- * Orders o->items according to the visual position.
- *
- * @param obj the evas object
- * @param o the text object
- */
-static void
-_evas_object_text_item_order(Evas_Object *obj, Evas_Object_Text *o)
-{
-   (void) obj;
-#ifdef BIDI_SUPPORT
-   /*FIXME: not very efficient, sort the items arrays. */
-   /* Reorder if it's a bidi text */
-   if (o->bidi_par_props)
-     {
-        Evas_Object_Text_Item *i, *j, *min;
-        i = o->items;
-        while (i)
-          {
-             min = i;
-             EINA_INLIST_FOREACH(i, j)
-               {
-                  if (j->visual_pos < min->visual_pos)
-                    {
-                       min = j;
-                    }
-               }
-             if (min != i)
-               {
-                  o->items = (Evas_Object_Text_Item *) eina_inlist_remove(EINA_INLIST_GET(o->items), EINA_INLIST_GET(min));
-                  o->items = (Evas_Object_Text_Item *) eina_inlist_prepend_relative(EINA_INLIST_GET(o->items), EINA_INLIST_GET(min), EINA_INLIST_GET(i));
-               }
-
-             i = (Evas_Object_Text_Item *) EINA_INLIST_GET(min)->next;
-          }
-     }
-#endif
-
-   /* calculate the positions according to the order. */
-     {
-        Evas_Object_Text_Item *it = o->items;
-        Evas_Coord x = 0;
-
-        while (it)
-          {
-             it->x = x;
-             x += it->adv;
-             it = (Evas_Object_Text_Item *) EINA_INLIST_GET(it)->next;
-          }
-     }
-}
-
-/**
- * @internal
- * Populates o->items with the items of the text according to text
- *
- * @param obj the evas object
- * @param o the text object
- * @param text the text to layout
- */
-static void
-_evas_object_text_layout(Evas_Object *obj, Evas_Object_Text *o, const Eina_Unicode *text)
-{
-   EvasBiDiStrIndex *v_to_l = NULL;
-   size_t pos, visual_pos;
-   int len = eina_unicode_strlen(text);
-#ifdef BIDI_SUPPORT
-   int par_len = len;
-   int *segment_idxs = NULL;
-   if (o->bidi_delimiters)
-      segment_idxs = evas_bidi_segment_idxs_get(text, o->bidi_delimiters);
-   evas_bidi_paragraph_props_unref(o->bidi_par_props);
-   o->bidi_par_props = evas_bidi_paragraph_props_get(text, len, segment_idxs);
-   evas_bidi_props_reorder_line(NULL, 0, len, o->bidi_par_props, &v_to_l);
-   if (segment_idxs) free(segment_idxs);
-#endif
-   visual_pos = pos = 0;
-
-   while (len > 0)
-     {
-        Evas_Font_Instance *script_fi = NULL;
-        int script_len = len, tmp_cut;
-        Evas_Script_Type script;
-        tmp_cut = evas_common_language_script_end_of_run_get(
-              text + pos,
-              o->bidi_par_props,
-              pos, len);
-        if (tmp_cut > 0)
-           script_len = tmp_cut;
-
-        script = evas_common_language_script_type_get(text, script_len);
-
-        while (script_len > 0)
-          {
-             Evas_Font_Instance *cur_fi = NULL;
-             int run_len = script_len;
-             if (o->font)
-               {
-                  run_len = ENFN->font_run_end_get(ENDT,
-                        o->font, &script_fi, &cur_fi,
-                        script, text + pos, script_len);
-               }
-#ifdef BIDI_SUPPORT
-             visual_pos = evas_bidi_position_logical_to_visual(
-                   v_to_l, par_len, pos);
-#else
-             visual_pos = pos;
-#endif
-             _evas_object_text_item_new(obj, o, cur_fi, text, script,
-                   pos, visual_pos, run_len);
-
-             pos += run_len;
-             script_len -= run_len;
-             len -= run_len;
-          }
-     }
-
-   _evas_object_text_item_order(obj, o);
-
-   if (v_to_l) free(v_to_l);
-}
-
-
-EAPI void
-evas_object_text_text_set(Evas_Object *obj, const char *_text)
-{
-   Evas_Object_Text *o;
-   int is, was, len;
-   Eina_Unicode *text;
-   
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   return;
-   MAGIC_CHECK_END();
-
-   if ((o->cur.utf8_text) && (_text) && (!strcmp(o->cur.utf8_text, _text)))
-      return;
-   text = eina_unicode_utf8_to_unicode(_text, &len);
-
-   if (!text) text = eina_unicode_strdup(EINA_UNICODE_EMPTY_STRING);
-   was = evas_object_is_in_output_rect(obj,
-                                       obj->layer->evas->pointer.x,
-                                       obj->layer->evas->pointer.y, 1, 1);
-   /* DO II */
-   /*Update bidi_props*/
-
-   if (o->items) _evas_object_text_items_clear(o);
-
-   if ((text) && (*text)) 
-     {
-        _evas_object_text_layout(obj, o, text);
-        eina_stringshare_replace(&o->cur.utf8_text, _text);
-        o->prev.utf8_text = NULL;
-    }
-   else 
-     {
-        eina_stringshare_replace(&o->cur.utf8_text, NULL);
-     }
-   if (text)
-     {
-        free(text);
-        text = NULL;
-     }
-   _evas_object_text_recalc(obj);
-   o->changed = 1;
-   evas_object_change(obj);
-   evas_object_clip_dirty(obj);
-   evas_object_coords_recalc(obj);
-   is = evas_object_is_in_output_rect(obj,
-                                      obj->layer->evas->pointer.x,
-                                      obj->layer->evas->pointer.y, 1, 1);
-   if ((is || was) && obj->cur.visible)
-     evas_event_feed_mouse_move(obj->layer->evas,
-                                obj->layer->evas->pointer.x,
-                                obj->layer->evas->pointer.y,
-                                obj->layer->evas->last_timestamp,
-                                NULL);
-   evas_object_inform_call_resize(obj);
-   if (text) free(text);
-}
-
-EAPI void
-evas_object_text_bidi_delimiters_set(Evas_Object *obj, const char *delim)
-{
-   Evas_Object_Text *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   return;
-   MAGIC_CHECK_END();
-
-   eina_stringshare_replace(&o->bidi_delimiters, delim);
-}
-
-EAPI const char *
-evas_object_text_bidi_delimiters_get(const Evas_Object *obj)
-{
-   Evas_Object_Text *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   return NULL;
-   MAGIC_CHECK_END();
-
-   return o->bidi_delimiters;
-}
-
-
-EAPI const char *
-evas_object_text_text_get(const Evas_Object *obj)
-{
-   Evas_Object_Text *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   return NULL;
-   MAGIC_CHECK_END();
-   return o->cur.utf8_text;
-}
-
-EAPI Evas_BiDi_Direction
-evas_object_text_direction_get(const Evas_Object *obj)
-{
-   Evas_Object_Text *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EVAS_BIDI_DIRECTION_NEUTRAL;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   return EVAS_BIDI_DIRECTION_NEUTRAL;
-   MAGIC_CHECK_END();
-   if (o->items)
-     {
-        return o->items->text_props.bidi.dir;
-     }
-   return EVAS_BIDI_DIRECTION_NEUTRAL;
-}
-
-EAPI Evas_Coord
-evas_object_text_ascent_get(const Evas_Object *obj)
-{
-   Evas_Object_Text *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   return 0;
-   MAGIC_CHECK_END();
-   return o->ascent;
-}
-
-EAPI Evas_Coord
-evas_object_text_descent_get(const Evas_Object *obj)
-{
-   Evas_Object_Text *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   return 0;
-   MAGIC_CHECK_END();
-   return o->descent;
-}
-
-EAPI Evas_Coord
-evas_object_text_max_ascent_get(const Evas_Object *obj)
-{
-   Evas_Object_Text *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   return 0;
-   MAGIC_CHECK_END();
-   return o->max_ascent;
-}
-
-EAPI Evas_Coord
-evas_object_text_max_descent_get(const Evas_Object *obj)
-{
-   Evas_Object_Text *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   return 0;
-   MAGIC_CHECK_END();
-   return o->max_descent;
-}
-
-EAPI Evas_Coord
-evas_object_text_inset_get(const Evas_Object *obj)
-{
-   Evas_Object_Text *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   return 0;
-   MAGIC_CHECK_END();
-   if (!o->font) return 0;
-   if (!o->items) return 0;
-   return ENFN->font_inset_get(ENDT, o->font, &o->items->text_props);
-}
-
-EAPI Evas_Coord
-evas_object_text_horiz_advance_get(const Evas_Object *obj)
-{
-   Evas_Object_Text *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   return 0;
-   MAGIC_CHECK_END();
-   if (!o->font) return 0;
-   if (!o->items) return 0;
-   return _evas_object_text_horiz_advance_get(obj, o);
-}
-
-EAPI Evas_Coord
-evas_object_text_vert_advance_get(const Evas_Object *obj)
-{
-   Evas_Object_Text *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   return 0;
-   MAGIC_CHECK_END();
-   if (!o->font) return 0;
-   if (!o->items) return o->ascent + o->descent;
-   return _evas_object_text_vert_advance_get(obj, o);
-}
-
-EAPI Eina_Bool
-evas_object_text_char_pos_get(const Evas_Object *obj, int pos, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
-{
-   Evas_Object_Text *o;
-   int l = 0, r = 0, t = 0, b = 0;
-   int ret, x = 0, y = 0, w = 0, h = 0;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   return EINA_FALSE;
-   MAGIC_CHECK_END();
-   if (!o->font) return EINA_FALSE;
-   if (!o->items || (pos < 0)) return EINA_FALSE;
-   ret = _evas_object_text_char_coords_get(obj, o, (size_t) pos,
-            &x, &y, &w, &h);
-   evas_text_style_pad_get(o->cur.style, &l, &r, &t, &b);
-   y += o->max_ascent - t;
-   x -= l;
-   if (x < 0)
-     {
-        w += x;
-        x = 0;
-     }
-   if ((x + w) > obj->cur.geometry.w) w = obj->cur.geometry.w - x;
-   if (w < 0) w = 0;
-   if (y < 0)
-     {
-        h += y;
-        y = 0;
-     }
-   if ((y + h) > obj->cur.geometry.h) h = obj->cur.geometry.h - y;
-   if (h < 0) h = 0;
-   if (cx) *cx = x;
-   if (cy) *cy = y;
-   if (cw) *cw = w + l + r;
-   if (ch) *ch = h + t + b;
-   return ret;
-}
-
-
-EAPI int
-evas_object_text_last_up_to_pos(const Evas_Object *obj, Evas_Coord x, Evas_Coord y)
-{
-   Evas_Object_Text *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return -1;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   return -1;
-   MAGIC_CHECK_END();
-   if (!o->font) return -1;
-   if (!o->items) return -1;
-   return _evas_object_text_last_up_to_pos(obj, o, x, y - o->max_ascent);
-}
-
-EAPI int
-evas_object_text_char_coords_get(const Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
-{
-   Evas_Object_Text *o;
-   int l = 0, r = 0, t = 0, b = 0;
-   int ret, rx = 0, ry = 0, rw = 0, rh = 0;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return -1;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   return -1;
-   MAGIC_CHECK_END();
-   if (!o->font) return -1;
-   if (!o->items) return -1;
-   ret = _evas_object_text_char_at_coords(obj, o, x, y - o->max_ascent,
-         &rx, &ry, &rw, &rh);
-   evas_text_style_pad_get(o->cur.style, &l, &r, &t, &b);
-   ry += o->max_ascent - t;
-   rx -= l;
-   if (rx < 0)
-     {
-        rw += rx;
-        rx = 0;
-     }
-   if ((rx + rw) > obj->cur.geometry.w) rw = obj->cur.geometry.w - rx;
-   if (rw < 0) rw = 0;
-   if (ry < 0)
-     {
-        rh += ry;
-        ry = 0;
-     }
-   if ((ry + rh) > obj->cur.geometry.h) rh = obj->cur.geometry.h - ry;
-   if (rh < 0) rh = 0;
-   if (cx) *cx = rx;
-   if (cy) *cy = ry;
-   if (cw) *cw = rw + l + r;
-   if (ch) *ch = rh + t + b;
-   return ret;
-}
-
-EAPI void
-evas_object_text_style_set(Evas_Object *obj, Evas_Text_Style_Type style)
-{
-   Evas_Object_Text *o;
-   int pl = 0, pr = 0, pt = 0, pb = 0, l = 0, r = 0, t = 0, b = 0;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   return;
-   MAGIC_CHECK_END();
-   if (o->cur.style == style) return;
-   evas_text_style_pad_get(o->cur.style, &pl, &pr, &pt, &pb);
-   o->cur.style = style;
-   evas_text_style_pad_get(o->cur.style, &l, &r, &t, &b);
-   if (o->items)
-     obj->cur.geometry.w += (l - pl) + (r - pr);
-   else
-     obj->cur.geometry.w = 0;
-   obj->cur.geometry.h += (t - pt) + (b - pb);
-   evas_object_change(obj);
-   evas_object_clip_dirty(obj);
-}
-
-EAPI Evas_Text_Style_Type
-evas_object_text_style_get(const Evas_Object *obj)
-{
-   Evas_Object_Text *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EVAS_TEXT_STYLE_PLAIN;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   return EVAS_TEXT_STYLE_PLAIN;
-   MAGIC_CHECK_END();
-   return o->cur.style;
-}
-
-EAPI void
-evas_object_text_shadow_color_set(Evas_Object *obj, int r, int g, int b, int a)
-{
-   Evas_Object_Text *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   return;
-   MAGIC_CHECK_END();
-   if ((o->cur.shadow.r == r) && (o->cur.shadow.g == g) &&
-       (o->cur.shadow.b == b) && (o->cur.shadow.a == a))
-     return;
-   o->cur.shadow.r = r;
-   o->cur.shadow.g = g;
-   o->cur.shadow.b = b;
-   o->cur.shadow.a = a;
-   o->changed = 1;
-   evas_object_change(obj);
-}
-
-EAPI void
-evas_object_text_shadow_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a)
-{
-   Evas_Object_Text *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   if (r) *r = 0;
-   if (g) *g = 0;
-   if (b) *b = 0;
-   if (a) *a = 0;
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   if (r) *r = 0;
-   if (g) *g = 0;
-   if (b) *b = 0;
-   if (a) *a = 0;
-   return;
-   MAGIC_CHECK_END();
-   if (r) *r = o->cur.shadow.r;
-   if (g) *g = o->cur.shadow.g;
-   if (b) *b = o->cur.shadow.b;
-   if (a) *a = o->cur.shadow.a;
-}
-
-EAPI void
-evas_object_text_glow_color_set(Evas_Object *obj, int r, int g, int b, int a)
-{
-   Evas_Object_Text *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   return;
-   MAGIC_CHECK_END();
-   if ((o->cur.glow.r == r) && (o->cur.glow.g == g) &&
-       (o->cur.glow.b == b) && (o->cur.glow.a == a))
-     return;
-   o->cur.glow.r = r;
-   o->cur.glow.g = g;
-   o->cur.glow.b = b;
-   o->cur.glow.a = a;
-   o->changed = 1;
-   evas_object_change(obj);
-}
-
-EAPI void
-evas_object_text_glow_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a)
-{
-   Evas_Object_Text *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   if (r) *r = 0;
-   if (g) *g = 0;
-   if (b) *b = 0;
-   if (a) *a = 0;
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   if (r) *r = 0;
-   if (g) *g = 0;
-   if (b) *b = 0;
-   if (a) *a = 0;
-   return;
-   MAGIC_CHECK_END();
-   if (r) *r = o->cur.glow.r;
-   if (g) *g = o->cur.glow.g;
-   if (b) *b = o->cur.glow.b;
-   if (a) *a = o->cur.glow.a;
-}
-
-EAPI void
-evas_object_text_glow2_color_set(Evas_Object *obj, int r, int g, int b, int a)
-{
-   Evas_Object_Text *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   return;
-   MAGIC_CHECK_END();
-   if ((o->cur.glow2.r == r) && (o->cur.glow2.g == g) &&
-       (o->cur.glow2.b == b) && (o->cur.glow2.a == a))
-     return;
-   o->cur.glow2.r = r;
-   o->cur.glow2.g = g;
-   o->cur.glow2.b = b;
-   o->cur.glow2.a = a;
-   o->changed = 1;
-   evas_object_change(obj);
-}
-
-EAPI void
-evas_object_text_glow2_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a)
-{
-   Evas_Object_Text *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   if (r) *r = 0;
-   if (g) *g = 0;
-   if (b) *b = 0;
-   if (a) *a = 0;
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   if (r) *r = 0;
-   if (g) *g = 0;
-   if (b) *b = 0;
-   if (a) *a = 0;
-   return;
-   MAGIC_CHECK_END();
-   if (r) *r = o->cur.glow2.r;
-   if (g) *g = o->cur.glow2.g;
-   if (b) *b = o->cur.glow2.b;
-   if (a) *a = o->cur.glow2.a;
-}
-
-EAPI void
-evas_object_text_outline_color_set(Evas_Object *obj, int r, int g, int b, int a)
-{
-   Evas_Object_Text *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   return;
-   MAGIC_CHECK_END();
-   if ((o->cur.outline.r == r) && (o->cur.outline.g == g) &&
-       (o->cur.outline.b == b) && (o->cur.outline.a == a))
-     return;
-   o->cur.outline.r = r;
-   o->cur.outline.g = g;
-   o->cur.outline.b = b;
-   o->cur.outline.a = a;
-   o->changed = 1;
-   evas_object_change(obj);
-}
-
-EAPI void
-evas_object_text_outline_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a)
-{
-   Evas_Object_Text *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   if (r) *r = 0;
-   if (g) *g = 0;
-   if (b) *b = 0;
-   if (a) *a = 0;
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   if (r) *r = 0;
-   if (g) *g = 0;
-   if (b) *b = 0;
-   if (a) *a = 0;
-   return;
-   MAGIC_CHECK_END();
-   if (r) *r = o->cur.outline.r;
-   if (g) *g = o->cur.outline.g;
-   if (b) *b = o->cur.outline.b;
-   if (a) *a = o->cur.outline.a;
-}
-
-EAPI void
-evas_object_text_style_pad_get(const Evas_Object *obj, int *l, int *r, int *t, int *b)
-{
-   int sl = 0, sr = 0, st = 0, sb = 0;
-   Evas_Object_Text *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   if (l) *l = 0;
-   if (r) *r = 0;
-   if (t) *t = 0;
-   if (b) *b = 0;
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   if (l) *l = 0;
-   if (r) *r = 0;
-   if (t) *t = 0;
-   if (b) *b = 0;
-   return;
-   MAGIC_CHECK_END();
-   /* use temps to be certain we have initialized values */
-   evas_text_style_pad_get(o->cur.style, &sl, &sr, &st, &sb);
-   if (l) *l = sl;
-   if (r) *r = sr;
-   if (t) *t = st;
-   if (b) *b = sb;
-}
-
-
-
-
-EAPI int
-evas_string_char_next_get(const char *str, int pos, int *decoded)
-{
-   int p, d;
-
-   if (decoded) *decoded = 0;
-   if ((!str) || (pos < 0)) return 0;
-   p = pos;
-   d = eina_unicode_utf8_get_next(str, &p);
-   if (decoded) *decoded = d;
-   return p;
-}
-
-EAPI int
-evas_string_char_prev_get(const char *str, int pos, int *decoded)
-{
-   int p, d;
-
-   if (decoded) *decoded = 0;
-   if ((!str) || (pos < 1)) return 0;
-   p = pos;
-   d = eina_unicode_utf8_get_prev(str, &p);
-   if (decoded) *decoded = d;
-   return p;
-}
-
-EAPI int
-evas_string_char_len_get(const char *str)
-{
-   if (!str) return 0;
-   return eina_unicode_utf8_get_len(str);
-}
-
-void
-evas_text_style_pad_get(Evas_Text_Style_Type style, int *l, int *r, int *t, int *b)
-{
-   int sl = 0, sr = 0, st = 0, sb = 0;
-
-   /* Don't calc anything if there's no style. */
-   if (style != EVAS_TEXT_STYLE_PLAIN)
-     {
-        int shad_sz = 0, shad_dst = 0, out_sz = 0;
-        int dx = 0, minx = 0, maxx = 0;
-        int dy = 0, miny = 0, maxy = 0;
-        Eina_Bool have_shadow = EINA_FALSE;
-
-        switch (style & EVAS_TEXT_STYLE_MASK_BASIC)
-          {
-           case EVAS_TEXT_STYLE_SHADOW:
-              shad_dst = 1;
-              have_shadow = EINA_TRUE;
-              break;
-           case EVAS_TEXT_STYLE_OUTLINE_SHADOW:
-           case EVAS_TEXT_STYLE_FAR_SHADOW:
-              shad_dst = 2;
-              out_sz = 1;
-              have_shadow = EINA_TRUE;
-              break;
-           case EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW:
-              shad_dst = 1;
-              shad_sz = 2;
-              out_sz = 1;
-              have_shadow = EINA_TRUE;
-              break;
-           case EVAS_TEXT_STYLE_FAR_SOFT_SHADOW:
-              shad_dst = 2;
-              shad_sz = 2;
-              have_shadow = EINA_TRUE;
-              break;
-           case EVAS_TEXT_STYLE_SOFT_SHADOW:
-              shad_dst = 1;
-              shad_sz = 2;
-              have_shadow = EINA_TRUE;
-              break;
-           case EVAS_TEXT_STYLE_GLOW:
-           case EVAS_TEXT_STYLE_SOFT_OUTLINE:
-              out_sz = 2;
-              break;
-           case EVAS_TEXT_STYLE_OUTLINE:
-              out_sz = 1;
-              break;
-           default:
-              break;
-          }
-
-        minx = -out_sz;
-        maxx = out_sz;
-        miny = -out_sz;
-        maxy = out_sz;
-        if (have_shadow)
-          {
-             int shx1, shx2, shy1, shy2;
-             switch (style & EVAS_TEXT_STYLE_MASK_SHADOW_DIRECTION)
-               {
-                case EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_RIGHT:
-                   dx = 1;
-                   dy = 1;
-                   break;
-                case EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM:
-                   dx = 0;
-                   dy = 1;
-                   break;
-                case EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_LEFT:
-                   dx = -1;
-                   dy = 1;
-                   break;
-                case EVAS_TEXT_STYLE_SHADOW_DIRECTION_LEFT:
-                   dx = -1;
-                   dy = 0;
-                   break;
-                case EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP_LEFT:
-                   dx = -1;
-                   dy = -1;
-                   break;
-                case EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP:
-                   dx = 0;
-                   dy = -1;
-                   break;
-                case EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP_RIGHT:
-                   dx = 1;
-                   dy = -1;
-                   break;
-                case EVAS_TEXT_STYLE_SHADOW_DIRECTION_RIGHT:
-                   dx = 1;
-                   dy = 0;
-                default:
-                   break;
-               }
-             shx1 = dx * shad_dst;
-             shx1 -= shad_sz;
-             shx2 = dx * shad_dst;
-             shx2 += shad_sz;
-             if (shx1 < minx) minx = shx1;
-             if (shx2 > maxx) maxx = shx2;
-
-             shy1 = dy * shad_dst;
-             shy1 -= shad_sz;
-             shy2 = dy * shad_dst;
-             shy2 += shad_sz;
-             if (shy1 < miny) miny = shy1;
-             if (shy2 > maxy) maxy = shy2;
-          }
-
-        if (l) sl = *l;
-        if (r) sr = *r;
-        if (t) st = *t;
-        if (b) sb = *b;
-
-        if (sr < maxx) sr = maxx;
-        if (sl < -minx) sl = -minx;
-        if (sb < maxy) sb = maxy;
-        if (st < -miny) st = -miny;
-     }
-
-   if (l) *l = sl;
-   if (r) *r = sr;
-   if (t) *t = st;
-   if (b) *b = sb;
-}
-
-/* all nice and private */
-static void
-evas_object_text_init(Evas_Object *obj)
-{
-   /* alloc text ob, setup methods and default values */
-   obj->object_data = evas_object_text_new();
-   /* set up default settings for this kind of object */
-   obj->cur.color.r = 255;
-   obj->cur.color.g = 255;
-   obj->cur.color.b = 255;
-   obj->cur.color.a = 255;
-   obj->cur.geometry.x = 0;
-   obj->cur.geometry.y = 0;
-   obj->cur.geometry.w = 0;
-   obj->cur.geometry.h = 0;
-   obj->cur.layer = 0;
-   /* set up object-specific settings */
-   obj->prev = obj->cur;
-   /* set up methods (compulsory) */
-   obj->func = &object_func;
-   obj->type = o_type;
-}
-
-static void *
-evas_object_text_new(void)
-{
-   Evas_Object_Text *o;
-
-   /* alloc obj private data */
-   EVAS_MEMPOOL_INIT(_mp_obj, "evas_object_text", Evas_Object_Text, 128, NULL);
-   o = EVAS_MEMPOOL_ALLOC(_mp_obj, Evas_Object_Text);
-   if (!o) return NULL;
-   EVAS_MEMPOOL_PREP(_mp_obj, o, Evas_Object_Text);
-   o->magic = MAGIC_OBJ_TEXT;
-   o->prev = o->cur;
-#ifdef BIDI_SUPPORT
-   o->bidi_par_props = evas_bidi_paragraph_props_new();
-#endif
-   return o;
-}
-
-static void
-evas_object_text_free(Evas_Object *obj)
-{
-   Evas_Object_Text *o;
-
-   /* frees private object data. very simple here */
-   o = (Evas_Object_Text *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
-   return;
-   MAGIC_CHECK_END();
-   /* free obj */
-   if (o->items) _evas_object_text_items_clear(o);
-   if (o->cur.utf8_text) eina_stringshare_del(o->cur.utf8_text);
-   if (o->cur.font) eina_stringshare_del(o->cur.font);
-   if (o->cur.fdesc) evas_font_desc_unref(o->cur.fdesc);
-   if (o->cur.source) eina_stringshare_del(o->cur.source);
-   if (o->font) evas_font_free(obj->layer->evas, o->font);
-#ifdef BIDI_SUPPORT
-   evas_bidi_paragraph_props_unref(o->bidi_par_props);
-#endif
-   o->magic = 0;
-   EVAS_MEMPOOL_FREE(_mp_obj, o);
-}
-
-static void
-evas_object_text_render(Evas_Object *obj, void *output, void *context, void *surface, int x, int y)
-{
-   int i, j;
-   Evas_Object_Text *o;
-   Evas_Object_Text_Item *it;
-   const char vals[5][5] =
-     {
-        {0, 1, 2, 1, 0},
-        {1, 3, 4, 3, 1},
-        {2, 4, 5, 4, 2},
-        {1, 3, 4, 3, 1},
-        {0, 1, 2, 1, 0}
-     };
-   int sl = 0, st = 0;
-   int shad_dst, shad_sz, dx, dy, haveshad;
-
-   /* render object to surface with context, and offxet by x,y */
-   o = (Evas_Object_Text *)(obj->object_data);
-   evas_text_style_pad_get(o->cur.style, &sl, NULL, &st, NULL);
-   ENFN->context_multiplier_unset(output, context);
-   ENFN->context_render_op_set(output, context, obj->cur.render_op);
-   /* FIXME: This clipping is just until we fix inset handling correctly. */
-   ENFN->context_clip_clip(output, context,
-                              obj->cur.geometry.x + x,
-                              obj->cur.geometry.y + y,
-                              obj->cur.geometry.w,
-                              obj->cur.geometry.h);
-/*
-   ENFN->context_color_set(output,
-                           context,
-                           230, 160, 30, 100);
-   ENFN->rectangle_draw(output,
-                        context,
-                        surface,
-                        obj->cur.geometry.x + x,
-                        obj->cur.geometry.y + y,
-                        obj->cur.geometry.w,
-                        obj->cur.geometry.h);
- */
-#define COLOR_ONLY_SET(object, sub, col) \
-        ENFN->context_color_set(output, context, \
-                                object->sub.col.r, \
-                                object->sub.col.g, \
-                                object->sub.col.b, \
-                                object->sub.col.a);
-
-#define COLOR_SET(object, sub, col) \
-        if (obj->cur.clipper)\
-           ENFN->context_color_set(output, context, \
-                                ((int)object->sub.col.r * ((int)obj->cur.clipper->cur.cache.clip.r + 1)) >> 8, \
-                                ((int)object->sub.col.g * ((int)obj->cur.clipper->cur.cache.clip.g + 1)) >> 8, \
-                                ((int)object->sub.col.b * ((int)obj->cur.clipper->cur.cache.clip.b + 1)) >> 8, \
-                                ((int)object->sub.col.a * ((int)obj->cur.clipper->cur.cache.clip.a + 1)) >> 8); \
-        else\
-           ENFN->context_color_set(output, context, \
-                                object->sub.col.r, \
-                                object->sub.col.g, \
-                                object->sub.col.b, \
-                                object->sub.col.a);
-
-#define COLOR_SET_AMUL(object, sub, col, amul) \
-        if (obj->cur.clipper) \
-            ENFN->context_color_set(output, context, \
-                                (((int)object->sub.col.r) * ((int)obj->cur.clipper->cur.cache.clip.r) * (amul)) / 65025, \
-                                (((int)object->sub.col.g) * ((int)obj->cur.clipper->cur.cache.clip.g) * (amul)) / 65025, \
-                                (((int)object->sub.col.b) * ((int)obj->cur.clipper->cur.cache.clip.b) * (amul)) / 65025, \
-                                (((int)object->sub.col.a) * ((int)obj->cur.clipper->cur.cache.clip.a) * (amul)) / 65025); \
-        else \
-            ENFN->context_color_set(output, context, \
-                                (((int)object->sub.col.r) * (amul)) / 255, \
-                                (((int)object->sub.col.g) * (amul)) / 255, \
-                                (((int)object->sub.col.b) * (amul)) / 255, \
-                                (((int)object->sub.col.a) * (amul)) / 255);
-
-#define DRAW_TEXT(ox, oy) \
-   if ((o->font) && (it->text_props.len > 0)) \
-     ENFN->font_draw(output, \
-                     context, \
-                     surface, \
-                     o->font, \
-                     obj->cur.geometry.x + x + sl + ox + it->x, \
-                     obj->cur.geometry.y + y + st + oy + \
-                     (int) \
-                     (((o->max_ascent * obj->cur.geometry.h) / obj->cur.geometry.h) - 0.5), \
-                     obj->cur.geometry.w, \
-                     obj->cur.geometry.h, \
-                     obj->cur.geometry.w, \
-                     obj->cur.geometry.h, \
-                     &it->text_props);
-
-   /* shadows */
-   shad_dst = shad_sz = dx = dy = haveshad = 0;
-   switch (o->cur.style & EVAS_TEXT_STYLE_MASK_BASIC)
-     {
-      case EVAS_TEXT_STYLE_SHADOW:
-      case EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW:
-         shad_dst = 1;
-         haveshad = 1;
-         break;
-      case EVAS_TEXT_STYLE_OUTLINE_SHADOW:
-      case EVAS_TEXT_STYLE_FAR_SHADOW:
-         shad_dst = 2;
-         haveshad = 1;
-         break;
-      case EVAS_TEXT_STYLE_FAR_SOFT_SHADOW:
-         shad_dst = 2;
-         shad_sz = 2;
-         haveshad = 1;
-         break;
-      case EVAS_TEXT_STYLE_SOFT_SHADOW:
-         shad_dst = 1;
-         shad_sz = 2;
-         haveshad = 1;
-         break;
-      default:
-         break;
-     }
-   if (haveshad)
-     {
-        if (shad_dst > 0)
-          {
-             switch (o->cur.style & EVAS_TEXT_STYLE_MASK_SHADOW_DIRECTION)
-               {
-                case EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_RIGHT:
-                   dx = 1;
-                   dy = 1;
-                   break;
-                case EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM:
-                   dx = 0;
-                   dy = 1;
-                   break;
-                case EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_LEFT:
-                   dx = -1;
-                   dy = 1;
-                   break;
-                case EVAS_TEXT_STYLE_SHADOW_DIRECTION_LEFT:
-                   dx = -1;
-                   dy = 0;
-                   break;
-                case EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP_LEFT:
-                   dx = -1;
-                   dy = -1;
-                   break;
-                case EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP:
-                   dx = 0;
-                   dy = -1;
-                   break;
-                case EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP_RIGHT:
-                   dx = 1;
-                   dy = -1;
-                   break;
-                case EVAS_TEXT_STYLE_SHADOW_DIRECTION_RIGHT:
-                   dx = 1;
-                   dy = 0;
-                default:
-                   break;
-               }
-             dx *= shad_dst;
-             dy *= shad_dst;
-          }
-     }
-   EINA_INLIST_FOREACH(EINA_INLIST_GET(o->items), it)
-     {
-        /* Shadows */
-        if (haveshad)
-          {
-             switch (shad_sz)
-               {
-                case 0:
-                  COLOR_SET(o, cur, shadow);
-                  DRAW_TEXT(dx, dy);
-                  break;
-                case 2:
-                  for (j = 0; j < 5; j++)
-                    {
-                       for (i = 0; i < 5; i++)
-                         {
-                            if (vals[i][j] != 0)
-                              {
-                                 COLOR_SET_AMUL(o, cur, shadow, vals[i][j] * 50);
-                                 DRAW_TEXT(i - 2 + dx, j - 2 + dy);
-                              }
-                         }
-                    }
-                  break;
-                default:
-                  break;
-               }
-          }
-
-        /* glows */
-        if (o->cur.style == EVAS_TEXT_STYLE_GLOW)
-          {
-             for (j = 0; j < 5; j++)
-               {
-                  for (i = 0; i < 5; i++)
-                    {
-                       if (vals[i][j] != 0)
-                         {
-                            COLOR_SET_AMUL(o, cur, glow, vals[i][j] * 50);
-                            DRAW_TEXT(i - 2, j - 2);
-                         }
-                    }
-               }
-             COLOR_SET(o, cur, glow2);
-             DRAW_TEXT(-1, 0);
-             DRAW_TEXT(1, 0);
-             DRAW_TEXT(0, -1);
-             DRAW_TEXT(0, 1);
-          }
-
-        /* outlines */
-        if ((o->cur.style == EVAS_TEXT_STYLE_OUTLINE) ||
-              (o->cur.style == EVAS_TEXT_STYLE_OUTLINE_SHADOW) ||
-              (o->cur.style == EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW))
-          {
-             COLOR_SET(o, cur, outline);
-             DRAW_TEXT(-1, 0);
-             DRAW_TEXT(1, 0);
-             DRAW_TEXT(0, -1);
-             DRAW_TEXT(0, 1);
-          }
-        else if (o->cur.style == EVAS_TEXT_STYLE_SOFT_OUTLINE)
-          {
-             for (j = 0; j < 5; j++)
-               {
-                  for (i = 0; i < 5; i++)
-                    {
-                       if (((i != 2) || (j != 2)) && (vals[i][j] != 0))
-                         {
-                            COLOR_SET_AMUL(o, cur, outline, vals[i][j] * 50);
-                            DRAW_TEXT(i - 2, j - 2);
-                         }
-                    }
-               }
-          }
-
-        /* normal text */
-        COLOR_ONLY_SET(obj, cur.cache, clip);
-        DRAW_TEXT(0, 0);
-     }
-}
-
-static void
-evas_object_text_render_pre(Evas_Object *obj)
-{
-   Evas_Object_Text *o;
-   int is_v, was_v;
-
-   /* dont pre-render the obj twice! */
-   if (obj->pre_render_done) return;
-   obj->pre_render_done = 1;
-   /* pre-render phase. this does anything an object needs to do just before
-    rendering. This could mean loading the image data, retrieving it from 
-    elsewhere, decoding video etc.
-    Then when this is done the object needs to figure if it changed and 
-    if so what and where and add the appropriate redraw rectangles */
-   o = (Evas_Object_Text *)(obj->object_data);
-   /* if someone is clipping this obj - go calculate the clipper */
-   if (obj->cur.clipper)
-     {
-        if (obj->cur.cache.clip.dirty)
-          evas_object_clip_recalc(obj->cur.clipper);
-        obj->cur.clipper->func->render_pre(obj->cur.clipper);
-     }
-   /* now figure what changed and add draw rects
-    if it just became visible or invisible */
-   is_v = evas_object_is_visible(obj);
-   was_v = evas_object_was_visible(obj);
-   if (is_v != was_v)
-     {
-        evas_object_render_pre_visible_change(&obj->layer->evas->clip_changes, 
-                                              obj, is_v, was_v);
-        goto done;
-     }
-   if ((obj->cur.map != obj->prev.map) ||
-       (obj->cur.usemap != obj->prev.usemap))
-     {
-        evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, 
-                                            obj);
-        goto done;
-     }
-   /* its not visible - we accounted for it appearing or not so just abort */
-   if (!is_v) goto done;
-   /* clipper changed this is in addition to anything else for obj */
-   evas_object_render_pre_clipper_change(&obj->layer->evas->clip_changes, obj);
-   /* if we restacked (layer or just within a layer) and dont clip anyone */
-   if (obj->restack)
-     {
-        evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, 
-                                            obj);
-        goto done;
-     }
-   /* if it changed color */
-   if ((obj->cur.color.r != obj->prev.color.r) ||
-       (obj->cur.color.g != obj->prev.color.g) ||
-       (obj->cur.color.b != obj->prev.color.b) ||
-       (obj->cur.color.a != obj->prev.color.a))
-     {
-        evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, 
-                                            obj);
-        goto done;
-     }
-   /* if it changed geometry - and obviously not visibility or color
-    calculate differences since we have a constant color fill
-    we really only need to update the differences */
-   if ((obj->cur.geometry.x != obj->prev.geometry.x) ||
-       (obj->cur.geometry.y != obj->prev.geometry.y) ||
-       (obj->cur.geometry.w != obj->prev.geometry.w) ||
-       (obj->cur.geometry.h != obj->prev.geometry.h))
-     {
-        evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, 
-                                            obj);
-        goto done;
-     }
-   if (obj->cur.render_op != obj->prev.render_op)
-     {
-        evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, 
-                                            obj);
-        goto done;
-     }
-   if (obj->cur.scale != obj->prev.scale)
-     {
-        evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, 
-                                            obj);
-        goto done;
-     }
-   if (o->changed)
-     {
-        if ((o->cur.size != o->prev.size) ||
-            ((o->cur.font != o->prev.font)) ||
-            ((o->cur.utf8_text != o->prev.utf8_text)) ||
-            ((o->cur.style != o->prev.style)) ||
-            ((o->cur.shadow.r != o->prev.shadow.r)) ||
-            ((o->cur.shadow.g != o->prev.shadow.g)) ||
-            ((o->cur.shadow.b != o->prev.shadow.b)) ||
-            ((o->cur.shadow.a != o->prev.shadow.a)) ||
-            ((o->cur.outline.r != o->prev.outline.r)) ||
-            ((o->cur.outline.g != o->prev.outline.g)) ||
-            ((o->cur.outline.b != o->prev.outline.b)) ||
-            ((o->cur.outline.a != o->prev.outline.a)) ||
-            ((o->cur.glow.r != o->prev.glow.r)) ||
-            ((o->cur.glow.g != o->prev.glow.g)) ||
-            ((o->cur.glow.b != o->prev.glow.b)) ||
-            ((o->cur.glow.a != o->prev.glow.a)) ||
-            ((o->cur.glow2.r != o->prev.glow2.r)) ||
-            ((o->cur.glow2.g != o->prev.glow2.g)) ||
-            ((o->cur.glow2.b != o->prev.glow2.b)) ||
-            ((o->cur.glow2.a != o->prev.glow2.a)))
-          {
-             evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, 
-                                                 obj);
-             goto done;
-          }
-     }
-   done:
-   evas_object_render_pre_effect_updates(&obj->layer->evas->clip_changes, 
-                                         obj, is_v, was_v);
-}
-
-static void
-evas_object_text_render_post(Evas_Object *obj)
-{
-   Evas_Object_Text *o;
-
-   /* this moves the current data to the previous state parts of the object
-    in whatever way is safest for the object. also if we don't need object
-    data anymore we can free it if the object deems this is a good idea */
-   o = (Evas_Object_Text *)(obj->object_data);
-   /* remove those pesky changes */
-   evas_object_clip_changes_clean(obj);
-   /* move cur to prev safely for object data */
-   obj->prev = obj->cur;
-   o->prev = o->cur;
-   o->changed = 0;
-}
-
-static unsigned int 
-evas_object_text_id_get(Evas_Object *obj)
-{
-   Evas_Object_Text *o;
-
-   o = (Evas_Object_Text *)(obj->object_data);
-   if (!o) return 0;
-   return MAGIC_OBJ_TEXT;
-}
-
-static unsigned int 
-evas_object_text_visual_id_get(Evas_Object *obj)
-{
-   Evas_Object_Text *o;
-
-   o = (Evas_Object_Text *)(obj->object_data);
-   if (!o) return 0;
-   return MAGIC_OBJ_SHAPE;
-}
-
-static void *
-evas_object_text_engine_data_get(Evas_Object *obj)
-{
-   Evas_Object_Text *o;
-
-   o = (Evas_Object_Text *)(obj->object_data);
-   if (!o) return NULL;
-   return o->font;
-}
-
-static int
-evas_object_text_is_opaque(Evas_Object *obj __UNUSED__)
-{
-   /* this returns 1 if the internal object data implies that the object is 
-    currently fully opaque over the entire gradient it occupies */
-   return 0;
-}
-
-static int
-evas_object_text_was_opaque(Evas_Object *obj __UNUSED__)
-{
-   /* this returns 1 if the internal object data implies that the object was
-    currently fully opaque over the entire gradient it occupies */
-   return 0;
-}
-
-static void
-evas_object_text_scale_update(Evas_Object *obj)
-{
-   Evas_Object_Text *o;
-   int size;
-   const char *font;
-
-   o = (Evas_Object_Text *)(obj->object_data);
-   font = eina_stringshare_add(o->cur.font);
-   size = o->cur.size;
-   if (o->cur.font) eina_stringshare_del(o->cur.font);
-   o->cur.font = NULL;
-   o->prev.font = NULL;
-   o->cur.size = 0;
-   o->prev.size = 0;
-   evas_object_text_font_set(obj, font, size);
-}
-
-void
-_evas_object_text_rehint(Evas_Object *obj)
-{
-   Evas_Object_Text *o;
-   int is, was;
-
-   o = (Evas_Object_Text *)(obj->object_data);
-   if (!o->font) return;
-#ifdef EVAS_FRAME_QUEUING
-   evas_common_pipe_op_text_flush((RGBA_Font *) o->font);
-#endif
-   evas_font_load_hinting_set(obj->layer->evas, o->font,
-                              obj->layer->evas->hinting);
-   was = evas_object_is_in_output_rect(obj,
-                                       obj->layer->evas->pointer.x,
-                                       obj->layer->evas->pointer.y, 1, 1);
-   /* DO II */
-   _evas_object_text_recalc(obj);
-   o->changed = 1;
-   evas_object_change(obj);
-   evas_object_clip_dirty(obj);
-   evas_object_coords_recalc(obj);
-   is = evas_object_is_in_output_rect(obj,
-                                      obj->layer->evas->pointer.x,
-                                      obj->layer->evas->pointer.y, 1, 1);
-   if ((is || was) && obj->cur.visible)
-     evas_event_feed_mouse_move(obj->layer->evas,
-                                obj->layer->evas->pointer.x,
-                                obj->layer->evas->pointer.y,
-                                obj->layer->evas->last_timestamp,
-                                NULL);
-   evas_object_inform_call_resize(obj);
-}
-
-static void
-_evas_object_text_recalc(Evas_Object *obj)
-{
-   Evas_Object_Text *o;
-   Eina_Unicode *text = NULL;
-   o = (Evas_Object_Text *)(obj->object_data);
-
-   if (o->items) _evas_object_text_items_clear(o);
-   if (o->cur.utf8_text)
-     text = eina_unicode_utf8_to_unicode(o->cur.utf8_text,
-           NULL);
-
-   if (!text) text = eina_unicode_strdup(EINA_UNICODE_EMPTY_STRING);
-
-   _evas_object_text_layout(obj, o, text);
-
-   if (text) free(text);
-
-   if ((o->font) && (o->items))
-     {
-        int w, h;
-        int l = 0, r = 0, t = 0, b = 0;
-
-        w = _evas_object_text_horiz_advance_get(obj, o);
-        h = _evas_object_text_vert_advance_get(obj, o);
-        evas_text_style_pad_get(o->cur.style, &l, &r, &t, &b);
-        obj->cur.geometry.w = w + l + r;
-        obj->cur.geometry.h = h + t + b;
-////        obj->cur.cache.geometry.validity = 0;
-     }
-   else
-     {
-        int t = 0, b = 0;
-
-        evas_text_style_pad_get(o->cur.style, NULL, NULL, &t, &b);
-        obj->cur.geometry.w = 0;
-        obj->cur.geometry.h = o->max_ascent + o->max_descent + t + b;
-////        obj->cur.cache.geometry.validity = 0;
-     }
-}
-
diff --git a/libraries/evas/src/lib/canvas/evas_object_textblock.c b/libraries/evas/src/lib/canvas/evas_object_textblock.c
deleted file mode 100644
index ee07e20..0000000
--- a/libraries/evas/src/lib/canvas/evas_object_textblock.c
+++ /dev/null
@@ -1,10052 +0,0 @@
-/**
- * @internal
- * @section Evas_Object_Textblock_Internal Internal Textblock Object Tutorial
- *
- * This explains the internal design of the Evas Textblock Object, it's assumed
- * that the reader of this section has already read @ref Evas_Object_Textblock_Tutorial "Textblock's usage docs.".
- *
- * @subsection textblock_internal_intro Introduction
- * There are two main parts to the textblock object, the first being the node
- * system, and the second being the layout system. The former is just an
- * internal representation of the markup text, while the latter is the internal
- * visual representation of the text (i.e positioning, sizing, fonts and etc).
- *
- * @subsection textblock_nodes The Nodes system
- * The nodes mechanism consists of two main data types:
- * ::Evas_Object_Textblock_Node_Text and ::Evas_Object_Textblock_Node_Format
- * the former is for Text nodes and the latter is for format nodes.
- * There's always at least one text node, even if there are only formats.
- *
- * @subsection textblock_nodes_text Text nodes
- * Each text node is essentially a paragraph, it includes an @ref Eina_UStrbuf
- * that stores the actual paragraph text, a utf8 string to store the paragraph
- * text in utf8 (which is not used internally at all), A pointer to it's
- * main @ref textblock_nodes_format_internal "Format Node" and the paragraph's
- * @ref evas_bidi_props "BiDi properties". The pointer to the format node may be
- * NULL if there's no format node anywhere before the end of the text node,
- * not even in previous text nodes. If not NULL, it points to the first format
- * node pointing to text inside of the text node, or if there is none, it points
- * to the previous's text nodes format node. Each paragraph has a format node
- * representing a paragraph separator pointing to it's last position except
- * for the last paragraph, which has no such constraint. This constraint
- * happens because text nodes are paragraphs and paragraphs are delimited by
- * paragraph separators.
- *
- * @subsection textblock_nodes_format_internal Format Nodes - Internal
- * Each format node stores a group of format information, for example the
- * markup: \<font=Vera,Kochi font_size=10 align=left\> will all be inserted
- * inside the same format node, altohugh it consists of different formatting
- * commands.
- * Each node has a pointer to it's text node, this pointer is NEVER NULL, even
- * if there's only one format, and no text, a text node is created. Each format
- * node includes an offset from the last format node of the same text node. For
- * example, the markup "0<b>12</b>" will create two format nodes, the first
- * having an offset of 1 and the second an offset of 2. Each format node also
- * includes a @ref Eina_Strbuf that includes the textual representation of the
- * format, and a boolean stating if the format is a visible format or not, see
- * @ref textblock_nodes_format_visible
- *
- * @subsection textblock_nodes_format_visible Visible Format Nodes
- * There are two types of format nodes, visible and invisible. They are the same
- * in every way, except for the representation in the text node. While invisible
- * format nodes have no representation in the text node, the visible ones do.
- * The Uniceode object replacement character (0xFFFC) is inserted to every place
- * a visible format node points to. This makes it very easy to treat visible
- * formats as items in the text, both for BiDi purposes and cursor handling
- * purposes.
- * Here are a few example visible an invisible formats:
- * Visible: newline char, tab, paragraph separator and an embedded item.
- * Invisible: setting the color, font or alignment of the text.
- *
- * @subsection textblock_layout The layout system
- * @todo write @ref textblock_layout
- */
-#include "evas_common.h"
-#include "evas_private.h"
-#include <stdlib.h>
-
-#ifdef HAVE_LINEBREAK
-#include "linebreak.h"
-#include "wordbreak.h"
-#endif
-
-/* save typing */
-#define ENFN obj->layer->evas->engine.func
-#define ENDT obj->layer->evas->engine.data.output
-
-/* private magic number for textblock objects */
-static const char o_type[] = "textblock";
-
-/* The char to be inserted instead of visible formats */
-#define _REPLACEMENT_CHAR 0xFFFC
-#define _PARAGRAPH_SEPARATOR 0x2029
-#define _NEWLINE '\n'
-#define _TAB '\t'
-
-#define _REPLACEMENT_CHAR_UTF8 "\xEF\xBF\xBC"
-#define _PARAGRAPH_SEPARATOR_UTF8 "\xE2\x80\xA9"
-#define _NEWLINE_UTF8 "\n"
-#define _TAB_UTF8 "\t"
-#define EVAS_TEXTBLOCK_IS_VISIBLE_FORMAT_CHAR(ch) \
-   (((ch) == _REPLACEMENT_CHAR) || \
-    ((ch) ==  _NEWLINE) || \
-    ((ch) == _TAB) || \
-    ((ch) == _PARAGRAPH_SEPARATOR))
-
-/* private struct for textblock object internal data */
-/**
- * @internal
- * @typedef Evas_Object_Textblock
- * The actual textblock object.
- */
-typedef struct _Evas_Object_Textblock             Evas_Object_Textblock;
-/**
- * @internal
- * @typedef Evas_Object_Style_Tag
- * The structure used for finding style tags.
- */
-typedef struct _Evas_Object_Style_Tag             Evas_Object_Style_Tag;
-/**
- * @internal
- * @typedef Evas_Object_Style_Tag
- * The structure used for finding style tags.
- */
-typedef struct _Evas_Object_Style_Tag_Base        Evas_Object_Style_Tag_Base;
-/**
- * @internal
- * @typedef Evas_Object_Textblock_Node_Text
- * A text node.
- */
-typedef struct _Evas_Object_Textblock_Node_Text   Evas_Object_Textblock_Node_Text;
-/*
- * Defined in Evas.h
-typedef struct _Evas_Object_Textblock_Node_Format Evas_Object_Textblock_Node_Format;
-*/
-
-/**
- * @internal
- * @typedef Evas_Object_Textblock_Paragraph
- * A layouting paragraph.
- */
-typedef struct _Evas_Object_Textblock_Paragraph   Evas_Object_Textblock_Paragraph;
-/**
- * @internal
- * @typedef Evas_Object_Textblock_Line
- * A layouting line.
- */
-typedef struct _Evas_Object_Textblock_Line        Evas_Object_Textblock_Line;
-/**
- * @internal
- * @typedef Evas_Object_Textblock_Item
- * A layouting item.
- */
-typedef struct _Evas_Object_Textblock_Item        Evas_Object_Textblock_Item;
-/**
- * @internal
- * @typedef Evas_Object_Textblock_Item
- * A layouting text item.
- */
-typedef struct _Evas_Object_Textblock_Text_Item        Evas_Object_Textblock_Text_Item;
-/**
- * @internal
- * @typedef Evas_Object_Textblock_Format_Item
- * A layouting format item.
- */
-typedef struct _Evas_Object_Textblock_Format_Item Evas_Object_Textblock_Format_Item;
-/**
- * @internal
- * @typedef Evas_Object_Textblock_Format
- * A textblock format.
- */
-typedef struct _Evas_Object_Textblock_Format      Evas_Object_Textblock_Format;
-
-/**
- * @internal
- * @def IS_AT_END(ti, ind)
- * Return true if ind is at the end of the text item, false otherwise.
- */
-#define IS_AT_END(ti, ind) (ind == ti->text_props.text_len)
-
-/**
- * @internal
- * @def MOVE_PREV_UNTIL(limit, ind)
- * This decrements ind as long as ind > limit.
- */
-#define MOVE_PREV_UNTIL(limit, ind) \
-   do \
-     { \
-        if ((limit) < (ind)) \
-           (ind)--; \
-     } \
-   while (0)
-
-/**
- * @internal
- * @def MOVE_NEXT_UNTIL(limit, ind)
- * This increments ind as long as ind < limit
- */
-#define MOVE_NEXT_UNTIL(limit, ind) \
-   do \
-     { \
-        if ((ind) < (limit)) \
-           (ind)++; \
-     } \
-   while (0)
-
-/**
- * @internal
- * @def GET_ITEM_TEXT(ti)
- * Returns a const reference to the text of the ti (not null terminated).
- */
-#define GET_ITEM_TEXT(ti) \
-   (((ti)->parent.text_node) ? \
-    (eina_ustrbuf_string_get((ti)->parent.text_node->unicode) + \
-      (ti)->parent.text_pos) : EINA_UNICODE_EMPTY_STRING)
-/**
- * @internal
- * @def _FORMAT_IS_CLOSER_OF(base, closer, closer_len)
- * Returns true if closer is the closer of base.
- */
-#define _FORMAT_IS_CLOSER_OF(base, closer, closer_len) \
-   (!strncmp(base, closer, closer_len) && \
-    (!base[closer_len] || \
-     (base[closer_len] == '=') || \
-     _is_white(base[closer_len])))
-
-/*FIXME: document the structs and struct items. */
-struct _Evas_Object_Style_Tag_Base
-{
-   char *tag;
-   char *replace;
-   size_t tag_len;
-   size_t replace_len;
-};
-
-struct _Evas_Object_Style_Tag
-{
-   EINA_INLIST;
-   Evas_Object_Style_Tag_Base tag;
-};
-
-struct _Evas_Object_Textblock_Node_Text
-{
-   EINA_INLIST;
-   Eina_UStrbuf                       *unicode;
-   char                               *utf8;
-   Evas_Object_Textblock_Node_Format  *format_node;
-   Evas_Object_Textblock_Paragraph    *par;
-   Eina_Bool                           dirty : 1;
-   Eina_Bool                           is_new : 1;
-};
-
-struct _Evas_Object_Textblock_Node_Format
-{
-   EINA_INLIST;
-   const char                         *format;
-   const char                         *orig_format;
-   Evas_Object_Textblock_Node_Text    *text_node;
-   size_t                              offset;
-   unsigned char                       anchor : 2;
-   Eina_Bool                           opener : 1;
-   Eina_Bool                           own_closer : 1;
-   Eina_Bool                           visible : 1;
-   Eina_Bool                           format_change : 1;
-   Eina_Bool                           is_new : 1;
-};
-
-/* The default tags to use */
-static const Evas_Object_Style_Tag_Base default_tags[] = {
-          { "b", "+ font_weight=Bold", 1, 18 },
-          { "i", "+ font_style=Italic", 1, 19 }};
-
-#define ANCHOR_NONE 0
-#define ANCHOR_A 1
-#define ANCHOR_ITEM 2
-
-/**
- * @internal
- * @def _NODE_TEXT(x)
- * A convinience macro for casting to a text node.
- */
-#define _NODE_TEXT(x)  ((Evas_Object_Textblock_Node_Text *) (x))
-/**
- * @internal
- * @def _NODE_FORMAT(x)
- * A convinience macro for casting to a format node.
- */
-#define _NODE_FORMAT(x)  ((Evas_Object_Textblock_Node_Format *) (x))
-/**
- * @internal
- * @def _ITEM(x)
- * A convinience macro for casting to a generic item.
- */
-#define _ITEM(x)  ((Evas_Object_Textblock_Item *) (x))
-/**
- * @internal
- * @def _ITEM_TEXT(x)
- * A convinience macro for casting to a text item.
- */
-#define _ITEM_TEXT(x)  ((Evas_Object_Textblock_Text_Item *) (x))
-/**
- * @internal
- * @def _ITEM_FORMAT(x)
- * A convinience macro for casting to a format item.
- */
-#define _ITEM_FORMAT(x)  ((Evas_Object_Textblock_Format_Item *) (x))
-
-struct _Evas_Object_Textblock_Paragraph
-{
-   EINA_INLIST;
-   Evas_Object_Textblock_Line        *lines;
-   Evas_Object_Textblock_Node_Text   *text_node;
-   Eina_List                         *logical_items;
-   Evas_BiDi_Paragraph_Props         *bidi_props; /* Only valid during layout */
-   Evas_BiDi_Direction                direction;
-   Evas_Coord                         y, w, h;
-   int                                line_no;
-   Eina_Bool                          is_bidi : 1;
-   Eina_Bool                          visible : 1;
-   Eina_Bool                          rendered : 1;
-};
-
-struct _Evas_Object_Textblock_Line
-{
-   EINA_INLIST;
-   Evas_Object_Textblock_Item        *items;
-   Evas_Object_Textblock_Paragraph   *par;
-   Evas_Coord                         x, y, w, h;
-   int                                baseline;
-   int                                line_no;
-};
-
-typedef enum _Evas_Textblock_Item_Type
-{
-   EVAS_TEXTBLOCK_ITEM_TEXT,
-   EVAS_TEXTBLOCK_ITEM_FORMAT,
-} Evas_Textblock_Item_Type;
-
-struct _Evas_Object_Textblock_Item
-{
-   EINA_INLIST;
-   Evas_Textblock_Item_Type             type;
-   Evas_Object_Textblock_Node_Text     *text_node;
-   Evas_Object_Textblock_Format        *format;
-   size_t                               text_pos;
-#ifdef BIDI_SUPPORT
-   size_t                               visual_pos;
-#endif
-   Evas_Coord                           adv, x, w, h;
-   Eina_Bool                            merge : 1; /* Indicates whether this
-                                                      item should merge to the
-                                                      previous item or not */
-   Eina_Bool                            visually_deleted : 1;
-                                                   /* Indicates whether this
-                                                      item is used in the visual
-                                                      layout or not. */
-};
-
-struct _Evas_Object_Textblock_Text_Item
-{
-   Evas_Object_Textblock_Item       parent;
-   Evas_Text_Props                  text_props;
-   Evas_Coord                       inset;
-   Evas_Coord                       x_adjustment; /* Used to indicate by how
-                                                     much we adjusted sizes */
-};
-
-struct _Evas_Object_Textblock_Format_Item
-{
-   Evas_Object_Textblock_Item           parent;
-   Evas_BiDi_Direction                  bidi_dir;
-   const char                          *item;
-   int                                  y;
-   unsigned char                        vsize : 2;
-   unsigned char                        size : 2;
-   Eina_Bool                            formatme : 1;
-};
-
-struct _Evas_Object_Textblock_Format
-{
-   Evas_Object_Textblock_Node_Format *fnode;
-   double               halign;
-   double               valign;
-   struct {
-      Evas_Font_Description *fdesc;
-      const char       *source;
-      Evas_Font_Set    *font;
-      Evas_Font_Size    size;
-   } font;
-   struct {
-      struct {
-         unsigned char  r, g, b, a;
-      } normal, underline, underline2, underline_dash, outline, shadow, glow, glow2, backing,
-        strikethrough;
-   } color;
-   struct {
-      int               l, r;
-   } margin;
-   int                  ref;
-   int                  tabstops;
-   int                  linesize;
-   int                  linegap;
-   int                  underline_dash_width;
-   int                  underline_dash_gap;
-   double               linerelsize;
-   double               linerelgap;
-   double               linefill;
-   double               ellipsis;
-   unsigned char        style;
-   Eina_Bool            wrap_word : 1;
-   Eina_Bool            wrap_char : 1;
-   Eina_Bool            wrap_mixed : 1;
-   Eina_Bool            underline : 1;
-   Eina_Bool            underline2 : 1;
-   Eina_Bool            underline_dash : 1;
-   Eina_Bool            strikethrough : 1;
-   Eina_Bool            backing : 1;
-   Eina_Bool            password : 1;
-   Eina_Bool            halign_auto : 1;
-};
-
-struct _Evas_Textblock_Style
-{
-   const char            *style_text;
-   char                  *default_tag;
-   Evas_Object_Style_Tag *tags;
-   Eina_List             *objects;
-   Eina_Bool              delete_me : 1;
-};
-
-struct _Evas_Textblock_Cursor
-{
-   Evas_Object                     *obj;
-   size_t                           pos;
-   Evas_Object_Textblock_Node_Text *node;
-};
-
-/* Size of the index array */
-#define TEXTBLOCK_PAR_INDEX_SIZE 10
-struct _Evas_Object_Textblock
-{
-   DATA32                              magic;
-   Evas_Textblock_Style               *style;
-   Evas_Textblock_Style               *style_user;
-   Evas_Textblock_Cursor              *cursor;
-   Eina_List                          *cursors;
-   Evas_Object_Textblock_Node_Text    *text_nodes;
-   Evas_Object_Textblock_Node_Format  *format_nodes;
-
-   int                                 num_paragraphs;
-   Evas_Object_Textblock_Paragraph    *paragraphs;
-   Evas_Object_Textblock_Paragraph    *par_index[TEXTBLOCK_PAR_INDEX_SIZE];
-
-   Evas_Object_Textblock_Text_Item    *ellip_ti;
-   Eina_List                          *anchors_a;
-   Eina_List                          *anchors_item;
-   int                                 last_w, last_h;
-   struct {
-      int                              l, r, t, b;
-   } style_pad;
-   double                              valign;
-   char                               *markup_text;
-   void                               *engine_data;
-   const char                         *repch;
-   const char                         *bidi_delimiters;
-   struct {
-      int                              w, h;
-      Eina_Bool                        valid : 1;
-   } formatted, native;
-   Eina_Bool                           redraw : 1;
-   Eina_Bool                           changed : 1;
-   Eina_Bool                           content_changed : 1;
-   Eina_Bool                           format_changed : 1;
-   Eina_Bool                           have_ellipsis : 1;
-   Eina_Bool                           legacy_newline : 1;
-};
-
-/* private methods for textblock objects */
-static void evas_object_textblock_init(Evas_Object *obj);
-static void *evas_object_textblock_new(void);
-static void evas_object_textblock_render(Evas_Object *obj, void *output, void *context, void *surface, int x, int y);
-static void evas_object_textblock_free(Evas_Object *obj);
-static void evas_object_textblock_render_pre(Evas_Object *obj);
-static void evas_object_textblock_render_post(Evas_Object *obj);
-
-static unsigned int evas_object_textblock_id_get(Evas_Object *obj);
-static unsigned int evas_object_textblock_visual_id_get(Evas_Object *obj);
-static void *evas_object_textblock_engine_data_get(Evas_Object *obj);
-
-static int evas_object_textblock_is_opaque(Evas_Object *obj);
-static int evas_object_textblock_was_opaque(Evas_Object *obj);
-
-static void evas_object_textblock_coords_recalc(Evas_Object *obj);
-
-static void evas_object_textblock_scale_update(Evas_Object *obj);
-
-static const Evas_Object_Func object_func =
-{
-   /* methods (compulsory) */
-   evas_object_textblock_free,
-     evas_object_textblock_render,
-     evas_object_textblock_render_pre,
-     evas_object_textblock_render_post,
-     evas_object_textblock_id_get,
-     evas_object_textblock_visual_id_get,
-     evas_object_textblock_engine_data_get,
-   /* these are optional. NULL = nothing */
-     NULL,
-     NULL,
-     NULL,
-     NULL,
-     evas_object_textblock_is_opaque,
-     evas_object_textblock_was_opaque,
-     NULL,
-     NULL,
-     evas_object_textblock_coords_recalc,
-     evas_object_textblock_scale_update,
-     NULL,
-     NULL,
-     NULL
-};
-
-/* the actual api call to add a textblock */
-
-#define TB_HEAD() \
-   Evas_Object_Textblock *o; \
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); \
-   return; \
-   MAGIC_CHECK_END(); \
-   o = (Evas_Object_Textblock *)(obj->object_data); \
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK); \
-   return; \
-   MAGIC_CHECK_END();
-
-#define TB_HEAD_RETURN(x) \
-   Evas_Object_Textblock *o; \
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); \
-   return (x); \
-   MAGIC_CHECK_END(); \
-   o = (Evas_Object_Textblock *)(obj->object_data); \
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK); \
-   return (x); \
-   MAGIC_CHECK_END();
-
-
-
-static Eina_Bool _evas_textblock_cursor_is_at_the_end(const Evas_Textblock_Cursor *cur);
-static void _evas_textblock_node_text_remove(Evas_Object_Textblock *o, Evas_Object_Textblock_Node_Text *n);
-static void _evas_textblock_node_text_remove_formats_between(Evas_Object_Textblock *o, Evas_Object_Textblock_Node_Text *n, int start, int end);
-static Evas_Object_Textblock_Node_Format *_evas_textblock_cursor_node_format_before_or_at_pos_get(const Evas_Textblock_Cursor *cur);
-static size_t _evas_textblock_node_format_pos_get(const Evas_Object_Textblock_Node_Format *fmt);
-static void _evas_textblock_node_format_remove(Evas_Object_Textblock *o, Evas_Object_Textblock_Node_Format *n, int visual_adjustment);
-static void _evas_textblock_node_format_free(Evas_Object_Textblock *o, Evas_Object_Textblock_Node_Format *n);
-static void _evas_textblock_node_text_free(Evas_Object_Textblock_Node_Text *n);
-static void _evas_textblock_changed(Evas_Object_Textblock *o, Evas_Object *obj);
-static void _evas_textblock_invalidate_all(Evas_Object_Textblock *o);
-static void _evas_textblock_cursors_update_offset(const Evas_Textblock_Cursor *cur, const Evas_Object_Textblock_Node_Text *n, size_t start, int offset);
-static void _evas_textblock_cursors_set_node(Evas_Object_Textblock *o, const Evas_Object_Textblock_Node_Text *n, Evas_Object_Textblock_Node_Text *new_node);
-
-/* styles */
-/**
- * @internal
- * Clears the textblock style passed except for the style_text which is replaced.
- * @param ts The ts to be cleared. Must not be NULL.
- * @param style_text the style's text.
- */
-static void
-_style_replace(Evas_Textblock_Style *ts, const char *style_text)
-{
-   eina_stringshare_replace(&ts->style_text, style_text);
-   if (ts->default_tag) free(ts->default_tag);
-   while (ts->tags)
-     {
-        Evas_Object_Style_Tag *tag;
-
-        tag = (Evas_Object_Style_Tag *)ts->tags;
-        ts->tags = (Evas_Object_Style_Tag *)eina_inlist_remove(EINA_INLIST_GET(ts->tags), EINA_INLIST_GET(tag));
-        free(tag->tag.tag);
-        free(tag->tag.replace);
-        free(tag);
-     }
-   ts->default_tag = NULL;
-   ts->tags = NULL;
-}
-
-/**
- * @internal
- * Clears the textblock style passed.
- * @param ts The ts to be cleared. Must not be NULL.
- */
-static void
-_style_clear(Evas_Textblock_Style *ts)
-{
-   _style_replace(ts, NULL);
-}
-
-/**
- * @internal
- * Searches inside the tags stored in the style for the tag matching s.
- * @param ts The ts to be cleared. Must not be NULL.
- * @param s The tag to be matched.
- * @param tag_len the length of the tag string.
- * @param[out] replace_len The length of the replcaement found. - Must not be NULL.
- * @return The replacement string found.
- */
-static inline const char *
-_style_match_tag(const Evas_Textblock_Style *ts, const char *s, size_t tag_len, size_t *replace_len)
-{
-   Evas_Object_Style_Tag *tag;
-
-   /* Try the style tags */
-   EINA_INLIST_FOREACH(ts->tags, tag)
-     {
-        if (tag->tag.tag_len != tag_len) continue;
-        if (!strncmp(tag->tag.tag, s, tag_len))
-          {
-             *replace_len = tag->tag.replace_len;
-             return tag->tag.replace;
-          }
-     }
-
-   /* Try the default tags */
-   {
-      size_t i;
-      const Evas_Object_Style_Tag_Base *btag;
-      for (btag = default_tags, i = 0 ;
-            i < (sizeof(default_tags) / sizeof(default_tags[0])) ;
-            btag++, i++)
-        {
-           if (btag->tag_len != tag_len) continue;
-           if (!strncmp(btag->tag, s, tag_len))
-             {
-                *replace_len = btag->replace_len;
-                return btag->replace;
-             }
-        }
-   }
-
-   *replace_len = 0;
-   return NULL;
-}
-
-/**
- * @internal
- * Clears all the nodes (text and format) of the textblock object.
- * @param obj The evas object, must not be NULL.
- */
-static void
-_nodes_clear(const Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   while (o->text_nodes)
-     {
-        Evas_Object_Textblock_Node_Text *n;
-
-        n = o->text_nodes;
-        o->text_nodes = _NODE_TEXT(eina_inlist_remove(
-                 EINA_INLIST_GET(o->text_nodes), EINA_INLIST_GET(n)));
-        _evas_textblock_node_text_free(n);
-     }
-   while (o->format_nodes)
-     {
-        Evas_Object_Textblock_Node_Format *n;
-
-        n = o->format_nodes;
-        o->format_nodes = _NODE_FORMAT(eina_inlist_remove(EINA_INLIST_GET(o->format_nodes), EINA_INLIST_GET(n)));
-        _evas_textblock_node_format_free(o, n);
-     }
-}
-
-/**
- * @internal
- * Unrefs and frees (if needed) a textblock format.
- * @param obj The Evas_Object, Must not be NULL.
- * @param fmt the format to be cleaned, must not be NULL.
- */
-static void
-_format_unref_free(const Evas_Object *obj, Evas_Object_Textblock_Format *fmt)
-{
-   fmt->ref--;
-   if (fmt->ref > 0) return;
-   if (fmt->font.fdesc) evas_font_desc_unref(fmt->font.fdesc);
-   if (fmt->font.source) eina_stringshare_del(fmt->font.source);
-   evas_font_free(obj->layer->evas, fmt->font.font);
-   free(fmt);
-}
-
-/**
- * @internal
- * Free a layout item
- * @param obj The evas object, must not be NULL.
- * @param ln the layout line on which the item is in, must not be NULL.
- * @param it the layout item to be freed
- */
-static void
-_item_free(const Evas_Object *obj, Evas_Object_Textblock_Line *ln, Evas_Object_Textblock_Item *it)
-{
-   if (it->type == EVAS_TEXTBLOCK_ITEM_TEXT)
-     {
-        Evas_Object_Textblock_Text_Item *ti = _ITEM_TEXT(it);
-
-        evas_common_text_props_content_unref(&ti->text_props);
-     }
-   else
-     {
-        Evas_Object_Textblock_Format_Item *fi = _ITEM_FORMAT(it);
-
-        if (fi->item) eina_stringshare_del(fi->item);
-     }
-   _format_unref_free(obj, it->format);
-   if (ln)
-     {
-        ln->items = (Evas_Object_Textblock_Item *) eina_inlist_remove(
-              EINA_INLIST_GET(ln->items), EINA_INLIST_GET(ln->items));
-     }
-   free(it);
-}
-
-/**
- * @internal
- * Free a layout line.
- * @param obj The evas object, must not be NULL.
- * @param ln the layout line to be freed, must not be NULL.
- */
-static void
-_line_free(Evas_Object_Textblock_Line *ln)
-{
-   /* Items are freed from the logical list, except for the ellip item */
-   if (ln) free(ln);
-}
-
-/* table of html escapes (that i can find) this should be ordered with the
- * most common first as it's a linear search to match - no hash for this.
- *
- * these are stored as one large string and one additional array that
- * contains the offsets to the tokens for space efficiency.
- */
-/**
- * @internal
- * @var escape_strings[]
- * This string consists of NULL terminated pairs of strings, the first of
- * every pair is an escape and the second is the value of the escape.
- */
-static const char escape_strings[] =
-/* most common escaped stuff */
-"&quot;\0"     "\x22\0"
-"&amp;\0"      "\x26\0"
-"&lt;\0"       "\x3c\0"
-"&gt;\0"       "\x3e\0"
-/* all the rest */
-"&nbsp;\0"     "\xc2\xa0\0"
-"&iexcl;\0"    "\xc2\xa1\0"
-"&cent;\0"     "\xc2\xa2\0"
-"&pound;\0"    "\xc2\xa3\0"
-"&curren;\0"   "\xc2\xa4\0"
-"&yen;\0"      "\xc2\xa5\0"
-"&brvbar;\0"   "\xc2\xa6\0"
-"&sect;\0"     "\xc2\xa7\0"
-"&uml;\0"      "\xc2\xa8\0"
-"&copy;\0"     "\xc2\xa9\0"
-"&ordf;\0"     "\xc2\xaa\0"
-"&laquo;\0"    "\xc2\xab\0"
-"&not;\0"      "\xc2\xac\0"
-"&reg;\0"      "\xc2\xae\0"
-"&macr;\0"     "\xc2\xaf\0"
-"&deg;\0"      "\xc2\xb0\0"
-"&plusmn;\0"   "\xc2\xb1\0"
-"&sup2;\0"     "\xc2\xb2\0"
-"&sup3;\0"     "\xc2\xb3\0"
-"&acute;\0"    "\xc2\xb4\0"
-"&micro;\0"    "\xc2\xb5\0"
-"&para;\0"     "\xc2\xb6\0"
-"&middot;\0"   "\xc2\xb7\0"
-"&cedil;\0"    "\xc2\xb8\0"
-"&sup1;\0"     "\xc2\xb9\0"
-"&ordm;\0"     "\xc2\xba\0"
-"&raquo;\0"    "\xc2\xbb\0"
-"&frac14;\0"   "\xc2\xbc\0"
-"&frac12;\0"   "\xc2\xbd\0"
-"&frac34;\0"   "\xc2\xbe\0"
-"&iquest;\0"   "\xc2\xbf\0"
-"&Agrave;\0"   "\xc3\x80\0"
-"&Aacute;\0"   "\xc3\x81\0"
-"&Acirc;\0"    "\xc3\x82\0"
-"&Atilde;\0"   "\xc3\x83\0"
-"&Auml;\0"     "\xc3\x84\0"
-"&Aring;\0"    "\xc3\x85\0"
-"&Aelig;\0"    "\xc3\x86\0"
-"&Ccedil;\0"   "\xc3\x87\0"
-"&Egrave;\0"   "\xc3\x88\0"
-"&Eacute;\0"   "\xc3\x89\0"
-"&Ecirc;\0"    "\xc3\x8a\0"
-"&Euml;\0"     "\xc3\x8b\0"
-"&Igrave;\0"   "\xc3\x8c\0"
-"&Iacute;\0"   "\xc3\x8d\0"
-"&Icirc;\0"    "\xc3\x8e\0"
-"&Iuml;\0"     "\xc3\x8f\0"
-"&Eth;\0"      "\xc3\x90\0"
-"&Ntilde;\0"   "\xc3\x91\0"
-"&Ograve;\0"   "\xc3\x92\0"
-"&Oacute;\0"   "\xc3\x93\0"
-"&Ocirc;\0"    "\xc3\x94\0"
-"&Otilde;\0"   "\xc3\x95\0"
-"&Ouml;\0"     "\xc3\x96\0"
-"&times;\0"    "\xc3\x97\0"
-"&Oslash;\0"   "\xc3\x98\0"
-"&Ugrave;\0"   "\xc3\x99\0"
-"&Uacute;\0"   "\xc3\x9a\0"
-"&Ucirc;\0"    "\xc3\x9b\0"
-"&Yacute;\0"   "\xc3\x9d\0"
-"&Thorn;\0"    "\xc3\x9e\0"
-"&szlig;\0"    "\xc3\x9f\0"
-"&agrave;\0"   "\xc3\xa0\0"
-"&aacute;\0"   "\xc3\xa1\0"
-"&acirc;\0"    "\xc3\xa2\0"
-"&atilde;\0"   "\xc3\xa3\0"
-"&auml;\0"     "\xc3\xa4\0"
-"&aring;\0"    "\xc3\xa5\0"
-"&aelig;\0"    "\xc3\xa6\0"
-"&ccedil;\0"   "\xc3\xa7\0"
-"&egrave;\0"   "\xc3\xa8\0"
-"&eacute;\0"   "\xc3\xa9\0"
-"&ecirc;\0"    "\xc3\xaa\0"
-"&euml;\0"     "\xc3\xab\0"
-"&igrave;\0"   "\xc3\xac\0"
-"&iacute;\0"   "\xc3\xad\0"
-"&icirc;\0"    "\xc3\xae\0"
-"&iuml;\0"     "\xc3\xaf\0"
-"&eth;\0"      "\xc3\xb0\0"
-"&ntilde;\0"   "\xc3\xb1\0"
-"&ograve;\0"   "\xc3\xb2\0"
-"&oacute;\0"   "\xc3\xb3\0"
-"&ocirc;\0"    "\xc3\xb4\0"
-"&otilde;\0"   "\xc3\xb5\0"
-"&ouml;\0"     "\xc3\xb6\0"
-"&divide;\0"   "\xc3\xb7\0"
-"&oslash;\0"   "\xc3\xb8\0"
-"&ugrave;\0"   "\xc3\xb9\0"
-"&uacute;\0"   "\xc3\xba\0"
-"&ucirc;\0"    "\xc3\xbb\0"
-"&uuml;\0"     "\xc3\xbc\0"
-"&yacute;\0"   "\xc3\xbd\0"
-"&thorn;\0"    "\xc3\xbe\0"
-"&yuml;\0"     "\xc3\xbf\0"
-"&alpha;\0"    "\xce\x91\0"
-"&beta;\0"     "\xce\x92\0"
-"&gamma;\0"    "\xce\x93\0"
-"&delta;\0"    "\xce\x94\0"
-"&epsilon;\0"  "\xce\x95\0"
-"&zeta;\0"     "\xce\x96\0"
-"&eta;\0"      "\xce\x97\0"
-"&theta;\0"    "\xce\x98\0"
-"&iota;\0"     "\xce\x99\0"
-"&kappa;\0"    "\xce\x9a\0"
-"&lambda;\0"   "\xce\x9b\0"
-"&mu;\0"       "\xce\x9c\0"
-"&nu;\0"       "\xce\x9d\0"
-"&xi;\0"       "\xce\x9e\0"
-"&omicron;\0"  "\xce\x9f\0"
-"&pi;\0"       "\xce\xa0\0"
-"&rho;\0"      "\xce\xa1\0"
-"&sigma;\0"    "\xce\xa3\0"
-"&tau;\0"      "\xce\xa4\0"
-"&upsilon;\0"  "\xce\xa5\0"
-"&phi;\0"      "\xce\xa6\0"
-"&chi;\0"      "\xce\xa7\0"
-"&psi;\0"      "\xce\xa8\0"
-"&omega;\0"    "\xce\xa9\0"
-"&hellip;\0"   "\xe2\x80\xa6\0"
-"&euro;\0"     "\xe2\x82\xac\0"
-"&larr;\0"     "\xe2\x86\x90\0"
-"&uarr;\0"     "\xe2\x86\x91\0"
-"&rarr;\0"     "\xe2\x86\x92\0"
-"&darr;\0"     "\xe2\x86\x93\0"
-"&harr;\0"     "\xe2\x86\x94\0"
-"&larr;\0"     "\xe2\x87\x90\0"
-"&rarr;\0"     "\xe2\x87\x92\0"
-"&forall;\0"   "\xe2\x88\x80\0"
-"&exist;\0"    "\xe2\x88\x83\0"
-"&nabla;\0"    "\xe2\x88\x87\0"
-"&prod;\0"     "\xe2\x88\x8f\0"
-"&sum;\0"      "\xe2\x88\x91\0"
-"&and;\0"      "\xe2\x88\xa7\0"
-"&or;\0"       "\xe2\x88\xa8\0"
-"&int;\0"      "\xe2\x88\xab\0"
-"&ne;\0"       "\xe2\x89\xa0\0"
-"&equiv;\0"    "\xe2\x89\xa1\0"
-"&oplus;\0"    "\xe2\x8a\x95\0"
-"&perp;\0"     "\xe2\x8a\xa5\0"
-"&dagger;\0"   "\xe2\x80\xa0\0"
-"&Dagger;\0"   "\xe2\x80\xa1\0"
-"&bull;\0"     "\xe2\x80\xa2\0"
-;
-
-EVAS_MEMPOOL(_mp_obj);
-
-/**
- * @internal
- * Checks if a char is a whitespace.
- * @param c the unicode codepoint.
- * @return EINA_TRUE if the unicode codepoint is a whitespace, EINA_FALSE otherwise.
- */
-static Eina_Bool
-_is_white(Eina_Unicode c)
-{
-   /*
-    * unicode list of whitespace chars
-    *
-    * 0009..000D <control-0009>..<control-000D>
-    * 0020 SPACE
-    * 0085 <control-0085>
-    * 00A0 NO-BREAK SPACE
-    * 1680 OGHAM SPACE MARK
-    * 180E MONGOLIAN VOWEL SEPARATOR
-    * 2000..200A EN QUAD..HAIR SPACE
-    * 2028 LINE SEPARATOR
-    * 2029 PARAGRAPH SEPARATOR
-    * 202F NARROW NO-BREAK SPACE
-    * 205F MEDIUM MATHEMATICAL SPACE
-    * 3000 IDEOGRAPHIC SPACE
-    */
-   if (
-         (c == 0x20) ||
-         ((c >= 0x9) && (c <= 0xd)) ||
-         (c == 0x85) ||
-         (c == 0xa0) ||
-         (c == 0x1680) ||
-         (c == 0x180e) ||
-         ((c >= 0x2000) && (c <= 0x200a)) ||
-         (c == 0x2028) ||
-         (c == 0x2029) ||
-         (c == 0x202f) ||
-         (c == 0x205f) ||
-         (c == 0x3000)
-      )
-     return EINA_TRUE;
-   return EINA_FALSE;
-}
-
-/**
- * @internal
- * Prepends the text between s and p to the main cursor of the object.
- *
- * @param cur the cursor to prepend to.
- * @param[in] s start of the string
- * @param[in] p end of the string
- */
-static void
-_prepend_text_run(Evas_Textblock_Cursor *cur, const char *s, const char *p)
-{
-   if ((s) && (p > s))
-     {
-        char *ts;
-
-        ts = alloca(p - s + 1);
-        strncpy(ts, s, p - s);
-        ts[p - s] = 0;
-        evas_textblock_cursor_text_prepend(cur, ts);
-     }
-}
-
-
-/**
- * @internal
- * Returns the numeric value of HEX chars for example for ch = 'A'
- * the function will return 10.
- *
- * @param ch The HEX char.
- * @return numeric value of HEX.
- */
-static int
-_hex_string_get(char ch)
-{
-   if ((ch >= '0') && (ch <= '9')) return (ch - '0');
-   else if ((ch >= 'A') && (ch <= 'F')) return (ch - 'A' + 10);
-   else if ((ch >= 'a') && (ch <= 'f')) return (ch - 'a' + 10);
-   return 0;
-}
-
-/**
- * @internal
- * Parses a string of one of the formas:
- * 1. "#RRGGBB"
- * 2. "#RRGGBBAA"
- * 3. "#RGB"
- * 4. "#RGBA"
- * To the rgba values.
- *
- * @param[in] str The string to parse - NOT NULL.
- * @param[out] r The Red value - NOT NULL.
- * @param[out] g The Green value - NOT NULL.
- * @param[out] b The Blue value - NOT NULL.
- * @param[out] a The Alpha value - NOT NULL.
- */
-static void
-_format_color_parse(const char *str, unsigned char *r, unsigned char *g, unsigned char *b, unsigned char *a)
-{
-   int slen;
-
-   slen = strlen(str);
-   *r = *g = *b = *a = 0;
-
-   if (slen == 7) /* #RRGGBB */
-     {
-        *r = (_hex_string_get(str[1]) << 4) | (_hex_string_get(str[2]));
-        *g = (_hex_string_get(str[3]) << 4) | (_hex_string_get(str[4]));
-        *b = (_hex_string_get(str[5]) << 4) | (_hex_string_get(str[6]));
-        *a = 0xff;
-     }
-   else if (slen == 9) /* #RRGGBBAA */
-     {
-        *r = (_hex_string_get(str[1]) << 4) | (_hex_string_get(str[2]));
-        *g = (_hex_string_get(str[3]) << 4) | (_hex_string_get(str[4]));
-        *b = (_hex_string_get(str[5]) << 4) | (_hex_string_get(str[6]));
-        *a = (_hex_string_get(str[7]) << 4) | (_hex_string_get(str[8]));
-     }
-   else if (slen == 4) /* #RGB */
-     {
-        *r = _hex_string_get(str[1]);
-        *r = (*r << 4) | *r;
-        *g = _hex_string_get(str[2]);
-        *g = (*g << 4) | *g;
-        *b = _hex_string_get(str[3]);
-        *b = (*b << 4) | *b;
-        *a = 0xff;
-     }
-   else if (slen == 5) /* #RGBA */
-     {
-        *r = _hex_string_get(str[1]);
-        *r = (*r << 4) | *r;
-        *g = _hex_string_get(str[2]);
-        *g = (*g << 4) | *g;
-        *b = _hex_string_get(str[3]);
-        *b = (*b << 4) | *b;
-        *a = _hex_string_get(str[4]);
-        *a = (*a << 4) | *a;
-     }
-   *r = (*r * *a) / 255;
-   *g = (*g * *a) / 255;
-   *b = (*b * *a) / 255;
-}
-
-/* The refcount for the formats. */
-static int format_refcount = 0;
-/* Holders for the stringshares */
-static const char *fontstr = NULL;
-static const char *font_fallbacksstr = NULL;
-static const char *font_sizestr = NULL;
-static const char *font_sourcestr = NULL;
-static const char *font_weightstr = NULL;
-static const char *font_stylestr = NULL;
-static const char *font_widthstr = NULL;
-static const char *langstr = NULL;
-static const char *colorstr = NULL;
-static const char *underline_colorstr = NULL;
-static const char *underline2_colorstr = NULL;
-static const char *underline_dash_colorstr = NULL;
-static const char *outline_colorstr = NULL;
-static const char *shadow_colorstr = NULL;
-static const char *glow_colorstr = NULL;
-static const char *glow2_colorstr = NULL;
-static const char *backing_colorstr = NULL;
-static const char *strikethrough_colorstr = NULL;
-static const char *alignstr = NULL;
-static const char *valignstr = NULL;
-static const char *wrapstr = NULL;
-static const char *left_marginstr = NULL;
-static const char *right_marginstr = NULL;
-static const char *underlinestr = NULL;
-static const char *strikethroughstr = NULL;
-static const char *backingstr = NULL;
-static const char *stylestr = NULL;
-static const char *tabstopsstr = NULL;
-static const char *linesizestr = NULL;
-static const char *linerelsizestr = NULL;
-static const char *linegapstr = NULL;
-static const char *linerelgapstr = NULL;
-static const char *itemstr = NULL;
-static const char *linefillstr = NULL;
-static const char *ellipsisstr = NULL;
-static const char *passwordstr = NULL;
-static const char *underline_dash_widthstr = NULL;
-static const char *underline_dash_gapstr = NULL;
-
-/**
- * @internal
- * Init the format strings.
- */
-static void
-_format_command_init(void)
-{
-   if (format_refcount == 0)
-     {
-        fontstr = eina_stringshare_add("font");
-        font_fallbacksstr = eina_stringshare_add("font_fallbacks");
-        font_sizestr = eina_stringshare_add("font_size");
-        font_sourcestr = eina_stringshare_add("font_source");
-        font_weightstr = eina_stringshare_add("font_weight");
-        font_stylestr = eina_stringshare_add("font_style");
-        font_widthstr = eina_stringshare_add("font_width");
-        langstr = eina_stringshare_add("lang");
-        colorstr = eina_stringshare_add("color");
-        underline_colorstr = eina_stringshare_add("underline_color");
-        underline2_colorstr = eina_stringshare_add("underline2_color");
-        underline_dash_colorstr = eina_stringshare_add("underline_dash_color");
-        outline_colorstr = eina_stringshare_add("outline_color");
-        shadow_colorstr = eina_stringshare_add("shadow_color");
-        glow_colorstr = eina_stringshare_add("glow_color");
-        glow2_colorstr = eina_stringshare_add("glow2_color");
-        backing_colorstr = eina_stringshare_add("backing_color");
-        strikethrough_colorstr = eina_stringshare_add("strikethrough_color");
-        alignstr = eina_stringshare_add("align");
-        valignstr = eina_stringshare_add("valign");
-        wrapstr = eina_stringshare_add("wrap");
-        left_marginstr = eina_stringshare_add("left_margin");
-        right_marginstr = eina_stringshare_add("right_margin");
-        underlinestr = eina_stringshare_add("underline");
-        strikethroughstr = eina_stringshare_add("strikethrough");
-        backingstr = eina_stringshare_add("backing");
-        stylestr = eina_stringshare_add("style");
-        tabstopsstr = eina_stringshare_add("tabstops");
-        linesizestr = eina_stringshare_add("linesize");
-        linerelsizestr = eina_stringshare_add("linerelsize");
-        linegapstr = eina_stringshare_add("linegap");
-        linerelgapstr = eina_stringshare_add("linerelgap");
-        itemstr = eina_stringshare_add("item");
-        linefillstr = eina_stringshare_add("linefill");
-        ellipsisstr = eina_stringshare_add("ellipsis");
-        passwordstr = eina_stringshare_add("password");
-        underline_dash_widthstr = eina_stringshare_add("underline_dash_width");
-        underline_dash_gapstr = eina_stringshare_add("underline_dash_gap");
-     }
-   format_refcount++;
-}
-
-/**
- * @internal
- * Shutdown the format strings.
- */
-static void
-_format_command_shutdown(void)
-{
-   if (--format_refcount > 0) return;
-
-   eina_stringshare_del(fontstr);
-   eina_stringshare_del(font_fallbacksstr);
-   eina_stringshare_del(font_sizestr);
-   eina_stringshare_del(font_sourcestr);
-   eina_stringshare_del(font_weightstr);
-   eina_stringshare_del(font_stylestr);
-   eina_stringshare_del(font_widthstr);
-   eina_stringshare_del(langstr);
-   eina_stringshare_del(colorstr);
-   eina_stringshare_del(underline_colorstr);
-   eina_stringshare_del(underline2_colorstr);
-   eina_stringshare_del(underline_dash_colorstr);
-   eina_stringshare_del(outline_colorstr);
-   eina_stringshare_del(shadow_colorstr);
-   eina_stringshare_del(glow_colorstr);
-   eina_stringshare_del(glow2_colorstr);
-   eina_stringshare_del(backing_colorstr);
-   eina_stringshare_del(strikethrough_colorstr);
-   eina_stringshare_del(alignstr);
-   eina_stringshare_del(valignstr);
-   eina_stringshare_del(wrapstr);
-   eina_stringshare_del(left_marginstr);
-   eina_stringshare_del(right_marginstr);
-   eina_stringshare_del(underlinestr);
-   eina_stringshare_del(strikethroughstr);
-   eina_stringshare_del(backingstr);
-   eina_stringshare_del(stylestr);
-   eina_stringshare_del(tabstopsstr);
-   eina_stringshare_del(linesizestr);
-   eina_stringshare_del(linerelsizestr);
-   eina_stringshare_del(linegapstr);
-   eina_stringshare_del(linerelgapstr);
-   eina_stringshare_del(itemstr);
-   eina_stringshare_del(linefillstr);
-   eina_stringshare_del(ellipsisstr);
-   eina_stringshare_del(passwordstr);
-   eina_stringshare_del(underline_dash_widthstr);
-   eina_stringshare_del(underline_dash_gapstr);
-}
-
-/**
- * @internal
- * Copies str to dst while removing the \\ char, i.e unescape the escape sequences.
- *
- * @param[out] dst the destination string - Should not be NULL.
- * @param[in] src the source string - Should not be NULL.
- */
-static void
-_format_clean_param(char *dst, const char *src)
-{
-   const char *ss;
-   char *ds;
-
-   ds = dst;
-   for (ss = src; *ss; ss++, ds++)
-     {
-        if ((*ss == '\\') && *(ss + 1)) ss++;
-        *ds = *ss;
-     }
-   *ds = 0;
-}
-
-/**
- * @internal
- * Parses the cmd and parameter and adds the parsed format to fmt.
- *
- * @param obj the evas object - should not be NULL.
- * @param fmt The format to populate - should not be NULL.
- * @param[in] cmd the command to process, should be stringshared.
- * @param[in] param the parameter of the command.
- */
-static void
-_format_command(Evas_Object *obj, Evas_Object_Textblock_Format *fmt, const char *cmd, const char *param)
-{
-   int len;
-   char *tmp_param;
-
-   len = strlen(param);
-   tmp_param = alloca(len + 1);
-
-   _format_clean_param(tmp_param, param);
-
-   /* If we are changing the font, create the fdesc. */
-   if ((cmd == font_weightstr) || (cmd == font_widthstr) ||
-         (cmd == font_stylestr) || (cmd == langstr) ||
-         (cmd == fontstr) || (cmd == font_fallbacksstr))
-     {
-        if (!fmt->font.fdesc)
-          {
-             fmt->font.fdesc = evas_font_desc_new();
-          }
-        else if (!fmt->font.fdesc->is_new)
-          {
-             Evas_Font_Description *old = fmt->font.fdesc;
-             fmt->font.fdesc = evas_font_desc_dup(fmt->font.fdesc);
-             if (old) evas_font_desc_unref(old);
-          }
-     }
-
-
-   if (cmd == fontstr)
-     {
-        evas_font_name_parse(fmt->font.fdesc, tmp_param);
-     }
-   else if (cmd == font_fallbacksstr)
-     {
-        eina_stringshare_replace(&(fmt->font.fdesc->fallbacks), tmp_param);
-     }
-   else if (cmd == font_sizestr)
-     {
-        int v;
-
-        v = atoi(tmp_param);
-        if (v != fmt->font.size)
-          {
-             fmt->font.size = v;
-          }
-     }
-   else if (cmd == font_sourcestr)
-     {
-        if ((!fmt->font.source) ||
-              ((fmt->font.source) && (strcmp(fmt->font.source, tmp_param))))
-          {
-             if (fmt->font.source) eina_stringshare_del(fmt->font.source);
-             fmt->font.source = eina_stringshare_add(tmp_param);
-          }
-     }
-   else if (cmd == font_weightstr)
-     {
-        fmt->font.fdesc->weight = evas_font_style_find(tmp_param,
-              tmp_param + strlen(tmp_param), EVAS_FONT_STYLE_WEIGHT);
-     }
-   else if (cmd == font_stylestr)
-     {
-        fmt->font.fdesc->slant = evas_font_style_find(tmp_param,
-              tmp_param + strlen(tmp_param), EVAS_FONT_STYLE_SLANT);
-     }
-   else if (cmd == font_widthstr)
-     {
-        fmt->font.fdesc->width = evas_font_style_find(tmp_param,
-              tmp_param + strlen(tmp_param), EVAS_FONT_STYLE_WIDTH);
-     }
-   else if (cmd == langstr)
-     {
-        eina_stringshare_replace(&(fmt->font.fdesc->lang), tmp_param);
-     }
-   else if (cmd == colorstr)
-     _format_color_parse(tmp_param,
-           &(fmt->color.normal.r), &(fmt->color.normal.g),
-           &(fmt->color.normal.b), &(fmt->color.normal.a));
-   else if (cmd == underline_colorstr)
-     _format_color_parse(tmp_param,
-           &(fmt->color.underline.r), &(fmt->color.underline.g),
-           &(fmt->color.underline.b), &(fmt->color.underline.a));
-   else if (cmd == underline2_colorstr)
-     _format_color_parse(tmp_param,
-           &(fmt->color.underline2.r), &(fmt->color.underline2.g),
-           &(fmt->color.underline2.b), &(fmt->color.underline2.a));
-   else if (cmd == underline_dash_colorstr)
-     _format_color_parse(tmp_param,
-           &(fmt->color.underline_dash.r), &(fmt->color.underline_dash.g),
-           &(fmt->color.underline_dash.b), &(fmt->color.underline_dash.a));
-   else if (cmd == outline_colorstr)
-     _format_color_parse(tmp_param,
-           &(fmt->color.outline.r), &(fmt->color.outline.g),
-           &(fmt->color.outline.b), &(fmt->color.outline.a));
-   else if (cmd == shadow_colorstr)
-     _format_color_parse(tmp_param,
-           &(fmt->color.shadow.r), &(fmt->color.shadow.g),
-           &(fmt->color.shadow.b), &(fmt->color.shadow.a));
-   else if (cmd == glow_colorstr)
-     _format_color_parse(tmp_param,
-           &(fmt->color.glow.r), &(fmt->color.glow.g),
-           &(fmt->color.glow.b), &(fmt->color.glow.a));
-   else if (cmd == glow2_colorstr)
-     _format_color_parse(tmp_param,
-           &(fmt->color.glow2.r), &(fmt->color.glow2.g),
-           &(fmt->color.glow2.b), &(fmt->color.glow2.a));
-   else if (cmd == backing_colorstr)
-     _format_color_parse(tmp_param,
-           &(fmt->color.backing.r), &(fmt->color.backing.g),
-           &(fmt->color.backing.b), &(fmt->color.backing.a));
-   else if (cmd == strikethrough_colorstr)
-     _format_color_parse(tmp_param,
-           &(fmt->color.strikethrough.r), &(fmt->color.strikethrough.g),
-           &(fmt->color.strikethrough.b), &(fmt->color.strikethrough.a));
-   else if (cmd == alignstr)
-     {
-        if (!strcmp(tmp_param, "auto"))
-          {
-             fmt->halign_auto = EINA_TRUE;
-          }
-        else
-          {
-             if (!strcmp(tmp_param, "middle")) fmt->halign = 0.5;
-             else if (!strcmp(tmp_param, "center")) fmt->halign = 0.5;
-             else if (!strcmp(tmp_param, "left")) fmt->halign = 0.0;
-             else if (!strcmp(tmp_param, "right")) fmt->halign = 1.0;
-             else
-               {
-                  char *endptr = NULL;
-                  double val = strtod(tmp_param, &endptr);
-                  if (endptr)
-                    {
-                       while (*endptr && _is_white(*endptr))
-                         endptr++;
-                       if (*endptr == '%')
-                         val /= 100.0;
-                    }
-                  fmt->halign = val;
-                  if (fmt->halign < 0.0) fmt->halign = 0.0;
-                  else if (fmt->halign > 1.0) fmt->halign = 1.0;
-               }
-             fmt->halign_auto = EINA_FALSE;
-          }
-     }
-   else if (cmd == valignstr)
-     {
-        if (!strcmp(tmp_param, "top")) fmt->valign = 0.0;
-        else if (!strcmp(tmp_param, "middle")) fmt->valign = 0.5;
-        else if (!strcmp(tmp_param, "center")) fmt->valign = 0.5;
-        else if (!strcmp(tmp_param, "bottom")) fmt->valign = 1.0;
-        else if (!strcmp(tmp_param, "baseline")) fmt->valign = -1.0;
-        else if (!strcmp(tmp_param, "base")) fmt->valign = -1.0;
-        else
-          {
-             char *endptr = NULL;
-             double val = strtod(tmp_param, &endptr);
-             if (endptr)
-               {
-                  while (*endptr && _is_white(*endptr))
-                    endptr++;
-                  if (*endptr == '%')
-                    val /= 100.0;
-               }
-             fmt->valign = val;
-             if (fmt->valign < 0.0) fmt->valign = 0.0;
-             else if (fmt->valign > 1.0) fmt->valign = 1.0;
-          }
-     }
-   else if (cmd == wrapstr)
-     {
-        if (!strcmp(tmp_param, "word"))
-          {
-             fmt->wrap_word = 1;
-             fmt->wrap_char = fmt->wrap_mixed = 0;
-          }
-        else if (!strcmp(tmp_param, "char"))
-          {
-             fmt->wrap_word = fmt->wrap_mixed = 0;
-             fmt->wrap_char = 1;
-          }
-        else if (!strcmp(tmp_param, "mixed"))
-          {
-             fmt->wrap_word = fmt->wrap_char = 0;
-             fmt->wrap_mixed = 1;
-          }
-        else
-          {
-             fmt->wrap_word = fmt->wrap_mixed = fmt->wrap_char = 0;
-          }
-     }
-   else if (cmd == left_marginstr)
-     {
-        if (!strcmp(tmp_param, "reset"))
-          fmt->margin.l = 0;
-        else
-          {
-             if (tmp_param[0] == '+')
-               fmt->margin.l += atoi(&(tmp_param[1]));
-             else if (tmp_param[0] == '-')
-               fmt->margin.l -= atoi(&(tmp_param[1]));
-             else
-               fmt->margin.l = atoi(tmp_param);
-             if (fmt->margin.l < 0) fmt->margin.l = 0;
-          }
-     }
-   else if (cmd == right_marginstr)
-     {
-        if (!strcmp(tmp_param, "reset"))
-          fmt->margin.r = 0;
-        else
-          {
-             if (tmp_param[0] == '+')
-               fmt->margin.r += atoi(&(tmp_param[1]));
-             else if (tmp_param[0] == '-')
-               fmt->margin.r -= atoi(&(tmp_param[1]));
-             else
-               fmt->margin.r = atoi(tmp_param);
-             if (fmt->margin.r < 0) fmt->margin.r = 0;
-          }
-     }
-   else if (cmd == underlinestr)
-     {
-        if (!strcmp(tmp_param, "off"))
-          {
-             fmt->underline = 0;
-             fmt->underline2 = 0;
-          }
-        else if ((!strcmp(tmp_param, "on")) ||
-              (!strcmp(tmp_param, "single")))
-          {
-             fmt->underline = 1;
-             fmt->underline2 = 0;
-          }
-        else if (!strcmp(tmp_param, "double"))
-          {
-             fmt->underline = 1;
-             fmt->underline2 = 1;
-          }
-        else if (!strcmp(tmp_param, "dashed"))
-          fmt->underline_dash = 1;
-     }
-   else if (cmd == strikethroughstr)
-     {
-        if (!strcmp(tmp_param, "off"))
-          fmt->strikethrough = 0;
-        else if (!strcmp(tmp_param, "on"))
-          fmt->strikethrough = 1;
-     }
-   else if (cmd == backingstr)
-     {
-        if (!strcmp(tmp_param, "off"))
-          fmt->backing = 0;
-        else if (!strcmp(tmp_param, "on"))
-          fmt->backing = 1;
-     }
-   else if (cmd == stylestr)
-     {
-        char *p1, *p2, *p, *pp;
-
-        p1 = alloca(len + 1);
-        *p1 = 0;
-        p2 = alloca(len + 1);
-        *p2 = 0;
-        /* no comma */
-        if (!strstr(tmp_param, ",")) p1 = tmp_param;
-        else
-          {
-             /* split string "str1,str2" into p1 and p2 (if we have more than
-              * 1 str2 eg "str1,str2,str3,str4" then we don't care. p2 just
-              * ends up being the last one as right now it's only valid to have
-              * 1 comma and 2 strings */
-             pp = p1;
-             for (p = tmp_param; *p; p++)
-               {
-                  if (*p == ',')
-                    {
-                       *pp = 0;
-                       pp = p2;
-                       continue;
-                    }
-                  *pp = *p;
-                  pp++;
-               }
-             *pp = 0;
-          }
-        if      (!strcmp(p1, "off"))                 fmt->style = EVAS_TEXT_STYLE_PLAIN;
-        else if (!strcmp(p1, "none"))                fmt->style = EVAS_TEXT_STYLE_PLAIN;
-        else if (!strcmp(p1, "plain"))               fmt->style = EVAS_TEXT_STYLE_PLAIN;
-        else if (!strcmp(p1, "shadow"))              fmt->style = EVAS_TEXT_STYLE_SHADOW;
-        else if (!strcmp(p1, "outline"))             fmt->style = EVAS_TEXT_STYLE_OUTLINE;
-        else if (!strcmp(p1, "soft_outline"))        fmt->style = EVAS_TEXT_STYLE_SOFT_OUTLINE;
-        else if (!strcmp(p1, "outline_shadow"))      fmt->style = EVAS_TEXT_STYLE_OUTLINE_SHADOW;
-        else if (!strcmp(p1, "outline_soft_shadow")) fmt->style = EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW;
-        else if (!strcmp(p1, "glow"))                fmt->style = EVAS_TEXT_STYLE_GLOW;
-        else if (!strcmp(p1, "far_shadow"))          fmt->style = EVAS_TEXT_STYLE_FAR_SHADOW;
-        else if (!strcmp(p1, "soft_shadow"))         fmt->style = EVAS_TEXT_STYLE_SOFT_SHADOW;
-        else if (!strcmp(p1, "far_soft_shadow"))     fmt->style = EVAS_TEXT_STYLE_FAR_SOFT_SHADOW;
-        else                                         fmt->style = EVAS_TEXT_STYLE_PLAIN;
-        
-        if (*p2)
-          {
-             if      (!strcmp(p2, "bottom_right")) EVAS_TEXT_STYLE_SHADOW_DIRECTION_SET(fmt->style, EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_RIGHT);
-             else if (!strcmp(p2, "bottom"))       EVAS_TEXT_STYLE_SHADOW_DIRECTION_SET(fmt->style, EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM);
-             else if (!strcmp(p2, "bottom_left"))  EVAS_TEXT_STYLE_SHADOW_DIRECTION_SET(fmt->style, EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_LEFT);
-             else if (!strcmp(p2, "left"))         EVAS_TEXT_STYLE_SHADOW_DIRECTION_SET(fmt->style, EVAS_TEXT_STYLE_SHADOW_DIRECTION_LEFT);
-             else if (!strcmp(p2, "top_left"))     EVAS_TEXT_STYLE_SHADOW_DIRECTION_SET(fmt->style, EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP_LEFT);
-             else if (!strcmp(p2, "top"))          EVAS_TEXT_STYLE_SHADOW_DIRECTION_SET(fmt->style, EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP);
-             else if (!strcmp(p2, "top_right"))    EVAS_TEXT_STYLE_SHADOW_DIRECTION_SET(fmt->style, EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP_RIGHT);
-             else if (!strcmp(p2, "right"))        EVAS_TEXT_STYLE_SHADOW_DIRECTION_SET(fmt->style, EVAS_TEXT_STYLE_SHADOW_DIRECTION_RIGHT);
-             else                                  EVAS_TEXT_STYLE_SHADOW_DIRECTION_SET(fmt->style, EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_RIGHT);
-          }
-     }
-   else if (cmd == tabstopsstr)
-     {
-        fmt->tabstops = atoi(tmp_param);
-        if (fmt->tabstops < 1) fmt->tabstops = 1;
-     }
-   else if (cmd == linesizestr)
-     {
-        fmt->linesize = atoi(tmp_param);
-        fmt->linerelsize = 0.0;
-     }
-   else if (cmd == linerelsizestr)
-     {
-        char *endptr = NULL;
-        double val = strtod(tmp_param, &endptr);
-        if (endptr)
-          {
-             while (*endptr && _is_white(*endptr))
-               endptr++;
-             if (*endptr == '%')
-               {
-                  fmt->linerelsize = val / 100.0;
-                  fmt->linesize = 0;
-                  if (fmt->linerelsize < 0.0) fmt->linerelsize = 0.0;
-               }
-          }
-     }
-   else if (cmd == linegapstr)
-     {
-        fmt->linegap = atoi(tmp_param);
-        fmt->linerelgap = 0.0;
-     }
-   else if (cmd == linerelgapstr)
-     {
-        char *endptr = NULL;
-        double val = strtod(tmp_param, &endptr);
-        if (endptr)
-          {
-             while (*endptr && _is_white(*endptr))
-               endptr++;
-             if (*endptr == '%')
-               {
-                  fmt->linerelgap = val / 100.0;
-                  fmt->linegap = 0;
-                  if (fmt->linerelgap < 0.0) fmt->linerelgap = 0.0;
-               }
-          }
-     }
-   else if (cmd == itemstr)
-     {
-        // itemstr == replacement object items in textblock - inline imges
-        // for example
-     }
-   else if (cmd == linefillstr)
-     {
-        char *endptr = NULL;
-        double val = strtod(tmp_param, &endptr);
-        if (endptr)
-          {
-             while (*endptr && _is_white(*endptr))
-               endptr++;
-             if (*endptr == '%')
-               {
-                  fmt->linefill = val / 100.0;
-                  if (fmt->linefill < 0.0) fmt->linefill = 0.0;
-               }
-          }
-     }
-   else if (cmd == ellipsisstr)
-     {
-        char *endptr = NULL;
-        fmt->ellipsis = strtod(tmp_param, &endptr);
-        if ((fmt->ellipsis < 0.0) || (fmt->ellipsis > 1.0))
-          fmt->ellipsis = -1.0;
-        else
-          {
-             Evas_Object_Textblock *o;
-             
-             o = (Evas_Object_Textblock *)(obj->object_data);
-             o->have_ellipsis = 1;
-          }
-     }
-   else if (cmd == passwordstr)
-     {
-        if (!strcmp(tmp_param, "off"))
-          fmt->password = 0;
-        else if (!strcmp(tmp_param, "on"))
-          fmt->password = 1;
-     }
-   else if (cmd == underline_dash_widthstr)
-     {
-        fmt->underline_dash_width = atoi(tmp_param);
-        if (fmt->underline_dash_width <= 0) fmt->underline_dash_width = 1;
-     }
-   else if (cmd == underline_dash_gapstr)
-     {
-        fmt->underline_dash_gap = atoi(tmp_param);
-        if (fmt->underline_dash_gap <= 0) fmt->underline_dash_gap = 1;
-     }
-}
-
-/**
- * @internal
- * Returns #EINA_TRUE if the item is a format parameter, #EINA_FALSE otherwise.
- *
- * @param[in] item the item to check - Not NULL.
- */
-static Eina_Bool
-_format_is_param(const char *item)
-{
-   if (strchr(item, '=')) return EINA_TRUE;
-   return EINA_FALSE;
-}
-
-/**
- * @internal
- * Parse the format item and populate key and val with the stringshares that
- * corrospond to the formats parsed.
- * It expects item to be of the structure:
- * "key=val"
- *
- * @param[in] item the item to parse - Not NULL.
- * @param[out] key where to store the key at - Not NULL.
- * @param[out] val where to store the value at - Not NULL.
- */
-static void
-_format_param_parse(const char *item, const char **key, const char **val)
-{
-   const char *start, *end, *quote;
-
-   start = strchr(item, '=');
-   *key = eina_stringshare_add_length(item, start - item);
-   start++; /* Advance after the '=' */
-   /* If we can find a quote, our new delimiter is a quote, not a space. */
-   if ((quote = strchr(start, '\'')))
-     {
-        start = quote + 1;
-        end = strchr(start, '\'');
-     }
-   else
-     {
-        end = strchr(start, ' ');
-     }
-
-   /* Null terminate before the spaces */
-   if (end)
-     {
-        *val = eina_stringshare_add_length(start, end - start);
-     }
-   else
-     {
-        *val = eina_stringshare_add(start);
-     }
-}
-
-/**
- * @internal
- * This function parses the format passed in *s and advances s to point to the
- * next format item, while returning the current one as the return value.
- * @param s The current and returned position in the format string.
- * @return the current item parsed from the string.
- */
-static const char *
-_format_parse(const char **s)
-{
-   const char *p;
-   const char *s1 = NULL, *s2 = NULL;
-   Eina_Bool quote = EINA_FALSE;;
-
-   p = *s;
-   if (*p == 0) return NULL;
-   for (;;)
-     {
-        if (!s1)
-          {
-             if (*p != ' ') s1 = p;
-             if (*p == 0) break;
-          }
-        else if (!s2)
-          {
-             if (*p == '\'')
-               {
-                  quote = !quote;
-               }
-
-             if ((p > *s) && (p[-1] != '\\') && (!quote))
-               {
-                  if (*p == ' ') s2 = p;
-               }
-             if (*p == 0) s2 = p;
-          }
-        p++;
-        if (s1 && s2)
-          {
-             *s = s2;
-             return s1;
-          }
-     }
-   *s = p;
-   return NULL;
-}
-
-/**
- * @internal
- * Parse the format str and populate fmt with the formats found.
- *
- * @param obj The evas object - Not NULL.
- * @param[out] fmt The format to populate - Not NULL.
- * @param[in] str the string to parse.- Not NULL.
- */
-static void
-_format_fill(Evas_Object *obj, Evas_Object_Textblock_Format *fmt, const char *str)
-{
-   const char *s;
-   const char *item;
-
-   s = str;
-
-   /* get rid of any spaces at the start of the string */
-   while (*s == ' ') s++;
-
-   while ((item = _format_parse(&s)))
-     {
-        if (_format_is_param(item))
-          {
-             const char *key = NULL, *val = NULL;
-
-             _format_param_parse(item, &key, &val);
-             _format_command(obj, fmt, key, val);
-             eina_stringshare_del(key);
-             eina_stringshare_del(val);
-          }
-        else
-          {
-             /* immediate - not handled here */
-          }
-     }
-}
-
-/**
- * @internal
- * Duplicate a format and return the duplicate.
- *
- * @param obj The evas object - Not NULL.
- * @param[in] fmt The format to duplicate - Not NULL.
- * @return the copy of the format.
- */
-static Evas_Object_Textblock_Format *
-_format_dup(Evas_Object *obj, const Evas_Object_Textblock_Format *fmt)
-{
-   Evas_Object_Textblock_Format *fmt2;
-
-   fmt2 = calloc(1, sizeof(Evas_Object_Textblock_Format));
-   memcpy(fmt2, fmt, sizeof(Evas_Object_Textblock_Format));
-   fmt2->ref = 1;
-   fmt2->font.fdesc = evas_font_desc_ref(fmt->font.fdesc);
-
-   if (fmt->font.source) fmt2->font.source = eina_stringshare_add(fmt->font.source);
-
-   /* FIXME: just ref the font here... */
-   fmt2->font.font = evas_font_load(obj->layer->evas, fmt2->font.fdesc,
-         fmt2->font.source, (int)(((double) fmt2->font.size) * obj->cur.scale));
-   return fmt2;
-}
-
-
-
-
-/**
- * @internal
- * @typedef Ctxt
- *
- * A pack of information that needed to be passed around in the layout engine,
- * packed for easier access.
- */
-typedef struct _Ctxt Ctxt;
-
-struct _Ctxt
-{
-   Evas_Object *obj;
-   Evas_Object_Textblock *o;
-
-   Evas_Object_Textblock_Paragraph *paragraphs;
-   Evas_Object_Textblock_Paragraph *par;
-   Evas_Object_Textblock_Line *ln;
-
-
-   Eina_List *format_stack;
-   Evas_Object_Textblock_Format *fmt;
-
-   int x, y;
-   int w, h;
-   int wmax, hmax;
-   int maxascent, maxdescent;
-   int marginl, marginr;
-   int line_no;
-   int underline_extend;
-   int have_underline, have_underline2;
-   double align, valign;
-   Eina_Bool align_auto : 1;
-   Eina_Bool width_changed : 1;
-};
-
-static void _layout_text_add_logical_item(Ctxt *c, Evas_Object_Textblock_Text_Item *ti, Eina_List *rel);
-static void _text_item_update_sizes(Ctxt *c, Evas_Object_Textblock_Text_Item *ti);
-static void _layout_do_format(const Evas_Object *obj, Ctxt *c, Evas_Object_Textblock_Format **_fmt, Evas_Object_Textblock_Node_Format *n, int *style_pad_l, int *style_pad_r, int *style_pad_t, int *style_pad_b, Eina_Bool create_item);
-/**
- * @internal
- * Adjust the ascent/descent of the format and context.
- *
- * @param maxascent The ascent to update - Not NUL.
- * @param maxdescent The descent to update - Not NUL.
- * @param fmt The format to adjust - NOT NULL.
- */
-static void
-_layout_format_ascent_descent_adjust(const Evas_Object *obj,
-      Evas_Coord *maxascent, Evas_Coord *maxdescent,
-      Evas_Object_Textblock_Format *fmt)
-{
-   int ascent, descent;
-
-   if (fmt->font.font)
-     {
-        //      ascent = c->ENFN->font_max_ascent_get(c->ENDT, fmt->font.font);
-        //      descent = c->ENFN->font_max_descent_get(c->ENDT, fmt->font.font);
-        ascent = ENFN->font_ascent_get(ENDT, fmt->font.font);
-        descent = ENFN->font_descent_get(ENDT, fmt->font.font);
-        if (fmt->linesize > 0)
-          {
-             if ((ascent + descent) < fmt->linesize)
-               {
-                  ascent = ((fmt->linesize * ascent) / (ascent + descent));
-                  descent = fmt->linesize - ascent;
-               }
-          }
-        else if (fmt->linerelsize > 0.0)
-          {
-             descent = descent * fmt->linerelsize;
-             ascent = ascent * fmt->linerelsize;
-          }
-        descent += fmt->linegap;
-        descent += ((ascent + descent) * fmt->linerelgap);
-        if (*maxascent < ascent) *maxascent = ascent;
-        if (*maxdescent < descent) *maxdescent = descent;
-        if (fmt->linefill > 0.0)
-          {
-             int dh;
-
-             dh = obj->cur.geometry.h - (*maxascent + *maxdescent);
-             if (dh < 0) dh = 0;
-             dh = fmt->linefill * dh;
-             *maxdescent += dh / 2;
-             *maxascent += dh - (dh / 2);
-             // FIXME: set flag that says "if heigh changes - reformat"
-          }
-     }
-}
-
-/**
- * @internal
- * Create a new line using the info from the format and update the format
- * and context.
- *
- * @param c The context to work on - Not NULL.
- * @param fmt The format to use info from - NOT NULL.
- */
-static void
-_layout_line_new(Ctxt *c, Evas_Object_Textblock_Format *fmt)
-{
-   c->ln = calloc(1, sizeof(Evas_Object_Textblock_Line));
-   c->align = fmt->halign;
-   c->align_auto = fmt->halign_auto;
-   c->marginl = fmt->margin.l;
-   c->marginr = fmt->margin.r;
-   c->par->lines = (Evas_Object_Textblock_Line *)eina_inlist_append(EINA_INLIST_GET(c->par->lines), EINA_INLIST_GET(c->ln));
-   c->x = 0;
-   c->maxascent = c->maxdescent = 0;
-   c->ln->line_no = -1;
-   c->ln->par = c->par;
-}
-
-static inline Evas_Object_Textblock_Paragraph *
-_layout_find_paragraph_by_y(Evas_Object_Textblock *o, Evas_Coord y)
-{
-   Evas_Object_Textblock_Paragraph *start, *par;
-   int i;
-
-   start = o->paragraphs;
-
-   for (i = 0 ; i < TEXTBLOCK_PAR_INDEX_SIZE ; i++)
-     {
-        if (!o->par_index[i] || (o->par_index[i]->y > y))
-          {
-             break;
-          }
-        start = o->par_index[i];
-     }
-
-   EINA_INLIST_FOREACH(start, par)
-     {
-        if ((par->y <= y) && (y < par->y + par->h))
-           return par;
-     }
-
-   return NULL;
-}
-
-static inline Evas_Object_Textblock_Paragraph *
-_layout_find_paragraph_by_line_no(Evas_Object_Textblock *o, int line_no)
-{
-   Evas_Object_Textblock_Paragraph *start, *par;
-   int i;
-
-   start = o->paragraphs;
-
-   for (i = 0 ; i < TEXTBLOCK_PAR_INDEX_SIZE ; i++)
-     {
-        if (!o->par_index[i] || (o->par_index[i]->line_no > line_no))
-          {
-             break;
-          }
-        start = o->par_index[i];
-     }
-
-   EINA_INLIST_FOREACH(start, par)
-     {
-        Evas_Object_Textblock_Paragraph *npar =
-           (Evas_Object_Textblock_Paragraph *) EINA_INLIST_GET(par)->next;
-        if ((par->line_no <= line_no) &&
-              (!npar || (line_no < npar->line_no)))
-           return par;
-     }
-
-   return NULL;
-}
-/* End of rbtree index functios */
-
-/**
- * @internal
- * Create a new layout paragraph.
- * If c->par is not NULL, the paragraph is appended/prepended according
- * to the append parameter. If it is NULL, the paragraph is appended at
- * the end of the list.
- *
- * @param c The context to work on - Not NULL.
- * @param n the associated text node
- * @param append true to append, false to prpend.
- */
-static void
-_layout_paragraph_new(Ctxt *c, Evas_Object_Textblock_Node_Text *n,
-      Eina_Bool append)
-{
-   Evas_Object_Textblock_Paragraph *rel_par = c->par;
-   c->par = calloc(1, sizeof(Evas_Object_Textblock_Paragraph));
-   if (append || !rel_par)
-      c->paragraphs = (Evas_Object_Textblock_Paragraph *)
-         eina_inlist_append_relative(EINA_INLIST_GET(c->paragraphs),
-               EINA_INLIST_GET(c->par),
-               EINA_INLIST_GET(rel_par));
-   else
-      c->paragraphs = (Evas_Object_Textblock_Paragraph *)
-         eina_inlist_prepend_relative(EINA_INLIST_GET(c->paragraphs),
-               EINA_INLIST_GET(c->par),
-               EINA_INLIST_GET(rel_par));
-
-   c->ln = NULL;
-   c->par->text_node = n;
-   if (n)
-      n->par = c->par;
-   c->par->line_no = -1;
-   c->par->visible = 1;
-   c->o->num_paragraphs++;
-}
-
-#ifdef BIDI_SUPPORT
-/**
- * @internal
- * Update bidi paragraph props.
- *
- * @param par The paragraph to update
- */
-static inline void
-_layout_update_bidi_props(const Evas_Object_Textblock *o,
-      Evas_Object_Textblock_Paragraph *par)
-{
-   if (par->text_node)
-     {
-        const Eina_Unicode *text;
-        int *segment_idxs = NULL;
-        text = eina_ustrbuf_string_get(par->text_node->unicode);
-
-        if (o->bidi_delimiters)
-           segment_idxs = evas_bidi_segment_idxs_get(text, o->bidi_delimiters);
-
-        evas_bidi_paragraph_props_unref(par->bidi_props);
-        par->bidi_props = evas_bidi_paragraph_props_get(text,
-              eina_ustrbuf_length_get(par->text_node->unicode),
-              segment_idxs);
-        par->direction = EVAS_BIDI_PARAGRAPH_DIRECTION_IS_RTL(par->bidi_props) ?
-           EVAS_BIDI_DIRECTION_RTL : EVAS_BIDI_DIRECTION_LTR;
-        par->is_bidi = !!par->bidi_props;
-        if (segment_idxs) free(segment_idxs);
-     }
-}
-#endif
-
-
-/**
- * @internal
- * Free the visual lines in the paragraph (logical items are kept)
- */
-static void
-_paragraph_clear(const Evas_Object *obj __UNUSED__,
-      Evas_Object_Textblock_Paragraph *par)
-{
-   while (par->lines)
-     {
-        Evas_Object_Textblock_Line *ln;
-
-        ln = (Evas_Object_Textblock_Line *) par->lines;
-        par->lines = (Evas_Object_Textblock_Line *)eina_inlist_remove(EINA_INLIST_GET(par->lines), EINA_INLIST_GET(par->lines));
-        _line_free(ln);
-     }
-}
-
-/**
- * @internal
- * Free the layout paragraph and all of it's lines and logical items.
- */
-static void
-_paragraph_free(const Evas_Object *obj, Evas_Object_Textblock_Paragraph *par)
-{
-   Evas_Object_Textblock *o;
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   _paragraph_clear(obj, par);
-
-     {
-        Eina_List *i, *i_prev;
-        Evas_Object_Textblock_Item *it;
-        EINA_LIST_FOREACH_SAFE(par->logical_items, i, i_prev, it)
-          {
-             _item_free(obj, NULL, it);
-          }
-        eina_list_free(par->logical_items);
-     }
-#ifdef BIDI_SUPPORT
-   if (par->bidi_props)
-      evas_bidi_paragraph_props_unref(par->bidi_props);
-#endif
-   /* If we are the active par of the text node, set to NULL */
-   if (par->text_node && (par->text_node->par == par))
-      par->text_node->par = NULL;
-
-   o->num_paragraphs--;
-
-   free(par);
-}
-
-/**
- * @internal
- * Clear all the paragraphs from the inlist pars.
- *
- * @param obj the evas object - Not NULL.
- * @param pars the paragraphs to clean - Not NULL.
- */
-static void
-_paragraphs_clear(const Evas_Object *obj, Evas_Object_Textblock_Paragraph *pars)
-{
-   Evas_Object_Textblock_Paragraph *par;
-
-   EINA_INLIST_FOREACH(EINA_INLIST_GET(pars), par)
-     {
-        _paragraph_clear(obj, par);
-     }
-}
-
-/**
- * @internal
- * Free the paragraphs from the inlist pars, the difference between this and
- * _paragraphs_clear is that the latter keeps the logical items and the par
- * items, while the former frees them as well.
- *
- * @param obj the evas object - Not NULL.
- * @param pars the paragraphs to clean - Not NULL.
- */
-static void
-_paragraphs_free(const Evas_Object *obj, Evas_Object_Textblock_Paragraph *pars)
-{
-   Evas_Object_Textblock *o;
-   o = (Evas_Object_Textblock *)(obj->object_data);
-
-   o->num_paragraphs = 0;
-
-   while (pars)
-     {
-        Evas_Object_Textblock_Paragraph *par;
-
-        par = (Evas_Object_Textblock_Paragraph *) pars;
-        pars = (Evas_Object_Textblock_Paragraph *)eina_inlist_remove(EINA_INLIST_GET(pars), EINA_INLIST_GET(par));
-        _paragraph_free(obj, par);
-     }
-}
-
-/**
- * @internal
- * Push fmt to the format stack, if fmt is NULL, will fush a default item.
- *
- * @param c the context to work on - Not NULL.
- * @param fmt the format to push.
- * @see _layout_format_pop()
- */
-static Evas_Object_Textblock_Format *
-_layout_format_push(Ctxt *c, Evas_Object_Textblock_Format *fmt,
-      Evas_Object_Textblock_Node_Format *fnode)
-{
-   if (fmt)
-     {
-        fmt = _format_dup(c->obj, fmt);
-        c->format_stack  = eina_list_prepend(c->format_stack, fmt);
-        fmt->fnode = fnode;
-     }
-   else
-     {
-        fmt = calloc(1, sizeof(Evas_Object_Textblock_Format));
-        c->format_stack  = eina_list_prepend(c->format_stack, fmt);
-        fmt->ref = 1;
-        fmt->halign = 0.0;
-        fmt->halign_auto = EINA_TRUE;
-        fmt->valign = -1.0;
-        fmt->style = EVAS_TEXT_STYLE_PLAIN;
-        fmt->tabstops = 32;
-        fmt->linesize = 0;
-        fmt->linerelsize = 0.0;
-        fmt->linegap = 0;
-        fmt->underline_dash_width = 6;
-        fmt->underline_dash_gap = 2;
-        fmt->linerelgap = 0.0;
-        fmt->password = 1;
-     }
-   return fmt;
-}
-
-/**
- * @internal
- * Pop fmt to the format stack, if there's something in the stack free fmt
- * and set it to point to the next item instead, else return fmt.
- *
- * @param c the context to work on - Not NULL.
- * @param format - the text of the format to free (assured to start with '-').
- * @return the next format in the stack, or format if there's none.
- * @see _layout_format_push()
- */
-static Evas_Object_Textblock_Format *
-_layout_format_pop(Ctxt *c, const char *format)
-{
-   Evas_Object_Textblock_Format *fmt = eina_list_data_get(c->format_stack);
-
-   if ((c->format_stack) && (c->format_stack->next))
-     {
-        Eina_List *redo_nodes = NULL;
-
-        /* Generic pop, should just pop. */
-        if (((format[0] == ' ') && !format[1]) ||
-              !format[0])
-          {
-             _format_unref_free(c->obj, fmt);
-             c->format_stack =
-                eina_list_remove_list(c->format_stack, c->format_stack);
-          }
-        else
-          {
-             size_t len = strlen(format);
-             Eina_List *i, *i_next;
-             /* Remove only the matching format. */
-             EINA_LIST_FOREACH_SAFE(c->format_stack, i, i_next, fmt)
-               {
-                  /* Stop when we reach the base item */
-                  if (!i_next)
-                     break;
-
-                  c->format_stack =
-                     eina_list_remove_list(c->format_stack, c->format_stack);
-
-                  /* Make sure the ending tag matches the starting tag.
-                   * I.e whole of the ending tag matches the start of the
-                   * starting tag, and the starting tag's next char is either
-                   * NULL or white. Skip the starting '+'. */
-                  if (_FORMAT_IS_CLOSER_OF(
-                           fmt->fnode->orig_format, format, len))
-                    {
-                       _format_unref_free(c->obj, fmt);
-                       break;
-                    }
-                  else
-                    {
-                       redo_nodes = eina_list_prepend(redo_nodes, fmt->fnode);
-                       _format_unref_free(c->obj, fmt);
-                    }
-               }
-          }
-
-        /* Redo all the nodes needed to be redone */
-          {
-             Evas_Object_Textblock_Node_Format *fnode;
-             Eina_List *i, *i_next;
-
-             EINA_LIST_FOREACH_SAFE(redo_nodes, i, i_next, fnode)
-               {
-                  /* FIXME: Actually do something with the new acquired padding,
-                   * the can be different and affect our padding! */
-                  Evas_Coord style_pad_l, style_pad_r, style_pad_t, style_pad_b;
-                  style_pad_l = style_pad_r = style_pad_t = style_pad_b = 0;
-                  redo_nodes = eina_list_remove_list(redo_nodes, i);
-                  fmt = eina_list_data_get(c->format_stack);
-                  _layout_do_format(c->obj, c, &fmt, fnode,
-                        &style_pad_l, &style_pad_r,
-                        &style_pad_t, &style_pad_b, EINA_FALSE);
-               }
-          }
-
-        fmt = eina_list_data_get(c->format_stack);
-     }
-   return fmt;
-}
-
-/**
- * @internal
- * Parse item and fill fmt with the item.
- *
- * @param c the context to work on - Not NULL.
- * @param fmt the format to fill - not null.
- */
-static void
-_layout_format_value_handle(Ctxt *c, Evas_Object_Textblock_Format *fmt, const char *item)
-{
-   const char *key = NULL, *val = NULL;
-
-   _format_param_parse(item, &key, &val);
-   if ((key) && (val)) _format_command(c->obj, fmt, key, val);
-   if (key) eina_stringshare_del(key);
-   if (val) eina_stringshare_del(val);
-   c->align = fmt->halign;
-   c->align_auto = fmt->halign_auto;
-   c->marginl = fmt->margin.l;
-   c->marginr = fmt->margin.r;
-}
-
-#define VSIZE_FULL 0
-#define VSIZE_ASCENT 1
-
-#define SIZE 0
-#define SIZE_ABS 1
-#define SIZE_REL 2
-
-/**
- * @internal
- * Get the current line's alignment from the context.
- *
- * @param c the context to work on - Not NULL.
- */
-static inline double
-_layout_line_align_get(Ctxt *c)
-{
-#ifdef BIDI_SUPPORT
-   if (c->align_auto && c->ln)
-     {
-        if (c->ln->items && c->ln->items->text_node &&
-              (c->ln->par->direction == EVAS_BIDI_DIRECTION_RTL))
-          {
-             /* Align right*/
-             return 1.0;
-          }
-        else
-          {
-             /* Align left */
-             return 0.0;
-          }
-     }
-#endif
-   return c->align;
-}
-
-#ifdef BIDI_SUPPORT
-/**
- * @internal
- * Reorder the items in visual order
- *
- * @param line the line to reorder
- */
-static void
-_layout_line_reorder(Evas_Object_Textblock_Line *line)
-{
-   /*FIXME: do it a bit more efficient - not very efficient ATM. */
-   Evas_Object_Textblock_Item *it;
-   EvasBiDiStrIndex *v_to_l = NULL;
-   Evas_Coord x;
-   size_t start, end;
-   size_t len;
-
-   if (line->items && line->items->text_node &&
-         line->par->bidi_props)
-     {
-        Evas_BiDi_Paragraph_Props *props;
-        props = line->par->bidi_props;
-        start = end = line->items->text_pos;
-
-        /* Find the first and last positions in the line */
-
-        EINA_INLIST_FOREACH(line->items, it)
-          {
-             if (it->text_pos < start)
-               {
-                  start = it->text_pos;
-               }
-             else
-               {
-                  int tlen;
-                  tlen = (it->type == EVAS_TEXTBLOCK_ITEM_TEXT) ?
-                     _ITEM_TEXT(it)->text_props.text_len : 1;
-                  if (it->text_pos + tlen > end)
-                    {
-                       end = it->text_pos + tlen;
-                    }
-               }
-          }
-
-        len = end - start;
-        evas_bidi_props_reorder_line(NULL, start, len, props, &v_to_l);
-
-        /* Update visual pos */
-          {
-             Evas_Object_Textblock_Item *i;
-             i = line->items;
-             while (i)
-               {
-                  i->visual_pos = evas_bidi_position_logical_to_visual(
-                        v_to_l, len, i->text_pos - start);
-                  i = (Evas_Object_Textblock_Item *) EINA_INLIST_GET(i)->next;
-               }
-          }
-
-        /*FIXME: not very efficient, sort the items arrays. Anyhow, should only
-         * reorder if it's a bidi paragraph */
-          {
-             Evas_Object_Textblock_Item *i, *j, *min;
-             i = line->items;
-             while (i)
-               {
-                  min = i;
-                  EINA_INLIST_FOREACH(i, j)
-                    {
-                       if (j->visual_pos < min->visual_pos)
-                         {
-                            min = j;
-                         }
-                    }
-                  if (min != i)
-                    {
-                       line->items = (Evas_Object_Textblock_Item *) eina_inlist_remove(EINA_INLIST_GET(line->items), EINA_INLIST_GET(min));
-                       line->items = (Evas_Object_Textblock_Item *) eina_inlist_prepend_relative(EINA_INLIST_GET(line->items), EINA_INLIST_GET(min), EINA_INLIST_GET(i));
-                    }
-
-                  i = (Evas_Object_Textblock_Item *) EINA_INLIST_GET(min)->next;
-               }
-          }
-     }
-
-   if (v_to_l) free(v_to_l);
-   x = 0;
-   EINA_INLIST_FOREACH(line->items, it)
-     {
-        it->x = x;
-        x += it->adv;
-     }
-}
-#endif
-
-/* FIXME: doc */
-static void
-_layout_calculate_format_item_size(const Evas_Object *obj,
-      const Evas_Object_Textblock_Format_Item *fi,
-      Evas_Coord *maxascent, Evas_Coord *maxdescent,
-      Evas_Coord *_y, Evas_Coord *_w, Evas_Coord *_h)
-{
-   /* Adjust sizes according to current line height/scale */
-   Evas_Coord w, h;
-   const char *p, *s;
-
-   s = fi->item;
-   w = fi->parent.w;
-   h = fi->parent.h;
-   switch (fi->size)
-     {
-      case SIZE:
-         p = strstr(s, " size=");
-         if (p)
-           {
-              p += 6;
-              if (sscanf(p, "%ix%i", &w, &h) == 2)
-                {
-                   w = w * obj->cur.scale;
-                   h = h * obj->cur.scale;
-                }
-           }
-         break;
-      case SIZE_REL:
-         p = strstr((char *) s, " relsize=");
-         p += 9;
-         if (sscanf(p, "%ix%i", &w, &h) == 2)
-           {
-              int sz = 1;
-              if (fi->vsize == VSIZE_FULL)
-                {
-                   sz = *maxdescent + *maxascent;
-                }
-              else if (fi->vsize == VSIZE_ASCENT)
-                {
-                   sz = *maxascent;
-                }
-              w = (w * sz) / h;
-              h = sz;
-           }
-         break;
-      case SIZE_ABS:
-         /* Nothing to do */
-      default:
-         break;
-     }
-
-   switch (fi->size)
-     {
-      case SIZE:
-      case SIZE_ABS:
-         switch (fi->vsize)
-           {
-            case VSIZE_FULL:
-               if (h > (*maxdescent + *maxascent))
-                 {
-                    *maxascent += h - (*maxdescent + *maxascent);
-                    *_y = -*maxascent;
-                 }
-               else
-                  *_y = -(h - *maxdescent);
-               break;
-            case VSIZE_ASCENT:
-               if (h > *maxascent)
-                 {
-                    *maxascent = h;
-                    *_y = -h;
-                 }
-               else
-                  *_y = -h;
-               break;
-            default:
-               break;
-           }
-         break;
-      case SIZE_REL:
-         switch (fi->vsize)
-           {
-            case VSIZE_FULL:
-            case VSIZE_ASCENT:
-               *_y = -*maxascent;
-               break;
-            default:
-               break;
-           }
-         break;
-      default:
-         break;
-     }
-
-   *_w = w;
-   *_h = h;
-}
-
-/**
- * @internal
- * Order the items in the line, update it's properties and update it's
- * corresponding paragraph.
- *
- * @param c the context to work on - Not NULL.
- * @param fmt the format to use.
- * @param add_line true if we should create a line, false otherwise.
- */
-static void
-_layout_line_finalize(Ctxt *c, Evas_Object_Textblock_Format *fmt)
-{
-   Evas_Object_Textblock_Item *it;
-   Evas_Coord x = 0;
-
-   /* If there are no text items yet, calc ascent/descent
-    * according to the current format. */
-   if (c->maxascent + c->maxdescent == 0)
-      _layout_format_ascent_descent_adjust(c->obj, &c->maxascent,
-            &c->maxdescent, fmt);
-
-   /* Adjust all the item sizes according to the final line size,
-    * and update the x positions of all the items of the line. */
-   EINA_INLIST_FOREACH(c->ln->items, it)
-     {
-        if (it->type == EVAS_TEXTBLOCK_ITEM_FORMAT)
-          {
-             Evas_Object_Textblock_Format_Item *fi = _ITEM_FORMAT(it);
-             if (!fi->formatme) goto loop_advance;
-             _layout_calculate_format_item_size(c->obj, fi, &c->maxascent,
-                   &c->maxdescent, &fi->y, &fi->parent.w, &fi->parent.h);
-             fi->parent.adv = fi->parent.w;
-          }
-
-loop_advance:
-        it->x = x;
-        x += it->adv;
-
-        if ((it->x + it->adv) > c->ln->w) c->ln->w = it->x + it->adv;
-     }
-
-   c->ln->y = (c->y - c->par->y) + c->o->style_pad.t;
-   c->ln->h = c->maxascent + c->maxdescent;
-   c->ln->baseline = c->maxascent;
-   if (c->have_underline2)
-     {
-        if (c->maxdescent < 4) c->underline_extend = 4 - c->maxdescent;
-     }
-   else if (c->have_underline)
-     {
-        if (c->maxdescent < 2) c->underline_extend = 2 - c->maxdescent;
-     }
-   c->ln->line_no = c->line_no - c->ln->par->line_no;
-   c->line_no++;
-   c->y += c->maxascent + c->maxdescent;
-   if (c->w >= 0)
-     {
-        c->ln->x = c->marginl + c->o->style_pad.l +
-           ((c->w - c->ln->w -
-             c->o->style_pad.l - c->o->style_pad.r -
-             c->marginl - c->marginr) * _layout_line_align_get(c));
-     }
-   else
-     {
-        c->ln->x = c->marginl + c->o->style_pad.l;
-     }
-
-   c->par->h = c->ln->y + c->ln->h;
-   if (c->ln->w > c->par->w)
-     c->par->w = c->ln->w;
-
-     {
-        Evas_Coord new_wmax = c->ln->w +
-           c->marginl + c->marginr - (c->o->style_pad.l + c->o->style_pad.r);
-        if (new_wmax > c->wmax)
-           c->wmax = new_wmax;
-     }
-}
-
-/**
- * @internal
- * Create a new line and append it to the lines in the context.
- *
- * @param c the context to work on - Not NULL.
- * @param fmt the format to use.
- * @param add_line true if we should create a line, false otherwise.
- */
-static void
-_layout_line_advance(Ctxt *c, Evas_Object_Textblock_Format *fmt)
-{
-   _layout_line_finalize(c, fmt);
-   _layout_line_new(c, fmt);
-}
-
-/**
- * @internal
- * Create a new text layout item from the string and the format.
- *
- * @param c the context to work on - Not NULL.
- * @param fmt the format to use.
- * @param str the string to use.
- * @param len the length of the string.
- */
-static Evas_Object_Textblock_Text_Item *
-_layout_text_item_new(Ctxt *c __UNUSED__, Evas_Object_Textblock_Format *fmt)
-{
-   Evas_Object_Textblock_Text_Item *ti;
-
-   ti = calloc(1, sizeof(Evas_Object_Textblock_Text_Item));
-   ti->parent.format = fmt;
-   ti->parent.format->ref++;
-   ti->parent.type = EVAS_TEXTBLOCK_ITEM_TEXT;
-   return ti;
-}
-
-/**
- * @internal
- * Return the cutoff of the text in the text item.
- *
- * @param c the context to work on - Not NULL.
- * @param fmt the format to use. - Not NULL.
- * @param it the item to check - Not null.
- * @return -1 if there is no cutoff (either because there is really none,
- * or because of an error), cutoff index on success.
- */
-static int
-_layout_text_cutoff_get(Ctxt *c, Evas_Object_Textblock_Format *fmt,
-      const Evas_Object_Textblock_Text_Item *ti)
-{
-   if (fmt->font.font)
-     {
-        Evas_Coord x;
-        x = c->w - c->o->style_pad.l - c->o->style_pad.r - c->marginl -
-           c->marginr - c->x - ti->x_adjustment;
-        if (x < 0)
-          x = 0;
-        return c->ENFN->font_last_up_to_pos(c->ENDT, fmt->font.font,
-              &ti->text_props, x, 0);
-     }
-   return -1;
-}
-
-/**
- * @internal
- * Split before cut, and strip if str[cut - 1] is a whitespace.
- *
- * @param c the context to work on - Not NULL.
- * @param ti the item to cut - not null.
- * @param lti the logical list item of the item.
- * @param cut the cut index.
- * @return the second (newly created) item.
- */
-static Evas_Object_Textblock_Text_Item *
-_layout_item_text_split_strip_white(Ctxt *c,
-      Evas_Object_Textblock_Text_Item *ti, Eina_List *lti, size_t cut)
-{
-   const Eina_Unicode *ts;
-   Evas_Object_Textblock_Text_Item *new_ti = NULL, *white_ti = NULL;
-
-   ts = GET_ITEM_TEXT(ti);
-
-   if (!IS_AT_END(ti, cut) && (ti->text_props.text_len > 0))
-     {
-        new_ti = _layout_text_item_new(c, ti->parent.format);
-        new_ti->parent.text_node = ti->parent.text_node;
-        new_ti->parent.text_pos = ti->parent.text_pos + cut;
-        new_ti->parent.merge = EINA_TRUE;
-
-        evas_common_text_props_split(&ti->text_props,
-                                     &new_ti->text_props, cut);
-        _layout_text_add_logical_item(c, new_ti, lti);
-     }
-
-   /* Strip the previous white if needed */
-   if ((cut >= 1) && _is_white(ts[cut - 1]) && (ti->text_props.text_len > 0))
-     {
-        if (cut - 1 > 0)
-          {
-             size_t white_cut = cut - 1;
-             white_ti = _layout_text_item_new(c, ti->parent.format);
-             white_ti->parent.text_node = ti->parent.text_node;
-             white_ti->parent.text_pos = ti->parent.text_pos + white_cut;
-             white_ti->parent.merge = EINA_TRUE;
-             white_ti->parent.visually_deleted = EINA_TRUE;
-
-             evas_common_text_props_split(&ti->text_props,
-                   &white_ti->text_props, white_cut);
-             _layout_text_add_logical_item(c, white_ti, lti);
-          }
-        else
-          {
-             /* Mark this one as the visually deleted. */
-             ti->parent.visually_deleted = EINA_TRUE;
-          }
-     }
-
-   if (new_ti || white_ti)
-     {
-        _text_item_update_sizes(c, ti);
-     }
-   return new_ti;
-}
-
-/**
- * @internal
- * Merge item2 into item1 and free item2.
- *
- * @param c the context to work on - Not NULL.
- * @param item1 the item to copy to
- * @param item2 the item to copy from
- */
-static void
-_layout_item_merge_and_free(Ctxt *c,
-      Evas_Object_Textblock_Text_Item *item1,
-      Evas_Object_Textblock_Text_Item *item2)
-{
-   evas_common_text_props_merge(&item1->text_props,
-         &item2->text_props);
-
-   _text_item_update_sizes(c, item1);
-
-   item1->parent.merge = EINA_FALSE;
-   item1->parent.visually_deleted = EINA_FALSE;
-
-   _item_free(c->obj, NULL, _ITEM(item2));
-}
-
-/**
- * @internal
- * Calculates an item's size.
- *
- * @param c the context
- * @param it the item itself.
- */
-static void
-_text_item_update_sizes(Ctxt *c, Evas_Object_Textblock_Text_Item *ti)
-{
-   int tw, th, inset, advw;
-   const Evas_Object_Textblock_Format *fmt = ti->parent.format;
-   int shad_sz = 0, shad_dst = 0, out_sz = 0;
-   int dx = 0, minx = 0, maxx = 0, shx1, shx2;
-
-   tw = th = 0;
-   if (fmt->font.font)
-     c->ENFN->font_string_size_get(c->ENDT, fmt->font.font,
-           &ti->text_props, &tw, &th);
-   inset = 0;
-   if (fmt->font.font)
-     inset = c->ENFN->font_inset_get(c->ENDT, fmt->font.font,
-           &ti->text_props);
-   advw = 0;
-   if (fmt->font.font)
-      advw = c->ENFN->font_h_advance_get(c->ENDT, fmt->font.font,
-           &ti->text_props);
-
-
-   /* These adjustments are calculated and thus heavily linked to those in
-    * textblock_render!!! Don't change one without the other. */
-
-   switch (ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC)
-     {
-      case EVAS_TEXT_STYLE_SHADOW:
-        shad_dst = 1;
-        break;
-      case EVAS_TEXT_STYLE_OUTLINE_SHADOW:
-      case EVAS_TEXT_STYLE_FAR_SHADOW:
-        shad_dst = 2;
-        out_sz = 1;
-        break;
-      case EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW:
-        shad_dst = 1;
-        shad_sz = 2;
-        out_sz = 1;
-        break;
-      case EVAS_TEXT_STYLE_FAR_SOFT_SHADOW:
-        shad_dst = 2;
-        shad_sz = 2;
-        break;
-      case EVAS_TEXT_STYLE_SOFT_SHADOW:
-        shad_dst = 1;
-        shad_sz = 2;
-        break;
-      case EVAS_TEXT_STYLE_GLOW:
-      case EVAS_TEXT_STYLE_SOFT_OUTLINE:
-        out_sz = 2;
-        break;
-      case EVAS_TEXT_STYLE_OUTLINE:
-        out_sz = 1;
-        break;
-      default:
-        break;
-     }
-   switch (ti->parent.format->style & EVAS_TEXT_STYLE_MASK_SHADOW_DIRECTION)
-     {
-      case EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_LEFT:
-      case EVAS_TEXT_STYLE_SHADOW_DIRECTION_LEFT:
-      case EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP_LEFT:
-        dx = -1;
-        break;
-      case EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_RIGHT:
-      case EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP_RIGHT:
-      case EVAS_TEXT_STYLE_SHADOW_DIRECTION_RIGHT:
-        dx = 1;
-      case EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP:
-      case EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM:
-      default:
-        dx = 0;
-        break;
-     }
-   minx = -out_sz;
-   maxx = out_sz;
-   shx1 = dx * shad_dst;
-   shx1 -= shad_sz;
-   shx2 = dx * shad_dst;
-   shx2 += shad_sz;
-   if (shx1 < minx) minx = shx1;
-   if (shx2 > maxx) maxx = shx2;
-   inset += -minx;
-   ti->x_adjustment = maxx - minx;
-   
-   ti->inset = inset;
-   ti->parent.w = tw + ti->x_adjustment;
-   ti->parent.h = th;
-   ti->parent.adv = advw;
-   ti->parent.x = 0;
-}
-
-/**
- * @internal
- * Adds the item to the list, updates the item's properties (e.g, x,w,h)
- *
- * @param c the context
- * @param it the item itself.
- * @param rel item ti will be appened after, NULL = last.
- */
-static void
-_layout_text_add_logical_item(Ctxt *c, Evas_Object_Textblock_Text_Item *ti,
-      Eina_List *rel)
-{
-   _text_item_update_sizes(c, ti);
-
-   c->par->logical_items = eina_list_append_relative_list(
-         c->par->logical_items, ti, rel);
-}
-
-/**
- * @internal
- * Appends the text from node n starting at start ending at off to the layout.
- * It uses the fmt for the formatting.
- *
- * @param c the current context- NOT NULL.
- * @param fmt the format to use.
- * @param n the text node. - Not null.
- * @param start the start position. - in range.
- * @param off the offset - start + offset in range. if offset is -1, it'll add everything to the end of the string if offset = 0 it'll return with doing nothing.
- * @param repch a replacement char to print instead of the original string, for example, * when working with passwords.
- */
-static void
-_layout_text_append(Ctxt *c, Evas_Object_Textblock_Format *fmt, Evas_Object_Textblock_Node_Text *n, int start, int off, const char *repch)
-{
-   const Eina_Unicode *str = EINA_UNICODE_EMPTY_STRING;
-   const Eina_Unicode *tbase;
-   Evas_Object_Textblock_Text_Item *ti;
-   size_t cur_len = 0;
-   Eina_Unicode urepch = 0;
-
-   /* prepare a working copy of the string, either filled by the repch or
-    * filled with the true values */
-   if (n)
-     {
-        int len;
-        int orig_off = off;
-
-        /* Figure out if we want to bail, work with an empty string,
-         * or continue with a slice of the passed string */
-        len = eina_ustrbuf_length_get(n->unicode);
-        if (off == 0) return;
-        else if (off < 0) off = len - start;
-
-        if (start < 0)
-          {
-             start = 0;
-          }
-        else if ((start == 0) && (off == 0) && (orig_off == -1))
-          {
-             /* Special case that means that we need to add an empty
-              * item */
-             str = EINA_UNICODE_EMPTY_STRING;
-             goto skip;
-          }
-        else if ((start >= len) || (start + off > len))
-          {
-             return;
-          }
-
-        /* If we work with a replacement char, create a string which is the same
-         * but with replacement chars instead of regular chars. */
-        if ((fmt->password) && (repch) && (eina_ustrbuf_length_get(n->unicode)))
-          {
-             int i, ind;
-             Eina_Unicode *ptr;
-
-             tbase = str = ptr = alloca((off + 1) * sizeof(Eina_Unicode));
-             ind = 0;
-             urepch = eina_unicode_utf8_get_next(repch, &ind);
-             for (i = 0 ; i < off; ptr++, i++)
-               *ptr = urepch;
-             *ptr = 0;
-          }
-        /* Use the string, just cut the relevant parts */
-        else
-          {
-             str = eina_ustrbuf_string_get(n->unicode) + start;
-          }
-
-        cur_len = off;
-     }
-
-skip:
-   tbase = str;
-
-   /* If there's no parent text node, only create an empty item */
-   if (!n)
-     {
-        ti = _layout_text_item_new(c, fmt);
-        ti->parent.text_node = NULL;
-        ti->parent.text_pos = 0;
-        _layout_text_add_logical_item(c, ti, NULL);
-
-        return;
-     }
-
-   while (cur_len > 0)
-     {
-        Evas_Font_Instance *script_fi = NULL;
-        int script_len, tmp_cut;
-        Evas_Script_Type script;
-
-        script_len = cur_len;
-
-        tmp_cut = evas_common_language_script_end_of_run_get(str,
-              c->par->bidi_props, start + str - tbase, script_len);
-        if (tmp_cut > 0)
-          {
-             script_len = tmp_cut;
-          }
-        cur_len -= script_len;
-
-        script = evas_common_language_script_type_get(str, script_len);
-
-
-        while (script_len > 0)
-          {
-             Evas_Font_Instance *cur_fi = NULL;
-             int run_len = script_len;
-             ti = _layout_text_item_new(c, fmt);
-             ti->parent.text_node = n;
-             ti->parent.text_pos = start + str - tbase;
-
-             if (ti->parent.format->font.font)
-               {
-                  run_len = c->ENFN->font_run_end_get(c->ENDT,
-                        ti->parent.format->font.font, &script_fi, &cur_fi,
-                        script, str, script_len);
-               }
-
-             evas_common_text_props_bidi_set(&ti->text_props,
-                   c->par->bidi_props, ti->parent.text_pos);
-             evas_common_text_props_script_set(&ti->text_props, script);
-
-             if (cur_fi)
-               {
-                  c->ENFN->font_text_props_info_create(c->ENDT,
-                        cur_fi, str, &ti->text_props, c->par->bidi_props,
-                        ti->parent.text_pos, run_len);
-               }
-             str += run_len;
-             script_len -= run_len;
-
-             _layout_text_add_logical_item(c, ti, NULL);
-          }
-     }
-}
-
-/**
- * @internal
- * Add a format item from the format node n and the item item.
- *
- * @param c the current context- NOT NULL.
- * @param n the source format node - not null.
- * @param item the format text.
- *
- * @return the new format item.
- */
-static Evas_Object_Textblock_Format_Item *
-_layout_format_item_add(Ctxt *c, Evas_Object_Textblock_Node_Format *n, const char *item, Evas_Object_Textblock_Format *fmt)
-{
-   Evas_Object_Textblock_Format_Item *fi;
-
-   fi = calloc(1, sizeof(Evas_Object_Textblock_Format_Item));
-   fi->item = eina_stringshare_add(item);
-   fi->parent.type = EVAS_TEXTBLOCK_ITEM_FORMAT;
-   fi->parent.format = fmt;
-   fi->parent.format->ref++;
-   c->par->logical_items = eina_list_append(c->par->logical_items, fi);
-   if (n)
-     {
-        fi->parent.text_node = n->text_node;
-        /* FIXME: make it more efficient */
-        fi->parent.text_pos = _evas_textblock_node_format_pos_get(n);
-#ifdef BIDI_SUPPORT
-        fi->bidi_dir = (evas_bidi_is_rtl_char(
-              c->par->bidi_props,
-              0,
-              fi->parent.text_pos)) ?
-           EVAS_BIDI_DIRECTION_RTL : EVAS_BIDI_DIRECTION_LTR;
-#else
-        fi->bidi_dir = EVAS_BIDI_DIRECTION_LTR;
-#endif
-     }
-   return fi;
-}
-
-/**
- * @internal
- * Should be call after we finish filling a format.
- * FIXME: doc.
- */
-static void
-_format_finalize(Evas_Object *obj, Evas_Object_Textblock_Format *fmt)
-{
-   void *of;
-
-   of = fmt->font.font;
-
-   fmt->font.font = evas_font_load(obj->layer->evas, fmt->font.fdesc,
-         fmt->font.source, (int)(((double) fmt->font.size) * obj->cur.scale));
-   if (of) evas_font_free(obj->layer->evas, of);
-}
-
-/**
- * @internal
- * Returns true if the item is a tab
- * @def _IS_TAB(item)
- */
-#define _IS_TAB(item)                                             \
-   (!strcmp(item, "tab") || !strcmp(item, "\t") || !strcmp(item, "\\t"))
-/**
- * @internal
- * Returns true if the item is a line spearator, false otherwise
- * @def _IS_LINE_SEPARATOR(item)
- */
-#define _IS_LINE_SEPARATOR(item)                                             \
-   (!strcmp(item, "br") || !strcmp(item, "\n") || !strcmp(item, "\\n"))
-/**
- * @internal
- * Returns true if the item is a paragraph separator, false otherwise
- * @def _IS_PARAGRAPH_SEPARATOR(item)
- */
-#define _IS_PARAGRAPH_SEPARATOR_SIMPLE(item)                                 \
-   (!strcmp(item, "ps"))
-/**
- * @internal
- * Returns true if the item is a paragraph separator, false otherwise
- * takes legacy mode into account.
- * @def _IS_PARAGRAPH_SEPARATOR(item)
- */
-#define _IS_PARAGRAPH_SEPARATOR(o, item)                                     \
-   (_IS_PARAGRAPH_SEPARATOR_SIMPLE(item) ||                                  \
-    (o->legacy_newline && _IS_LINE_SEPARATOR(item))) /* Paragraph separator */
-
-/**
- * @internal
- * Handles a format by processing a format node. It returns the relevant format
- * through _fmt and updates the padding through style_pad_*. If needed,
- * it creates a format item.
- *
- * @param obj the evas object - NOT NULL.
- * @param c the current context- NOT NULL.
- * @param _fmt the format that holds the result.
- * @param n the source format node - not null.
- * @param style_pad_l the pad to update.
- * @param style_pad_r the pad to update.
- * @param style_pad_t the pad to update.
- * @param style_pad_b the pad to update.
- * @param create_item Create a new format item if true, only process otherwise.
- */
-static void
-_layout_do_format(const Evas_Object *obj __UNUSED__, Ctxt *c,
-      Evas_Object_Textblock_Format **_fmt, Evas_Object_Textblock_Node_Format *n,
-      int *style_pad_l, int *style_pad_r, int *style_pad_t, int *style_pad_b,
-      Eina_Bool create_item)
-{
-   Evas_Object_Textblock_Format *fmt = *_fmt;
-   /* FIXME: comment the algo */
-
-   const char *s;
-   const char *item;
-   int handled = 0;
-
-   s = n->format;
-   if (!strncmp(s, "item ", 5))
-     {
-        // one of:
-        //   item size=20x10 href=name
-        //   item relsize=20x10 href=name
-        //   item abssize=20x10 href=name
-        // 
-        // optional arguments:
-        //   vsize=full
-        //   vsize=ascent
-        // 
-        // size == item size (modifies line size) - can be multiplied by
-        //   scale factor
-        // relsize == relative size (height is current font height, width
-        //   modified accordingly keeping aspect)
-        // abssize == absolute size (modifies line size) - never mulitplied by
-        //   scale factor
-        // href == name of item - to be found and matched later and used for
-        //   positioning
-        Evas_Object_Textblock_Format_Item *fi;
-        int w = 1, h = 1;
-        int vsize = 0, size = 0;
-        char *p;
-
-        // don't care
-        //href = strstr(s, " href=");
-        p = strstr(s, " vsize=");
-        if (p)
-          {
-             p += 7;
-             if (!strncmp(p, "full", 4)) vsize = VSIZE_FULL;
-             else if (!strncmp(p, "ascent", 6)) vsize = VSIZE_ASCENT;
-          }
-        p = strstr(s, " size=");
-        if (p)
-          {
-             p += 6;
-             if (sscanf(p, "%ix%i", &w, &h) == 2)
-               {
-                  /* this is handled somewhere else because it depends
-                   * on the current scaling factor of the object which
-                   * may change and break because the results of this
-                   * function are cached */
-                  size = SIZE;
-               }
-          }
-        else
-          {
-             p = strstr(s, " absize=");
-             if (p)
-               {
-                  p += 8;
-                  if (sscanf(p, "%ix%i", &w, &h) == 2)
-                    {
-                       size = SIZE_ABS;
-                    }
-               }
-             else
-               {
-                  p = strstr(s, " relsize=");
-                  if (p)
-                    {
-                       /* this is handled somewhere else because it depends
-                        * on the line it resides in, which is not defined
-                        * at this point and will change anyway, which will
-                        * break because the results of this function are
-                        * cached */
-                       size = SIZE_REL;
-                    }
-               }
-          }
-
-        if (create_item)
-          {
-             fi = _layout_format_item_add(c, n, s, fmt);
-             fi->vsize = vsize;
-             fi->size = size;
-             fi->formatme = 1;
-             /* For formats items it's usually
-                the same, we don't handle the
-                special cases yet. */
-             fi->parent.w = fi->parent.adv = w;
-             fi->parent.h = h;
-          }
-        /* Not sure if it's the best handling, but will do it for now. */
-        fmt = _layout_format_push(c, fmt, n);
-        handled = 1;
-     }
-
-   if (!handled)
-     {
-        Eina_Bool push_fmt = EINA_FALSE;
-        if (n->opener && !n->own_closer)
-          {
-             fmt = _layout_format_push(c, fmt, n);
-             push_fmt = EINA_TRUE;
-          }
-        else if (!n->opener)
-          {
-             fmt = _layout_format_pop(c, n->orig_format);
-          }
-        while ((item = _format_parse(&s)))
-          {
-             if (_format_is_param(item))
-               {
-                  /* Only handle it if it's a push format, otherwise,
-                   * don't let overwrite the format stack.. */
-                  if (push_fmt)
-                    {
-                       _layout_format_value_handle(c, fmt, item);
-                    }
-               }
-             else if (create_item)
-               {
-                  if ((_IS_PARAGRAPH_SEPARATOR(c->o, item)) ||
-                        (_IS_LINE_SEPARATOR(item)))
-                    {
-                       Evas_Object_Textblock_Format_Item *fi;
-
-                       fi = _layout_format_item_add(c, n, item, fmt);
-
-                       fi->parent.w = fi->parent.adv = 0;
-                    }
-                  else if (_IS_TAB(item))
-                    {
-                       Evas_Object_Textblock_Format_Item *fi;
-
-                       fi = _layout_format_item_add(c, n, item, fmt);
-                       fi->parent.w = fi->parent.adv = fmt->tabstops;
-                       fi->formatme = 1;
-                    }
-               }
-          }
-        _format_finalize(c->obj, fmt);
-     }
-
-     {
-        Evas_Coord pad_l, pad_r, pad_t, pad_b;
-        pad_l = pad_r = pad_t = pad_b = 0;
-        evas_text_style_pad_get(fmt->style, &pad_l, &pad_r, &pad_t, &pad_b);
-        if (pad_l > *style_pad_l) *style_pad_l = pad_l;
-        if (pad_r > *style_pad_r) *style_pad_r = pad_r;
-        if (pad_t > *style_pad_t) *style_pad_t = pad_t;
-        if (pad_b > *style_pad_b) *style_pad_b = pad_b;
-     }
-
-   if (fmt->underline2)
-     c->have_underline2 = 1;
-   else if (fmt->underline || fmt->underline_dash)
-     c->have_underline = 1;
-   *_fmt = fmt;
-}
-
-static void
-_layout_update_par(Ctxt *c)
-{
-   Evas_Object_Textblock_Paragraph *last_par;
-   last_par = (Evas_Object_Textblock_Paragraph *)
-      EINA_INLIST_GET(c->par)->prev;
-   if (last_par)
-     {
-        c->par->y = last_par->y + last_par->h;
-     }
-   else
-     {
-        c->par->y = 0;
-     }
-}
-
-/* -1 means no wrap */
-static int
-_layout_get_charwrap(Ctxt *c, Evas_Object_Textblock_Format *fmt,
-      const Evas_Object_Textblock_Item *it, size_t line_start,
-      const char *breaks)
-{
-   int wrap;
-   size_t uwrap;
-   size_t len = eina_ustrbuf_length_get(it->text_node->unicode);
-   /* Currently not being used, because it doesn't contain relevant
-    * information */
-   (void) breaks;
-
-     {
-        if (it->type == EVAS_TEXTBLOCK_ITEM_FORMAT)
-           wrap = 0;
-        else
-           wrap = _layout_text_cutoff_get(c, fmt, _ITEM_TEXT(it));
-
-        if (wrap < 0)
-           return -1;
-        uwrap = (size_t) wrap + it->text_pos;
-     }
-
-
-   if ((uwrap == line_start) && (it->type == EVAS_TEXTBLOCK_ITEM_TEXT))
-     {
-        uwrap = it->text_pos +
-           (size_t) evas_common_text_props_cluster_next(
-                 &_ITEM_TEXT(it)->text_props, wrap);
-     }
-   if ((uwrap <= line_start) || (uwrap > len))
-      return -1;
-
-   return uwrap;
-}
-
-/* -1 means no wrap */
-#ifdef HAVE_LINEBREAK
-
-/* Allow break means: if we can break after the current char */
-#define ALLOW_BREAK(i) \
-   (breaks[i] <= LINEBREAK_ALLOWBREAK)
-
-#else
-
-#define ALLOW_BREAK(i) \
-   (_is_white(str[i]))
-
-#endif
-static int
-_layout_get_word_mixwrap_common(Ctxt *c, Evas_Object_Textblock_Format *fmt,
-      const Evas_Object_Textblock_Item *it, Eina_Bool mixed_wrap,
-      size_t line_start, const char *breaks)
-{
-   Eina_Bool wrap_after = EINA_FALSE;
-   size_t wrap;
-   size_t orig_wrap;
-   const Eina_Unicode *str = eina_ustrbuf_string_get(
-         it->text_node->unicode);
-   int item_start = it->text_pos;
-   size_t len = eina_ustrbuf_length_get(it->text_node->unicode);
-#ifndef HAVE_LINEBREAK
-   /* Not used without liblinebreak ATM. */
-   (void) breaks;
-#endif
-
-     {
-        int swrap = -1;
-        if (it->type == EVAS_TEXTBLOCK_ITEM_FORMAT)
-           swrap = 0;
-        else
-           swrap = _layout_text_cutoff_get(c, fmt, _ITEM_TEXT(it));
-        /* Avoiding too small textblocks to even contain one char.
-         * FIXME: This can cause breaking inside ligatures. */
-
-        if (swrap < 0)
-           return -1;
-
-        orig_wrap = wrap = swrap + item_start;
-     }
-
-   if (wrap > line_start)
-     {
-        /* The wrapping point found is the first char of the next string
-           the rest works on the last char of the previous string.
-           If it's a whitespace, then it's ok, and no need to go back
-           because we'll remove it anyway. */
-        if (!_is_white(str[wrap]))
-           MOVE_PREV_UNTIL(line_start, wrap);
-        /* If there's a breakable point inside the text, scan backwards until
-         * we find it */
-        while (wrap > line_start)
-          {
-             if (ALLOW_BREAK(wrap))
-                break;
-             wrap--;
-          }
-
-        if ((wrap > line_start) ||
-              ((wrap == line_start) && (ALLOW_BREAK(wrap)) && (wrap < len)))
-          {
-             /* We found a suitable wrapping point, break here. */
-             MOVE_NEXT_UNTIL(len, wrap);
-             return wrap;
-          }
-        else
-          {
-             if (mixed_wrap)
-               {
-                  return ((orig_wrap >= line_start) && (orig_wrap < len)) ?
-                     ((int) orig_wrap) : -1;
-               }
-             else
-               {
-                  /* Scan forward to find the next wrapping point */
-                  wrap = orig_wrap;
-                  wrap_after = EINA_TRUE;
-               }
-          }
-     }
-
-   /* If we need to find the position after the cutting point */
-   if ((wrap == line_start) || (wrap_after))
-     {
-        if (mixed_wrap)
-          {
-             return _layout_get_charwrap(c, fmt, it,
-                   line_start, breaks);
-          }
-        else
-          {
-             while (wrap < len)
-               {
-                  if (ALLOW_BREAK(wrap))
-                     break;
-                  wrap++;
-               }
-
-
-             if ((wrap < len) && (wrap > line_start))
-               {
-                  MOVE_NEXT_UNTIL(len, wrap);
-                  return wrap;
-               }
-             else
-               {
-                  return -1;
-               }
-          }
-     }
-
-   return -1;
-}
-
-/* -1 means no wrap */
-static int
-_layout_get_wordwrap(Ctxt *c, Evas_Object_Textblock_Format *fmt,
-      const Evas_Object_Textblock_Item *it, size_t line_start,
-      const char *breaks)
-{
-   return _layout_get_word_mixwrap_common(c, fmt, it, EINA_FALSE, line_start,
-         breaks);
-}
-
-/* -1 means no wrap */
-static int
-_layout_get_mixedwrap(Ctxt *c, Evas_Object_Textblock_Format *fmt,
-      const Evas_Object_Textblock_Item *it, size_t line_start,
-      const char *breaks)
-{
-   return _layout_get_word_mixwrap_common(c, fmt, it, EINA_TRUE, line_start,
-         breaks);
-}
-
-/* Should be moved inside _layout_ellipsis_item_new once we fix the hack in
- * textblock render */
-static const Eina_Unicode _ellip_str[2] = { 0x2026, '\0' };
-
-static Evas_Object_Textblock_Text_Item *
-_layout_ellipsis_item_new(Ctxt *c, const Evas_Object_Textblock_Item *cur_it)
-{
-   Evas_Object_Textblock_Text_Item *ellip_ti;
-   Evas_Script_Type script;
-   Evas_Font_Instance *script_fi = NULL, *cur_fi;
-   size_t len = 1; /* The length of _ellip_str */
-
-   /* We can free it here, cause there's only one ellipsis item per tb. */
-   if (c->o->ellip_ti) _item_free(c->obj, NULL, _ITEM(c->o->ellip_ti));
-   c->o->ellip_ti = ellip_ti = _layout_text_item_new(c,
-         eina_list_data_get(eina_list_last(c->format_stack)));
-   ellip_ti->parent.text_node = cur_it->text_node;
-   ellip_ti->parent.text_pos = cur_it->text_pos;
-   script = evas_common_language_script_type_get(_ellip_str, len);
-
-   evas_common_text_props_bidi_set(&ellip_ti->text_props,
-         c->par->bidi_props, ellip_ti->parent.text_pos);
-   evas_common_text_props_script_set (&ellip_ti->text_props, script);
-
-   if (ellip_ti->parent.format->font.font)
-     {
-        /* It's only 1 char anyway, we don't need the run end. */
-        (void) c->ENFN->font_run_end_get(c->ENDT,
-              ellip_ti->parent.format->font.font, &script_fi, &cur_fi,
-              script, _ellip_str, len);
-
-        c->ENFN->font_text_props_info_create(c->ENDT,
-              cur_fi, _ellip_str, &ellip_ti->text_props,
-              c->par->bidi_props, ellip_ti->parent.text_pos, len);
-     }
-
-   _text_item_update_sizes(c, ellip_ti);
-
-   if (cur_it->type == EVAS_TEXTBLOCK_ITEM_TEXT)
-     {
-        ellip_ti->parent.text_pos += _ITEM_TEXT(cur_it)->text_props.text_len
-           - 1;
-     }
-   else
-     {
-        ellip_ti->parent.text_pos++;
-     }
-
-   return ellip_ti;
-}
-
-/**
- * @internel
- * Handle ellipsis
- */
-static inline void
-_layout_handle_ellipsis(Ctxt *c, Evas_Object_Textblock_Item *it, Eina_List *i)
-{
-   Evas_Object_Textblock_Text_Item *ellip_ti;
-   Evas_Object_Textblock_Item *last_it;
-   Evas_Coord save_cx;
-   int wrap;
-   ellip_ti = _layout_ellipsis_item_new(c, it);
-   last_it = it;
-
-   save_cx = c->x;
-   c->w -= ellip_ti->parent.w;
-
-   if (it->type == EVAS_TEXTBLOCK_ITEM_TEXT)
-     {
-        Evas_Object_Textblock_Text_Item *ti = _ITEM_TEXT(it);
-
-        wrap = _layout_text_cutoff_get(c, last_it->format, ti);
-        if ((wrap > 0) && !IS_AT_END(ti, (size_t) wrap))
-          {
-             _layout_item_text_split_strip_white(c, ti, i, wrap);
-          }
-        else if ((wrap == 0) && (c->ln->items))
-          {
-             last_it = _ITEM(EINA_INLIST_GET(c->ln->items)->last);
-          }
-     }
-   else if (it->type == EVAS_TEXTBLOCK_ITEM_FORMAT)
-     {
-        /* We don't want to add this format item. */
-        last_it = NULL;
-     }
-
-   c->x = save_cx;
-   c->w += ellip_ti->parent.w;
-   /* If we should add this item, do it */
-   if (last_it == it)
-     {
-        c->ln->items = (Evas_Object_Textblock_Item *)
-           eina_inlist_append(EINA_INLIST_GET(c->ln->items),
-                 EINA_INLIST_GET(it));
-        if (it->type == EVAS_TEXTBLOCK_ITEM_FORMAT)
-          {
-             Evas_Object_Textblock_Format_Item *fi;
-             fi = _ITEM_FORMAT(it);
-             fi->y = c->y;
-          }
-     }
-   c->ln->items = (Evas_Object_Textblock_Item *)
-      eina_inlist_append(EINA_INLIST_GET(c->ln->items),
-            EINA_INLIST_GET(_ITEM(ellip_ti)));
-   _layout_line_finalize(c, ellip_ti->parent.format);
-}
-
-#ifdef BIDI_SUPPORT
-static void
-_layout_paragraph_reorder_lines(Evas_Object_Textblock_Paragraph *par)
-{
-   Evas_Object_Textblock_Line *ln;
-
-   EINA_INLIST_FOREACH(EINA_INLIST_GET(par->lines), ln)
-     {
-        _layout_line_reorder(ln);
-     }
-}
-#endif
-
-static void
-_layout_paragraph_render(Evas_Object_Textblock *o,
-                         Evas_Object_Textblock_Paragraph *par)
-{
-   if (par->rendered)
-      return;
-   par->rendered = EINA_TRUE;
-
-#ifdef BIDI_SUPPORT
-   if (par->is_bidi)
-     {
-        _layout_update_bidi_props(o, par);
-        _layout_paragraph_reorder_lines(par);
-        /* Clear the bidi props because we don't need them anymore. */
-        if (par->bidi_props)
-          {
-             evas_bidi_paragraph_props_unref(par->bidi_props);
-             par->bidi_props = NULL;
-          }
-     }
-#else
-   (void) o;
-#endif
-}
-
-/* 0 means go ahead, 1 means break without an error, 2 means
- * break with an error, should probably clean this a bit (enum/macro)
- * FIXME ^ */
-static int
-_layout_par(Ctxt *c)
-{
-   Evas_Object_Textblock_Item *it;
-   Eina_List *i;
-   int ret = 0;
-   int wrap = -1;
-   char *line_breaks = NULL;
-
-   if (!c->par->logical_items)
-     return 2;
-
-   /* We want to show it. */
-   c->par->visible = 1;
-
-   /* Check if we need to skip this paragraph because it's already layouted
-    * correctly, and mark handled nodes as dirty. */
-   c->par->line_no = c->line_no;
-
-   if (c->par->text_node)
-     {
-        /* Skip this paragraph if width is the same, there is no ellipsis
-         * and we aren't just calculating. */
-        if (!c->par->text_node->is_new && !c->par->text_node->dirty &&
-              !c->width_changed && c->par->lines &&
-              !c->o->have_ellipsis)
-          {
-             Evas_Object_Textblock_Line *ln;
-             /* Update c->line_no */
-             ln = (Evas_Object_Textblock_Line *)
-                EINA_INLIST_GET(c->par->lines)->last;
-             if (ln)
-                c->line_no = c->par->line_no + ln->line_no + 1;
-             return 0;
-          }
-        c->par->text_node->dirty = EINA_FALSE;
-        c->par->text_node->is_new = EINA_FALSE;
-        c->par->rendered = EINA_FALSE;
-
-        /* Merge back and clear the paragraph */
-          {
-             Eina_List *itr, *itr_next;
-             Evas_Object_Textblock_Item *ititr, *prev_it = NULL;
-             _paragraph_clear(c->obj, c->par);
-             EINA_LIST_FOREACH_SAFE(c->par->logical_items, itr, itr_next, ititr)
-               {
-                  if (ititr->merge && prev_it &&
-                        (prev_it->type == EVAS_TEXTBLOCK_ITEM_TEXT) &&
-                        (ititr->type == EVAS_TEXTBLOCK_ITEM_TEXT))
-                    {
-                       _layout_item_merge_and_free(c, _ITEM_TEXT(prev_it),
-                             _ITEM_TEXT(ititr));
-                       c->par->logical_items =
-                          eina_list_remove_list(c->par->logical_items, itr);
-                    }
-                  else
-                    {
-                       prev_it = ititr;
-                    }
-               }
-          }
-     }
-
-   c->y = c->par->y;
-
-   it = _ITEM(eina_list_data_get(c->par->logical_items));
-   _layout_line_new(c, it->format);
-   /* We walk on our own because we want to be able to add items from
-    * inside the list and then walk them on the next iteration. */
-   for (i = c->par->logical_items ; i ; )
-     {
-        int adv_line = 0;
-        int redo_item = 0;
-        it = _ITEM(eina_list_data_get(i));
-        /* Skip visually deleted items */
-        if (it->visually_deleted)
-          {
-             i = eina_list_next(i);
-             continue;
-          }
-
-        if (it->type == EVAS_TEXTBLOCK_ITEM_TEXT)
-          {
-             Evas_Object_Textblock_Text_Item *ti = _ITEM_TEXT(it);
-             _layout_format_ascent_descent_adjust(c->obj, &c->maxascent,
-                   &c->maxdescent, ti->parent.format);
-          }
-        else
-          {
-             Evas_Object_Textblock_Format_Item *fi = _ITEM_FORMAT(it);
-             if (fi->formatme)
-               {
-                  /* If there are no text items yet, calc ascent/descent
-                   * according to the current format. */
-                  if (c->maxascent + c->maxdescent == 0)
-                     _layout_format_ascent_descent_adjust(c->obj, &c->maxascent,
-                           &c->maxdescent, it->format);
-
-                  _layout_calculate_format_item_size(c->obj, fi, &c->maxascent,
-                        &c->maxdescent, &fi->y, &fi->parent.w, &fi->parent.h);
-                  fi->parent.adv = fi->parent.w;
-               }
-          }
-
-
-        /* Check if we need to wrap, i.e the text is bigger than the width,
-           or we already found a wrap point. */
-        if ((c->w >= 0) &&
-              (((c->x + it->adv) >
-                (c->w - c->o->style_pad.l - c->o->style_pad.r -
-                 c->marginl - c->marginr)) || (wrap > 0)))
-          {
-             /* Handle ellipsis here. If we don't have more width left
-              * and no height left, or no more width left and no wrapping. */
-             if ((it->format->ellipsis == 1.0) && (c->h >= 0) &&
-                   ((2 * it->h + c->y >
-                     c->h - c->o->style_pad.t - c->o->style_pad.b) ||
-                    (!it->format->wrap_word && !it->format->wrap_char &&
-                     !it->format->wrap_mixed)))
-               {
-                  _layout_handle_ellipsis(c, it, i);
-                  ret = 1;
-                  goto end;
-               }
-             /* If we want to wrap and it's worth checking for wrapping
-              * (i.e there's actually text). */
-             else if ((it->format->wrap_word || it->format->wrap_char ||
-                it->format->wrap_mixed) && it->text_node)
-               {
-                  size_t line_start;
-                  size_t it_len;
-
-                  it_len = (it->type == EVAS_TEXTBLOCK_ITEM_FORMAT) ?
-                     1 : _ITEM_TEXT(it)->text_props.text_len;
-
-
-#ifdef HAVE_LINEBREAK
-                  /* If we haven't calculated the linebreaks yet,
-                   * do */
-                  if (!line_breaks)
-                    {
-                       /* Only relevant in those cases */
-                       if (it->format->wrap_word || it->format->wrap_mixed)
-                         {
-                            const char *lang;
-                            lang = (it->format->font.fdesc) ?
-                               it->format->font.fdesc->lang : "";
-                            size_t len =
-                               eina_ustrbuf_length_get(
-                                     it->text_node->unicode);
-                            line_breaks = malloc(len);
-                            set_linebreaks_utf32((const utf32_t *)
-                                  eina_ustrbuf_string_get(
-                                     it->text_node->unicode),
-                                  len, lang, line_breaks);
-                         }
-                    }
-#endif
-                  if (c->ln->items)
-                     line_start = c->ln->items->text_pos;
-                  else
-                     line_start = it->text_pos;
-
-                  adv_line = 1;
-                  /* If we don't already have a wrap point from before */
-                  if (wrap < 0)
-                    {
-                       if (it->format->wrap_word)
-                          wrap = _layout_get_wordwrap(c, it->format, it,
-                                line_start, line_breaks);
-                       else if (it->format->wrap_char)
-                          wrap = _layout_get_charwrap(c, it->format, it,
-                                line_start, line_breaks);
-                       else if (it->format->wrap_mixed)
-                          wrap = _layout_get_mixedwrap(c, it->format, it,
-                                line_start, line_breaks);
-                       else
-                          wrap = -1;
-                    }
-
-                  /* If it's before the item, rollback and apply.
-                     if it's in the item, cut.
-                     If it's after the item, delay the cut */
-                  if (wrap > 0)
-                    {
-                       size_t uwrap = (size_t) wrap;
-                       if (uwrap < it->text_pos)
-                         {
-                            /* Rollback latest additions, and cut that
-                               item */
-                            i = eina_list_prev(i);
-                            it = eina_list_data_get(i);
-                            while (uwrap < it->text_pos)
-                              {
-                                 c->ln->items = _ITEM(
-                                       eina_inlist_remove(
-                                          EINA_INLIST_GET(c->ln->items),
-                                          EINA_INLIST_GET(it)));
-                                 i = eina_list_prev(i);
-                                 it = eina_list_data_get(i);
-                              }
-                            c->x = it->x;
-                            c->ln->items = _ITEM(
-                                  eina_inlist_remove(
-                                     EINA_INLIST_GET(c->ln->items),
-                                     EINA_INLIST_GET(it)));
-                            continue;
-                         }
-                       /* If it points to the end, it means the previous
-                        * char is a whitespace we should remove, so this
-                        * is a wanted cutting point. */
-                       else if (uwrap > it->text_pos + it_len)
-                         {
-                            /* FIXME: Should redo the ellipsis handling.
-                             * If we can do ellipsis, just cut here. */
-                            if (it->format->ellipsis == 1.0)
-                              {
-                                 _layout_handle_ellipsis(c, it, i);
-                                 ret = 1;
-                                 goto end;
-                              }
-                            else
-                              {
-                                 /* Delay the cut in a smart way i.e use the
-                                    item_pos as the line_start, because
-                                    there's already no cut before*/
-                                 wrap = -1;
-                              }
-                        }
-                       else
-                          wrap -= it->text_pos; /* Cut here */
-                    }
-
-                  if (wrap > 0)
-                    {
-                       if (it->type == EVAS_TEXTBLOCK_ITEM_TEXT)
-                         {
-                            _layout_item_text_split_strip_white(c,
-                                  _ITEM_TEXT(it), i, wrap);
-                         }
-                    }
-                  else if (wrap == 0)
-                    {
-                       /* Should wrap before the item */
-                       adv_line = 0;
-                       redo_item = 1;
-                       _layout_line_advance(c, it->format);
-                    }
-                  /* Reset wrap */
-                  wrap = -1;
-               }
-          }
-
-        if (!redo_item && !it->visually_deleted)
-          {
-             c->ln->items = (Evas_Object_Textblock_Item *)
-                eina_inlist_append(EINA_INLIST_GET(c->ln->items),
-                      EINA_INLIST_GET(it));
-             if (it->type == EVAS_TEXTBLOCK_ITEM_FORMAT)
-               {
-                  Evas_Object_Textblock_Format_Item *fi;
-                  fi = _ITEM_FORMAT(it);
-                  fi->y = c->y;
-                  /* If it's a newline, and we are not in newline compat
-                   * mode, or we are in newline compat mode, and this is
-                   * not used as a paragraph separator, advance */
-                  if (fi->item && _IS_LINE_SEPARATOR(fi->item) &&
-                        (!c->o->legacy_newline ||
-                         eina_list_next(i)))
-                    {
-                       adv_line = 1;
-                    }
-               }
-             c->x += it->adv;
-             i = eina_list_next(i);
-          }
-        if (adv_line)
-          {
-             /* Each line is according to the first item in it, and here
-              * i is already the next item (or the current if we redo it) */
-             if (i)
-               {
-                  it = _ITEM(eina_list_data_get(i));
-               }
-             _layout_line_advance(c, it->format);
-          }
-     }
-   if (c->ln->items)
-     {
-        /* Here 'it' is the last format used */
-        _layout_line_finalize(c, it->format);
-     }
-
-end:
-#ifdef HAVE_LINEBREAK
-   if (line_breaks)
-      free(line_breaks);
-#endif
-
-   return ret;
-}
-
-/**
- * @internal
- * Invalidate text nodes according to format changes
- * This goes through all the new format changes and marks the text nodes
- * that should be invalidated because of format changes.
- *
- * @param c the working context.
- */
-static inline void
-_format_changes_invalidate_text_nodes(Ctxt *c)
-{
-   Evas_Object_Textblock_Node_Format *fnode = c->o->format_nodes;
-   Evas_Object_Textblock_Node_Text *start_n = NULL;
-   Eina_List *fstack = NULL;
-   int balance = 0;
-   while (fnode)
-     {
-        if (fnode->is_new)
-          {
-             const char *fstr = fnode->orig_format;
-             /* balance < 0 means we gave up and everything should be
-              * invalidated */
-             if (fnode->opener && !fnode->own_closer)
-               {
-                  balance++;
-                  if (!fstack)
-                     start_n = fnode->text_node;
-                  fstack = eina_list_prepend(fstack, fnode);
-               }
-             else if (!fnode->opener)
-               {
-                  size_t fstr_len;
-                  fstr_len = strlen(fstr);
-                  /* Generic popper, just pop */
-                  if (((fstr[0] == ' ') && !fstr[1]) || !fstr[0])
-                    {
-                       fstack = eina_list_remove_list(fstack, fstack);
-                       balance--;
-                    }
-                  /* Find the matching format and pop it, if the matching format
-                   * is out format, i.e the last one, pop and break. */
-                  else
-                    {
-                       Eina_List *i;
-                       Evas_Object_Textblock_Node_Format *fnode2;
-                       EINA_LIST_FOREACH(fstack, i, fnode2)
-                         {
-                            if (_FORMAT_IS_CLOSER_OF(
-                                     fnode2->orig_format, fstr, fstr_len))
-                              {
-                                 fstack = eina_list_remove_list(fstack, i);
-                                 break;
-                              }
-                         }
-                       balance--;
-                    }
-
-                  if (!fstack)
-                    {
-                       Evas_Object_Textblock_Node_Text *f_tnode =
-                          fnode->text_node;
-                       while (start_n)
-                         {
-                            start_n->dirty = EINA_TRUE;
-                            if (start_n == f_tnode)
-                               break;
-                            start_n =
-                               _NODE_TEXT(EINA_INLIST_GET(start_n)->next);
-                         }
-                       start_n = NULL;
-                    }
-               }
-             else if (!fnode->visible)
-                balance = -1;
-
-             if (balance < 0)
-               {
-                  /* if we don't already have a starting point, use the
-                   * current paragraph. */
-                  if (!start_n)
-                     start_n = fnode->text_node;
-                  break;
-               }
-          }
-        fnode = _NODE_FORMAT(EINA_INLIST_GET(fnode)->next);
-     }
-
-   if (balance != 0)
-     {
-        while (start_n)
-          {
-             start_n->dirty = EINA_TRUE;
-             start_n = _NODE_TEXT(EINA_INLIST_GET(start_n)->next);
-          }
-     }
-}
-
-
-/** FIXME: Document */
-static void
-_layout_pre(Ctxt *c, int *style_pad_l, int *style_pad_r, int *style_pad_t,
-      int *style_pad_b)
-{
-   Evas_Object *obj = c->obj;
-   Evas_Object_Textblock *o = c->o;
-   /* Mark text nodes as dirty if format have changed. */
-   if (c->o->format_changed)
-     {
-        _format_changes_invalidate_text_nodes(c);
-     }
-
-   if (o->content_changed)
-     {
-        Evas_Object_Textblock_Node_Text *n;
-        c->o->have_ellipsis = 0;
-        c->par = c->paragraphs = o->paragraphs;
-        /* Go through all the text nodes to create the logical layout */
-        EINA_INLIST_FOREACH(c->o->text_nodes, n)
-          {
-             Evas_Object_Textblock_Node_Format *fnode;
-             size_t start;
-             int off;
-
-             /* If it's not a new paragraph, either update it or skip it.
-              * Remove all the paragraphs that were deleted */
-             if (!n->is_new)
-               {
-                  /* Remove all the deleted paragraphs at this point */
-                  while (c->par->text_node != n)
-                    {
-                       Evas_Object_Textblock_Paragraph *tmp_par =
-                          (Evas_Object_Textblock_Paragraph *)
-                          EINA_INLIST_GET(c->par)->next;
-
-                       c->paragraphs = (Evas_Object_Textblock_Paragraph *)
-                          eina_inlist_remove(EINA_INLIST_GET(c->paragraphs),
-                                EINA_INLIST_GET(c->par));
-                       _paragraph_free(obj, c->par);
-
-                       c->par = tmp_par;
-                    }
-
-                  /* If it's dirty, remove and recreate, if it's clean,
-                   * skip to the next. */
-                  if (n->dirty)
-                    {
-                       Evas_Object_Textblock_Paragraph *prev_par = c->par;
-
-                       _layout_paragraph_new(c, n, EINA_TRUE);
-
-                       c->paragraphs = (Evas_Object_Textblock_Paragraph *)
-                          eina_inlist_remove(EINA_INLIST_GET(c->paragraphs),
-                                EINA_INLIST_GET(prev_par));
-                       _paragraph_free(obj, prev_par);
-                    }
-                  else
-                    {
-                       c->par = (Evas_Object_Textblock_Paragraph *)
-                          EINA_INLIST_GET(c->par)->next;
-
-                       /* Update the format stack according to the node's
-                        * formats */
-                       fnode = n->format_node;
-                       while (fnode && (fnode->text_node == n))
-                         {
-                            /* Only do this if this actually changes format */
-                            if (fnode->format_change)
-                               _layout_do_format(obj, c, &c->fmt, fnode,
-                                     style_pad_l, style_pad_r,
-                                     style_pad_t, style_pad_b, EINA_FALSE);
-                            fnode = _NODE_FORMAT(EINA_INLIST_GET(fnode)->next);
-                         }
-                       continue;
-                    }
-               }
-             else
-               {
-                  /* If it's a new paragraph, just add it. */
-                  _layout_paragraph_new(c, n, EINA_FALSE);
-               }
-
-#ifdef BIDI_SUPPORT
-             _layout_update_bidi_props(c->o, c->par);
-#endif
-
-             /* For each text node to thorugh all of it's format nodes
-              * append text from the start to the offset of the next format
-              * using the last format got. if needed it also creates format
-              * items this is the core algorithm of the layout mechanism.
-              * Skip the unicode replacement chars when there are because
-              * we don't want to print them. */
-             fnode = n->format_node;
-             start = off = 0;
-             while (fnode && (fnode->text_node == n))
-               {
-                  off += fnode->offset;
-                  /* No need to skip on the first run, or a non-visible one */
-                  _layout_text_append(c, c->fmt, n, start, off, o->repch);
-                  _layout_do_format(obj, c, &c->fmt, fnode, style_pad_l,
-                        style_pad_r, style_pad_t, style_pad_b, EINA_TRUE);
-                  if ((c->have_underline2) || (c->have_underline))
-                    {
-                       if (*style_pad_b < c->underline_extend)
-                         *style_pad_b = c->underline_extend;
-                       c->have_underline = 0;
-                       c->have_underline2 = 0;
-                       c->underline_extend = 0;
-                    }
-                  start += off;
-                  if (fnode->visible)
-                    {
-                       off = -1;
-                       start++;
-                    }
-                  else
-                    {
-                       off = 0;
-                    }
-                  fnode->is_new = EINA_FALSE;
-                  fnode = _NODE_FORMAT(EINA_INLIST_GET(fnode)->next);
-               }
-             _layout_text_append(c, c->fmt, n, start, -1, o->repch);
-#ifdef BIDI_SUPPORT
-             /* Clear the bidi props because we don't need them anymore. */
-             if (c->par->bidi_props)
-               {
-                  evas_bidi_paragraph_props_unref(c->par->bidi_props);
-                  c->par->bidi_props = NULL;
-               }
-#endif
-             c->par = (Evas_Object_Textblock_Paragraph *)
-                EINA_INLIST_GET(c->par)->next;
-          }
-
-        /* Delete the rest of the layout paragraphs */
-        while (c->par)
-          {
-             Evas_Object_Textblock_Paragraph *tmp_par =
-                (Evas_Object_Textblock_Paragraph *)
-                EINA_INLIST_GET(c->par)->next;
-
-             c->paragraphs = (Evas_Object_Textblock_Paragraph *)
-                eina_inlist_remove(EINA_INLIST_GET(c->paragraphs),
-                      EINA_INLIST_GET(c->par));
-             _paragraph_free(obj, c->par);
-
-             c->par = tmp_par;
-          }
-        o->paragraphs = c->paragraphs;
-        c->par = NULL;
-     }
-
-}
-
-/**
- * @internal
- * Create the layout from the nodes.
- *
- * @param obj the evas object - NOT NULL.
- * @param calc_only true if should only calc sizes false if should also create the layout.. It assumes native size is being calculated, doesn't support formatted size atm.
- * @param w the object's w, -1 means no wrapping (i.e infinite size)
- * @param h the object's h, -1 means inifinte size.
- * @param w_ret the object's calculated w.
- * @param h_ret the object's calculated h.
- */
-static void
-_layout(const Evas_Object *obj, int w, int h, int *w_ret, int *h_ret)
-{
-   Evas_Object_Textblock *o;
-   Ctxt ctxt, *c;
-   int style_pad_l = 0, style_pad_r = 0, style_pad_t = 0, style_pad_b = 0;
-
-   /* setup context */
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   c = &ctxt;
-   c->obj = (Evas_Object *)obj;
-   c->o = o;
-   c->paragraphs = c->par = NULL;
-   c->format_stack = NULL;
-   c->fmt = NULL;
-   c->x = c->y = 0;
-   c->w = w;
-   c->h = h;
-   c->wmax = c->hmax = 0;
-   c->maxascent = c->maxdescent = 0;
-   c->marginl = c->marginr = 0;
-   c->have_underline = 0;
-   c->have_underline2 = 0;
-   c->underline_extend = 0;
-   c->line_no = 0;
-   c->align = 0.0;
-   c->align_auto = EINA_TRUE;
-   c->ln = NULL;
-   c->width_changed = (obj->cur.geometry.w != o->last_w);
-
-   /* Start of logical layout creation */
-   /* setup default base style */
-     {
-        Eina_Bool finalize = EINA_FALSE;
-        if ((c->o->style) && (c->o->style->default_tag))
-          {
-             c->fmt = _layout_format_push(c, NULL, NULL);
-             _format_fill(c->obj, c->fmt, c->o->style->default_tag);
-             finalize = EINA_TRUE;
-          }
-
-        if ((c->o->style_user) && (c->o->style_user->default_tag))
-          {
-             if (!c->fmt)
-               {
-                  c->fmt = _layout_format_push(c, NULL, NULL);
-               }
-             _format_fill(c->obj, c->fmt, c->o->style_user->default_tag);
-             finalize = EINA_TRUE;
-          }
-
-        if (finalize)
-           _format_finalize(c->obj, c->fmt);
-     }
-   if (!c->fmt)
-     {
-        if (w_ret) *w_ret = 0;
-        if (h_ret) *h_ret = 0;
-        return;
-     }
-
-   _layout_pre(c, &style_pad_l, &style_pad_r, &style_pad_t, &style_pad_b);
-   c->paragraphs = o->paragraphs;
-
-   /* If there are no paragraphs, create the minimum needed,
-    * if the last paragraph has no lines/text, create that as well */
-   if (!c->paragraphs)
-     {
-        _layout_paragraph_new(c, NULL, EINA_TRUE);
-        o->paragraphs = c->paragraphs;
-     }
-   c->par = (Evas_Object_Textblock_Paragraph *)
-      EINA_INLIST_GET(c->paragraphs)->last;
-   if (!c->par->logical_items)
-     {
-        Evas_Object_Textblock_Text_Item *ti;
-        ti = _layout_text_item_new(c, c->fmt);
-        ti->parent.text_node = c->par->text_node;
-        ti->parent.text_pos = 0;
-        _layout_text_add_logical_item(c, ti, NULL);
-     }
-
-   /* End of logical layout creation */
-
-   /* Start of visual layout creation */
-   {
-      Evas_Object_Textblock_Paragraph *last_vis_par = NULL;
-      int par_index_step = o->num_paragraphs / TEXTBLOCK_PAR_INDEX_SIZE;
-      int par_count = 1; /* Force it to take the first one */
-      int par_index_pos = 0;
-
-      if (par_index_step == 0) par_index_step = 1;
-
-      /* Clear all of the index */
-      memset(o->par_index, 0, sizeof(o->par_index));
-
-      EINA_INLIST_FOREACH(c->paragraphs, c->par)
-        {
-           _layout_update_par(c);
-
-           /* Break if we should stop here. */
-           if (_layout_par(c))
-             {
-                last_vis_par = c->par;
-                break;
-             }
-
-           if ((par_index_pos < TEXTBLOCK_PAR_INDEX_SIZE) && (--par_count == 0))
-             {
-                par_count = par_index_step;
-
-                o->par_index[par_index_pos++] = c->par;
-             }
-        }
-
-      /* Mark all the rest of the paragraphs as invisible */
-      if (c->par)
-        {
-           c->par = (Evas_Object_Textblock_Paragraph *)
-              EINA_INLIST_GET(c->par)->next;
-           while (c->par)
-             {
-                c->par->visible = 0;
-                c->par = (Evas_Object_Textblock_Paragraph *)
-                   EINA_INLIST_GET(c->par)->next;
-             }
-        }
-
-      /* Get the last visible paragraph in the layout */
-      if (!last_vis_par && c->paragraphs)
-         last_vis_par = (Evas_Object_Textblock_Paragraph *)
-            EINA_INLIST_GET(c->paragraphs)->last;
-
-      if (last_vis_par)
-         c->hmax = last_vis_par->y + last_vis_par->h;
-   }
-
-   /* Clean the rest of the format stack */
-   while (c->format_stack)
-     {
-        c->fmt = c->format_stack->data;
-        c->format_stack = eina_list_remove_list(c->format_stack, c->format_stack);
-        _format_unref_free(c->obj, c->fmt);
-     }
-
-   if (w_ret) *w_ret = c->wmax;
-   if (h_ret) *h_ret = c->hmax;
-
-   /* Vertically align the textblock */
-   if ((o->valign > 0.0) && (c->h > c->hmax))
-     {
-        Evas_Coord adjustment = (c->h - c->hmax) * o->valign;
-        Evas_Object_Textblock_Paragraph *par;
-        EINA_INLIST_FOREACH(c->paragraphs, par)
-          {
-             par->y += adjustment;
-          }
-     }
-
-   if ((o->style_pad.l != style_pad_l) || (o->style_pad.r != style_pad_r) ||
-       (o->style_pad.t != style_pad_t) || (o->style_pad.b != style_pad_b))
-     {
-        o->style_pad.l = style_pad_l;
-        o->style_pad.r = style_pad_r;
-        o->style_pad.t = style_pad_t;
-        o->style_pad.b = style_pad_b;
-        _paragraphs_clear(obj, c->paragraphs);
-        _layout(obj, w, h, w_ret, h_ret);
-     }
-}
-
-/*
- * @internal
- * Relayout the object according to current object size.
- *
- * @param obj the evas object - NOT NULL.
- */
-static void
-_relayout(const Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   _layout(obj, obj->cur.geometry.w, obj->cur.geometry.h,
-         &o->formatted.w, &o->formatted.h);
-   o->formatted.valid = 1;
-   o->last_w = obj->cur.geometry.w;
-   o->last_h = obj->cur.geometry.h;
-   o->changed = 0;
-   o->content_changed = 0;
-   o->format_changed = EINA_FALSE;
-   o->redraw = 1;
-}
-
-/**
- * @internal
- * Find the layout item and line that match the text node and position passed.
- *
- * @param obj the evas object - NOT NULL.
- * @param n the text node - Not null.
- * @param pos the position to look for - valid.
- * @param[out] lnr the line found - not null.
- * @param[out] tir the item found - not null.
- * @see _find_layout_format_item_line_match()
- */
-static void
-_find_layout_item_line_match(Evas_Object *obj, Evas_Object_Textblock_Node_Text *n, int pos, Evas_Object_Textblock_Line **lnr, Evas_Object_Textblock_Item **itr)
-{
-   Evas_Object_Textblock_Paragraph *found_par;
-   Evas_Object_Textblock_Line *ln;
-   Evas_Object_Textblock *o;
-
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   if (!o->formatted.valid) _relayout(obj);
-
-   found_par = n->par;
-   if (found_par)
-     {
-        _layout_paragraph_render(o, found_par);
-        EINA_INLIST_FOREACH(found_par->lines, ln)
-          {
-             Evas_Object_Textblock_Item *it;
-
-             EINA_INLIST_FOREACH(ln->items, it)
-               {
-                  /* FIXME: p should be size_t, same goes for pos */
-                  int p = (int) it->text_pos;
-
-                  if (it->type == EVAS_TEXTBLOCK_ITEM_TEXT)
-                    {
-                       Evas_Object_Textblock_Text_Item *ti =
-                          _ITEM_TEXT(it);
-
-                       p += (int) ti->text_props.text_len;
-                    }
-                  else
-                    {
-                       p++;
-                    }
-
-                  if (((pos >= (int) it->text_pos) && (pos < p)))
-                    {
-                       *lnr = ln;
-                       *itr = it;
-                       return;
-                    }
-                  else if (p == pos)
-                    {
-                       *lnr = ln;
-                       *itr = it;
-                    }
-               }
-          }
-     }
-}
-
-/**
- * @internal
- * Return the line number 'line'.
- *
- * @param obj the evas object - NOT NULL.
- * @param line the line to find
- * @return the line of line number or NULL if no line found.
- */
-static Evas_Object_Textblock_Line *
-_find_layout_line_num(const Evas_Object *obj, int line)
-{
-   Evas_Object_Textblock_Paragraph *par;
-   Evas_Object_Textblock_Line *ln;
-   Evas_Object_Textblock *o;
-
-   o = (Evas_Object_Textblock *)(obj->object_data);
-
-   par = _layout_find_paragraph_by_line_no(o, line);
-   if (par)
-     {
-        _layout_paragraph_render(o, par);
-        EINA_INLIST_FOREACH(par->lines, ln)
-          {
-             if (par->line_no + ln->line_no == line) return ln;
-          }
-     }
-   return NULL;
-}
-
-EAPI Evas_Object *
-evas_object_textblock_add(Evas *e)
-{
-   Evas_Object *obj;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return NULL;
-   MAGIC_CHECK_END();
-   obj = evas_object_new(e);
-   evas_object_textblock_init(obj);
-   evas_object_inject(obj, e);
-   return obj;
-}
-
-EAPI Evas_Textblock_Style *
-evas_textblock_style_new(void)
-{
-   Evas_Textblock_Style *ts;
-
-   ts = calloc(1, sizeof(Evas_Textblock_Style));
-   return ts;
-}
-
-EAPI void
-evas_textblock_style_free(Evas_Textblock_Style *ts)
-{
-   if (!ts) return;
-   if (ts->objects)
-     {
-        ts->delete_me = 1;
-        return;
-     }
-   _style_clear(ts);
-   free(ts);
-}
-
-EAPI void
-evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text)
-{
-   Eina_List *l;
-   Evas_Object *obj;
-
-   if (!ts) return;
-   /* If the style wasn't really changed, abort. */
-   if ((!ts->style_text && !text) ||
-       (ts->style_text && text && !strcmp(text, ts->style_text)))
-      return;
-
-   EINA_LIST_FOREACH(ts->objects, l, obj)
-     {
-        Evas_Object_Textblock *o;
-
-        o = (Evas_Object_Textblock *)(obj->object_data);
-        _evas_textblock_invalidate_all(o);
-        _evas_textblock_changed(o, obj);
-     }
-
-   _style_replace(ts, text);
-
-   if (ts->style_text)
-     {
-        // format MUST be KEY='VALUE'[KEY='VALUE']...
-        const char *p;
-        const char *key_start, *key_stop, *val_start;
-
-        key_start = key_stop = val_start = NULL;
-        p = ts->style_text;
-        while (*p)
-          {
-             if (!key_start)
-               {
-                 if (!isspace((unsigned char)(*p)))
-                    key_start = p;
-               }
-             else if (!key_stop)
-               {
-                 if ((*p == '=') || (isspace((unsigned char)(*p))))
-                    key_stop = p;
-               }
-             else if (!val_start)
-               {
-                  if (((*p) == '\'') && (*(p + 1)))
-                    {
-                       val_start = ++p;
-                    }
-               }
-             if ((key_start) && (key_stop) && (val_start))
-               {
-                  char *tags, *replaces = NULL;
-                  Evas_Object_Style_Tag *tag;
-                  const char *val_stop = NULL;
-                  size_t tag_len;
-                  size_t replace_len;
-
-                    {
-                       Eina_Strbuf *buf = eina_strbuf_new();
-                       val_stop = val_start;
-                       while(*p)
-                         {
-                            if (*p == '\'')
-                              {
-                                 /* Break if we found the tag end */
-                                 if (p[-1] != '\\')
-                                   {
-                                      eina_strbuf_append_length(buf, val_stop,
-                                            p - val_stop);
-                                      break;
-                                   }
-                                 else
-                                   {
-                                      eina_strbuf_append_length(buf, val_stop,
-                                            p - val_stop - 1);
-                                      eina_strbuf_append_char(buf, '\'');
-                                      val_stop = p + 1;
-                                   }
-                              }
-                            p++;
-                         }
-                       replaces = eina_strbuf_string_steal(buf);
-                       eina_strbuf_free(buf);
-                    }
-                  /* If we didn't find an end, just aboart. */
-                  if (!*p)
-                    {
-                       if (replaces) free(replaces);
-                       break;
-                    }
-
-                  tag_len = key_stop - key_start;
-                  replace_len = val_stop - val_start;
-
-                  tags = malloc(tag_len + 1);
-                  if (tags)
-                    {
-                       memcpy(tags, key_start, tag_len);
-                       tags[tag_len] = 0;
-                    }
-
-                  if ((tags) && (replaces))
-                    {
-                       if (!strcmp(tags, "DEFAULT"))
-                         {
-                            ts->default_tag = replaces;
-                            free(tags);
-                         }
-                       else
-                         {
-                            tag = calloc(1, sizeof(Evas_Object_Style_Tag));
-                            if (tag)
-                              {
-                                 tag->tag.tag = tags;
-                                 tag->tag.replace = replaces;
-                                 tag->tag.tag_len = tag_len;
-                                 tag->tag.replace_len = replace_len;
-                                 ts->tags = (Evas_Object_Style_Tag *)eina_inlist_append(EINA_INLIST_GET(ts->tags), EINA_INLIST_GET(tag));
-                              }
-                            else
-                              {
-                                 free(tags);
-                                 free(replaces);
-                              }
-                         }
-                    }
-                  else
-                    {
-                       if (tags) free(tags);
-                       if (replaces) free(replaces);
-                    }
-                  key_start = key_stop = val_start = NULL;
-               }
-             p++;
-          }
-     }
-}
-
-EAPI const char *
-evas_textblock_style_get(const Evas_Textblock_Style *ts)
-{
-   if (!ts) return NULL;
-   return ts->style_text;
-}
-
-/* textblock styles */
-
-static void
-_textblock_style_generic_set(Evas_Object *obj, Evas_Textblock_Style *ts,
-      Evas_Textblock_Style **obj_ts)
-{
-   TB_HEAD();
-   if (ts == *obj_ts) return;
-   if ((ts) && (ts->delete_me)) return;
-   if (*obj_ts)
-     {
-        Evas_Textblock_Style *old_ts;
-        if (o->markup_text)
-          {
-             free(o->markup_text);
-             o->markup_text = NULL;
-          }
-
-        old_ts = *obj_ts;
-        old_ts->objects = eina_list_remove(old_ts->objects, obj);
-        if ((old_ts->delete_me) && (!old_ts->objects))
-          evas_textblock_style_free(old_ts);
-     }
-   if (ts)
-     {
-        ts->objects = eina_list_append(ts->objects, obj);
-     }
-   *obj_ts = ts;
-
-   _evas_textblock_invalidate_all(o);
-   _evas_textblock_changed(o, obj);
-}
-
-EAPI void
-evas_object_textblock_style_set(Evas_Object *obj, Evas_Textblock_Style *ts)
-{
-   TB_HEAD();
-   _textblock_style_generic_set(obj, ts, &(o->style));
-}
-
-EAPI const Evas_Textblock_Style *
-evas_object_textblock_style_get(const Evas_Object *obj)
-{
-   TB_HEAD_RETURN(NULL);
-   return o->style;
-}
-
-EAPI void
-evas_object_textblock_style_user_push(Evas_Object *obj, Evas_Textblock_Style *ts)
-{
-   TB_HEAD();
-   _textblock_style_generic_set(obj, ts, &(o->style_user));
-}
-
-EAPI const Evas_Textblock_Style *
-evas_object_textblock_style_user_peek(const Evas_Object *obj)
-{
-   TB_HEAD_RETURN(NULL);
-   return o->style_user;
-}
-
-EAPI void
-evas_object_textblock_style_user_pop(Evas_Object *obj)
-{
-   TB_HEAD();
-   _textblock_style_generic_set(obj, NULL,  &(o->style_user));
-}
-
-EAPI void
-evas_object_textblock_replace_char_set(Evas_Object *obj, const char *ch)
-{
-   TB_HEAD();
-   if (o->repch) eina_stringshare_del(o->repch);
-   if (ch) o->repch = eina_stringshare_add(ch);
-   else o->repch = NULL;
-   _evas_textblock_invalidate_all(o);
-   _evas_textblock_changed(o, obj);
-}
-
-EAPI void
-evas_object_textblock_legacy_newline_set(Evas_Object *obj, Eina_Bool mode)
-{
-   TB_HEAD();
-   if (o->legacy_newline == mode)
-      return;
-
-   o->legacy_newline = mode;
-   /* FIXME: Should recreate all the textnodes... For now, it's just
-    * for new text inserted. */
-}
-
-EAPI Eina_Bool
-evas_object_textblock_legacy_newline_get(const Evas_Object *obj)
-{
-   TB_HEAD_RETURN(EINA_FALSE);
-   return o->legacy_newline;
-}
-
-EAPI void
-evas_object_textblock_valign_set(Evas_Object *obj, double align)
-{
-   TB_HEAD();
-   if (align < 0.0) align = 0.0;
-   else if (align > 1.0) align = 1.0;
-   if (o->valign == align) return;
-   o->valign = align;
-   _evas_textblock_changed(o, obj);
-}
-
-EAPI double
-evas_object_textblock_valign_get(const Evas_Object *obj)
-{
-   TB_HEAD_RETURN(0.0);
-   return o->valign;
-}
-
-EAPI void
-evas_object_textblock_bidi_delimiters_set(Evas_Object *obj, const char *delim)
-{
-   TB_HEAD();
-   eina_stringshare_replace(&o->bidi_delimiters, delim);
-}
-
-EAPI const char *
-evas_object_textblock_bidi_delimiters_get(const Evas_Object *obj)
-{
-   TB_HEAD_RETURN(NULL);
-   return o->bidi_delimiters;
-}
-
-EAPI const char *
-evas_object_textblock_replace_char_get(Evas_Object *obj)
-{
-   TB_HEAD_RETURN(NULL);
-   return o->repch;
-}
-
-/**
- * @internal
- * Advance p_buff to point after the end of the string. It's used with the
- * @ref escaped_strings[] variable.
- *
- * @param p_buff the pointer to the current string.
- */
-static inline void
-_escaped_advance_after_end_of_string(const char **p_buf)
-{
-   while (**p_buf != 0) (*p_buf)++;
-   (*p_buf)++;
-}
-
-/**
- * @internal
- * Advance p_buff to point after the end of the string. It's used with the
- * @ref escaped_strings[] variable. Also chec if matches.
- * FIXME: doc.
- *
- * @param p_buff the pointer to the current string.
- */
-static inline int
-_escaped_is_eq_and_advance(const char *s, const char *s_end,
-      const char **p_m, const char *m_end)
-{
-   Eina_Bool reached_end;
-   for (;((s < s_end) && (*p_m < m_end)); s++, (*p_m)++)
-     {
-        if (*s != **p_m)
-          {
-             _escaped_advance_after_end_of_string(p_m);
-             return 0;
-          }
-     }
-
-   reached_end = !**p_m;
-   if (*p_m < m_end)
-     _escaped_advance_after_end_of_string(p_m);
-
-   return ((s == s_end) && reached_end);
-}
-
-/**
- * @internal
- *
- * @param s the string to match
- */
-static inline const char *
-_escaped_char_match(const char *s, int *adv)
-{
-   const char *map_itr, *map_end, *mc, *sc;
-
-   map_itr = escape_strings;
-   map_end = map_itr + sizeof(escape_strings);
-
-   while (map_itr < map_end)
-     {
-        const char *escape;
-        int match;
-
-        escape = map_itr;
-        _escaped_advance_after_end_of_string(&map_itr);
-        if (map_itr >= map_end) break;
-
-        mc = map_itr;
-        sc = s;
-        match = 1;
-        while ((*mc) && (*sc))
-          {
-             if ((unsigned char)*sc < (unsigned char)*mc) return NULL;
-             if (*sc != *mc)
-               {
-                  match = 0;
-                  break;
-               }
-             mc++;
-             sc++;
-          }
-        if (match)
-          {
-             *adv = mc - map_itr;
-             return escape;
-          }
-        _escaped_advance_after_end_of_string(&map_itr);
-     }
-   return NULL;
-}
-
-/**
- * @internal
- * FIXME: TBD.
- *
- * @param s the string to match
- */
-static inline const char *
-_escaped_char_get(const char *s, const char *s_end)
-{
-   /* Handle numeric escape codes. */
-   if (s[1] == '#')
-     {
-        static char utf8_escape[7]; /* Support up to 6 bytes utf8 */
-        char ustr[10];
-        Eina_Unicode uchar[2] = { 0, 0 };
-        char *utf8_char;
-        size_t len = 0;
-        int base = 10;
-        s += 2; /* Skip "&#" */
-
-        if (tolower((unsigned char)(*s)) == 'x')
-          {
-             s++;
-             base = 16;
-          }
-
-        len = s_end - s;
-        if (len >= sizeof(ustr) + 1)
-           len = sizeof(ustr);
-
-        memcpy(ustr, s, len);
-        ustr[len] = '\0';
-        uchar[0] = strtol(ustr, NULL, base);
-
-        if (uchar[0] == 0)
-          return NULL;
-
-        utf8_char = eina_unicode_unicode_to_utf8(uchar, NULL);
-        strcpy(utf8_escape, utf8_char);
-        free(utf8_char);
-
-        return utf8_escape;
-     }
-   else
-     {
-        const char *map_itr, *map_end;
-
-        map_itr = escape_strings;
-        map_end = map_itr + sizeof(escape_strings);
-
-        while (map_itr < map_end)
-          {
-             if (_escaped_is_eq_and_advance(s, s_end, &map_itr, map_end))
-                return map_itr;
-             if (map_itr < map_end)
-                _escaped_advance_after_end_of_string(&map_itr);
-          }
-     }
-
-   return NULL;
-}
-
-EAPI const char *
-evas_textblock_escape_string_get(const char *escape)
-{
-   /* &amp; -> & */
-   return _escaped_char_get(escape, escape + strlen(escape));
-}
-
-EAPI const char *
-evas_textblock_escape_string_range_get(const char *escape_start, const char *escape_end)
-{
-   return _escaped_char_get(escape_start, escape_end);
-}
-
-EAPI const char *
-evas_textblock_string_escape_get(const char *string, int *len_ret)
-{
-   /* & -> &amp; */
-   return _escaped_char_match(string, len_ret);
-}
-
-/**
- * @internal
- * Appends the escaped char beteewn s and s_end to the curosr
- *
- *
- * @param s the start of the string
- * @param s_end the end of the string.
- */
-static inline void
-_append_escaped_char(Evas_Textblock_Cursor *cur, const char *s,
-      const char *s_end)
-{
-   const char *escape;
-
-   escape = _escaped_char_get(s, s_end);
-   if (escape)
-     evas_textblock_cursor_text_append(cur, escape);
-}
-
-/**
- * @internal
- * prepends the escaped char beteewn s and s_end to the curosr
- *
- *
- * @param s the start of the string
- * @param s_end the end of the string.
- */
-static inline void
-_prepend_escaped_char(Evas_Textblock_Cursor *cur, const char *s,
-      const char *s_end)
-{
-   const char *escape;
-
-   escape = _escaped_char_get(s, s_end);
-   if (escape)
-     evas_textblock_cursor_text_prepend(cur, escape);
-}
-
-
-EAPI void
-evas_object_textblock_text_markup_set(Evas_Object *obj, const char *text)
-{
-   TB_HEAD();
-   if ((text != o->markup_text) && (o->markup_text))
-     {
-        free(o->markup_text);
-        o->markup_text = NULL;
-     }
-   _nodes_clear(obj);
-   if (!o->style && !o->style_user)
-     {
-        if (text != o->markup_text)
-          {
-             if (text) o->markup_text = strdup(text);
-          }
-        return;
-     }
-   evas_textblock_cursor_paragraph_first(o->cursor);
-
-   evas_object_textblock_text_markup_prepend(o->cursor, text);
-   /* Point all the cursors to the starrt */
-     {
-        Eina_List *l;
-        Evas_Textblock_Cursor *data;
-
-        evas_textblock_cursor_paragraph_first(o->cursor);
-        EINA_LIST_FOREACH(o->cursors, l, data)
-           evas_textblock_cursor_paragraph_first(data);
-     }
-}
-
-EAPI void
-evas_object_textblock_text_markup_prepend(Evas_Textblock_Cursor *cur, const char *text)
-{
-   Evas_Object *obj = cur->obj;
-   TB_HEAD();
-   if (text)
-     {
-        char *s, *p;
-        char *tag_start, *tag_end, *esc_start, *esc_end;
-
-        tag_start = tag_end = esc_start = esc_end = NULL;
-        p = (char *)text;
-        s = p;
-        /* This loop goes through all of the mark up text until it finds format
-         * tags, escape sequences or the terminating NULL. When it finds either
-         * of those, it appends the text found up until that point to the textblock
-         * proccesses whatever found. It repeats itself until the termainating
-         * NULL is reached. */
-        for (;;)
-          {
-             size_t text_len;
-             /* If we got to the end of string or just finished/started tag
-              * or escape sequence handling. */
-             if ((*p == 0) ||
-                   (tag_end) || (esc_end) ||
-                   (tag_start) || (esc_start))
-               {
-                  if (tag_end)
-                    {
-                       /* If we reached to a tag ending, analyze the tag */
-                       char *ttag;
-                       size_t ttag_len = tag_end - tag_start;
-
-
-                       ttag = malloc(ttag_len + 1);
-                       if (ttag)
-                         {
-                            memcpy(ttag, tag_start, ttag_len);
-                            ttag[ttag_len] = 0;
-                            evas_textblock_cursor_format_prepend(cur, ttag);
-                            free(ttag);
-                         }
-                       tag_start = tag_end = NULL;
-                    }
-                  else if (esc_end)
-                    {
-                       _prepend_escaped_char(cur, esc_start, esc_end + 1);
-                       esc_start = esc_end = NULL;
-                    }
-                  else if (*p == 0)
-                    {
-                       _prepend_text_run(cur, s, p);
-                       s = NULL;
-                    }
-                  if (*p == 0)
-                    break;
-               }
-             if (*p == '<')
-               {
-                  if (!esc_start)
-                    {
-                       /* Append the text prior to this to the textblock and mark
-                        * the start of the tag */
-                       tag_start = p;
-                       tag_end = NULL;
-                       _prepend_text_run(cur, s, p);
-                       s = NULL;
-                    }
-               }
-             else if (*p == '>')
-               {
-                  if (tag_start)
-                    {
-                       tag_end = p + 1;
-                       s = p + 1;
-                    }
-               }
-             else if (*p == '&')
-               {
-                  if (!tag_start)
-                    {
-                       /* Append the text prior to this to the textblock and mark
-                        * the start of the escape sequence */
-                       esc_start = p;
-                       esc_end = NULL;
-                       _prepend_text_run(cur, s, p);
-                       s = NULL;
-                    }
-               }
-             else if (*p == ';')
-               {
-                  if (esc_start)
-                    {
-                       esc_end = p;
-                       s = p + 1;
-                    }
-               }
-             /* Unicode object replcament char */
-             else if (!strncmp(_REPLACEMENT_CHAR_UTF8, p,
-                      text_len = strlen(_REPLACEMENT_CHAR_UTF8)) ||
-                   !strncmp(_NEWLINE_UTF8, p,
-                      text_len = strlen(_NEWLINE_UTF8)) ||
-                   !strncmp(_TAB_UTF8, p,
-                      text_len = strlen(_TAB_UTF8)) ||
-                   !strncmp(_PARAGRAPH_SEPARATOR_UTF8, p,
-                      text_len = strlen(_PARAGRAPH_SEPARATOR_UTF8)))
-               {
-                  /*FIXME: currently just remove them, maybe do something
-                   * fancier in the future, atm it breaks if this char
-                   * is inside <> */
-                  _prepend_text_run(cur, s, p);
-                  /* it's also advanced later in this loop need +text_len
-                     in total*/
-                  p += text_len - 1;
-                  s = p + 1; /* One after the end of the replacement char */
-               }
-             p++;
-          }
-     }
-   _evas_textblock_changed(o, obj);
-}
-
-
-/**
- * @internal
- * An helper function to markup get. Appends the format from fnode to the strbugf txt.
- *
- * @param o the textblock object.
- * @param txt the strbuf to append to.
- * @param fnode the format node to process.
- */
-static void
-_markup_get_format_append(Eina_Strbuf *txt, Evas_Object_Textblock_Node_Format *fnode)
-{
-   eina_strbuf_append_char(txt, '<');
-     {
-        const char *s;
-
-        // FIXME: need to escape
-        s = fnode->orig_format;
-        if (!fnode->opener && !fnode->own_closer)
-           eina_strbuf_append_char(txt, '/');
-        eina_strbuf_append(txt, s);
-        if (fnode->own_closer)
-           eina_strbuf_append_char(txt, '/');
-     }
-   eina_strbuf_append_char(txt, '>');
-}
-
-/**
- * @internal
- * An helper function to markup get. Appends the text in text.
- *
- * @param txt the strbuf to append to.
- * @param text the text to process.
- */
-static void
-_markup_get_text_append(Eina_Strbuf *txt, const Eina_Unicode *text)
-{
-   char *p = eina_unicode_unicode_to_utf8(text, NULL);
-   char *base = p;
-   while (*p)
-     {
-        const char *escape;
-        int adv;
-
-        escape = _escaped_char_match(p, &adv);
-        if (escape)
-          {
-             p += adv;
-             eina_strbuf_append(txt, escape);
-          }
-        else
-          {
-             eina_strbuf_append_char(txt, *p);
-             p++;
-          }
-     }
-   free(base);
-}
-EAPI const char *
-evas_object_textblock_text_markup_get(const Evas_Object *obj)
-{
-   Evas_Object_Textblock_Node_Text *n;
-   Eina_Strbuf *txt = NULL;
-
-   TB_HEAD_RETURN(NULL);
-   if (o->markup_text) return(o->markup_text);
-   txt = eina_strbuf_new();
-   EINA_INLIST_FOREACH(o->text_nodes, n)
-     {
-        Evas_Object_Textblock_Node_Format *fnode;
-        Eina_Unicode *text_base, *text;
-        int off;
-
-        /* For each text node to thorugh all of it's format nodes
-         * append text from the start to the offset of the next format
-         * using the last format got. if needed it also creates format items
-         * this is the core algorithm of the layout mechanism.
-         * Skip the unicode replacement chars when there are because
-         * we don't want to print them. */
-        text_base = text =
-           eina_unicode_strndup(eina_ustrbuf_string_get(n->unicode),
-                                eina_ustrbuf_length_get(n->unicode));
-        fnode = n->format_node;
-        off = 0;
-        while (fnode && (fnode->text_node == n))
-          {
-             Eina_Unicode tmp_ch;
-             off += fnode->offset;
-             /* No need to skip on the first run */
-             tmp_ch = text[off];
-             text[off] = 0; /* Null terminate the part of the string */
-             _markup_get_text_append(txt, text);
-             _markup_get_format_append(txt, fnode);
-             text[off] = tmp_ch; /* Restore the char */
-             text += off;
-             if (fnode->visible)
-               {
-                  off = -1;
-                  text++;
-               }
-             else
-               {
-                  off = 0;
-               }
-             fnode = _NODE_FORMAT(EINA_INLIST_GET(fnode)->next);
-          }
-        /* Add the rest, skip replacement */
-        _markup_get_text_append(txt, text);
-        free(text_base);
-     }
-
-
-   o->markup_text = eina_strbuf_string_steal(txt);
-   eina_strbuf_free(txt);
-   return o->markup_text;
-}
-
-EAPI char *
-evas_textblock_text_markup_to_utf8(const Evas_Object *obj, const char *text)
-{
-   /* FIXME: Redundant and awful, should be merged with markup_prepend */
-   Eina_Strbuf *sbuf;
-   char *s, *p, *ret;
-   char *tag_start, *tag_end, *esc_start, *esc_end;
-
-   if (!text) return NULL;
-
-
-   tag_start = tag_end = esc_start = esc_end = NULL;
-   sbuf = eina_strbuf_new();
-   p = (char *)text;
-   s = p;
-   /* This loop goes through all of the mark up text until it finds format
-    * tags, escape sequences or the terminating NULL. When it finds either
-    * of those, it appends the text found up until that point to the textblock
-    * proccesses whatever found. It repeats itself until the termainating
-    * NULL is reached. */
-   for (;;)
-     {
-        /* If we got to the end of string or just finished/started tag
-         * or escape sequence handling. */
-        if ((*p == 0) ||
-              (tag_end) || (esc_end) ||
-              (tag_start) || (esc_start))
-          {
-             if (tag_end)
-               {
-                  /* If we reached to a tag ending, analyze the tag */
-                  char *ttag;
-                  size_t ttag_len;
-
-                  tag_start++; /* Skip the < */
-                  tag_end--; /* Skip the > */
-                  if ((tag_end > tag_start) && (*(tag_end - 1) == '/'))
-                    {
-                       tag_end --; /* Skip the terminating '/' */
-                       while (*(tag_end - 1) == ' ')
-                         tag_end--; /* skip trailing ' ' */
-                    }
-
-                  ttag_len = tag_end - tag_start;
-
-                  ttag = malloc(ttag_len + 1);
-                  if (ttag)
-                    {
-                       const char *match = NULL;
-                       size_t replace_len;
-                       memcpy(ttag, tag_start, ttag_len);
-                       ttag[ttag_len] = 0;
-
-
-                       if (obj)
-                         {
-                            match = _style_match_tag(
-                                  evas_object_textblock_style_get(obj),
-                                  ttag, ttag_len, &replace_len);
-                         }
-
-                       if (!match) match = ttag;
-
-                       if (_IS_PARAGRAPH_SEPARATOR_SIMPLE(match))
-                          eina_strbuf_append(sbuf, _PARAGRAPH_SEPARATOR_UTF8);
-                       else if (_IS_LINE_SEPARATOR(match))
-                          eina_strbuf_append(sbuf, _NEWLINE_UTF8);
-                       else if (_IS_TAB(match))
-                          eina_strbuf_append(sbuf, _TAB_UTF8);
-                       else if (!strncmp(match, "item", 4))
-                          eina_strbuf_append(sbuf, _REPLACEMENT_CHAR_UTF8);
-
-                       free(ttag);
-                    }
-                  tag_start = tag_end = NULL;
-               }
-             else if (esc_end)
-               {
-                  const char *escape;
-
-                  escape = _escaped_char_get(esc_start, esc_end + 1);
-                  if (escape) eina_strbuf_append(sbuf, escape);
-                  esc_start = esc_end = NULL;
-               }
-             else if (*p == 0)
-               {
-                  eina_strbuf_append_length(sbuf, s, p - s);
-                  s = NULL;
-               }
-             if (*p == 0)
-                break;
-          }
-        if (*p == '<')
-          {
-             if (!esc_start)
-               {
-                  /* Append the text prior to this to the textblock and
-                   * mark the start of the tag */
-                  tag_start = p;
-                  tag_end = NULL;
-                  eina_strbuf_append_length(sbuf, s, p - s);
-                  s = NULL;
-               }
-          }
-        else if (*p == '>')
-          {
-             if (tag_start)
-               {
-                  tag_end = p + 1;
-                  s = p + 1;
-               }
-          }
-        else if (*p == '&')
-          {
-             if (!tag_start)
-               {
-                  /* Append the text prior to this to the textblock and mark
-                   * the start of the escape sequence */
-                  esc_start = p;
-                  esc_end = NULL;
-                  eina_strbuf_append_length(sbuf, s, p - s);
-                  s = NULL;
-               }
-          }
-        else if (*p == ';')
-          {
-             if (esc_start)
-               {
-                  esc_end = p;
-                  s = p + 1;
-               }
-          }
-        p++;
-     }
-
-   ret = eina_strbuf_string_steal(sbuf);
-   eina_strbuf_free(sbuf);
-   return ret;
-}
-
-EAPI char *
-evas_textblock_text_utf8_to_markup(const Evas_Object *obj, const char *text)
-{
-   Eina_Strbuf *sbuf;
-   char *str = NULL;
-   int ch, pos = 0, pos2 = 0;
-
-   (void) obj;
-
-   if (!text) return NULL;
-
-   sbuf = eina_strbuf_new();
-
-   for (;;)
-     {
-        pos = pos2;
-        pos2 = evas_string_char_next_get(text, pos2, &ch);
-        if ((ch <= 0) || (pos2 <= 0)) break;
-
-        if (ch == _NEWLINE)
-           eina_strbuf_append(sbuf, "<br/>");
-        else if (ch == _TAB)
-           eina_strbuf_append(sbuf, "<tab/>");
-        else if (ch == '<')
-           eina_strbuf_append(sbuf, "&lt;");
-        else if (ch == '>')
-           eina_strbuf_append(sbuf, "&gt;");
-        else if (ch == '&')
-           eina_strbuf_append(sbuf, "&amp;");
-        else if (ch == _PARAGRAPH_SEPARATOR)
-           eina_strbuf_append(sbuf, "<ps/>");
-        else if (ch == _REPLACEMENT_CHAR)
-           eina_strbuf_append(sbuf, "&#xfffc;");
-        else
-          {
-             eina_strbuf_append_length(sbuf, text + pos, pos2 - pos);
-          }
-     }
-   str = eina_strbuf_string_steal(sbuf);
-   eina_strbuf_free(sbuf);
-   return str;
-
-}
-
-/* cursors */
-
-/**
- * @internal
- * Merge the current node with the next, no need to remove PS, already
- * not there.
- *
- * @param o the text block object.
- * @param to merge into to.
- */
-static void
-_evas_textblock_nodes_merge(Evas_Object_Textblock *o, Evas_Object_Textblock_Node_Text *to)
-{
-   Evas_Object_Textblock_Node_Format *itr;
-   Evas_Object_Textblock_Node_Format *pnode;
-   Evas_Object_Textblock_Node_Text *from;
-   const Eina_Unicode *text;
-   int to_len, len;
-
-   if (!to) return;
-   from = _NODE_TEXT(EINA_INLIST_GET(to)->next);
-
-   to_len = eina_ustrbuf_length_get(to->unicode);
-   text = eina_ustrbuf_string_get(from->unicode);
-   len = eina_ustrbuf_length_get(from->unicode);
-   eina_ustrbuf_append_length(to->unicode, text, len);
-
-   itr = from->format_node;
-   if (itr && (itr->text_node == from))
-     {
-        pnode = _NODE_FORMAT(EINA_INLIST_GET(itr)->prev);
-        if (pnode && (pnode->text_node == to))
-          {
-             itr->offset += to_len - _evas_textblock_node_format_pos_get(pnode);
-          }
-        else
-          {
-             itr->offset += to_len;
-          }
-     }
-
-   while (itr && (itr->text_node == from))
-     {
-        itr->text_node = to;
-        itr = _NODE_FORMAT(EINA_INLIST_GET(itr)->next);
-     }
-   if (!to->format_node || (to->format_node->text_node != to))
-     {
-        to->format_node = from->format_node;
-     }
-
-   /* When it comes to how we handle it, merging is like removing both nodes
-    * and creating a new one, se we need to do the needed cleanups. */
-   if (to->par)
-      to->par->text_node = NULL;
-   to->par = NULL;
-
-   to->is_new = EINA_TRUE;
-
-   _evas_textblock_cursors_set_node(o, from, to);
-   _evas_textblock_node_text_remove(o, from);
-}
-
-/**
- * @internal
- * Merge the current node with the next, no need to remove PS, already
- * not there.
- *
- * @param cur the cursor that points to the current node
- */
-static void
-_evas_textblock_cursor_nodes_merge(Evas_Textblock_Cursor *cur)
-{
-   Evas_Object_Textblock_Node_Text *nnode;
-   Evas_Object_Textblock *o;
-   int len;
-   if (!cur) return;
-
-   len = eina_ustrbuf_length_get(cur->node->unicode);
-
-   o = (Evas_Object_Textblock *)(cur->obj->object_data);
-   nnode = _NODE_TEXT(EINA_INLIST_GET(cur->node)->next);
-   _evas_textblock_nodes_merge(o, cur->node);
-   _evas_textblock_cursors_update_offset(cur, nnode, 0, len);
-   _evas_textblock_cursors_set_node(o, nnode, cur->node);
-   if (nnode == o->cursor->node)
-     {
-        o->cursor->node = cur->node;
-        o->cursor->pos += len;
-     }
-}
-
-/**
- * @internal
- * Return the format at a specific position.
- *
- * @param cur the cursor to the position.
- * @return the format node at the specific position or NULL if not found.
- */
-static Evas_Object_Textblock_Node_Format *
-_evas_textblock_cursor_node_format_at_pos_get(const Evas_Textblock_Cursor *cur)
-{
-   Evas_Object_Textblock_Node_Format *node;
-   Evas_Object_Textblock_Node_Format *itr;
-   int position = 0;
-
-   if (!cur->node) return NULL;
-
-   node = cur->node->format_node;
-   if (!node) return NULL;
-   /* If there is no exclusive format node to this paragraph return the
-    * previous's node */
-   /* Find the main format node */
-   EINA_INLIST_FOREACH(node, itr)
-     {
-        if (itr->text_node != cur->node)
-          {
-             return NULL;
-          }
-        if ((position + itr->offset) == cur->pos)
-          {
-             return itr;
-          }
-        position += itr->offset;
-     }
-   return NULL;
-}
-
-/**
- * @internal
- * Return the last format node at the position of the format node n.
- *
- * @param n a format node at the position.
- * @return the last format node at the position of n.
- */
-static Evas_Object_Textblock_Node_Format *
-_evas_textblock_node_format_last_at_off(const Evas_Object_Textblock_Node_Format *n)
-{
-   const Evas_Object_Textblock_Node_Format *nnode;
-   const Evas_Object_Textblock_Node_Text *tnode;
-   if (!n) return NULL;
-   nnode = n;
-   tnode = n->text_node;
-   do
-     {
-        n = nnode;
-        nnode = _NODE_FORMAT(EINA_INLIST_GET(nnode)->next);
-     }
-   while (nnode && (nnode->text_node == tnode) && (nnode->offset == 0));
-
-   return (Evas_Object_Textblock_Node_Format *) n;
-}
-
-/**
- * @internal
- * Returns the visible format at a specific location.
- *
- * @param n a format at the specific position.
- * @return the format node at the specific position or NULL if not found.
- */
-static Evas_Object_Textblock_Node_Format *
-_evas_textblock_node_visible_at_pos_get(const Evas_Object_Textblock_Node_Format *n)
-{
-   const Evas_Object_Textblock_Node_Format *nnode;
-   if (!n) return NULL;
-   /* The visible format is the last one, because it inserts a replacement
-    * char that advances the next formats. */
-
-   nnode = n;
-   do
-     {
-        n = nnode;
-        if (n->visible) return (Evas_Object_Textblock_Node_Format *) n;
-        nnode = _NODE_FORMAT(EINA_INLIST_GET(nnode)->next);
-     }
-   while (nnode && (nnode->offset == 0));
-
-   return NULL;
-}
-
-/**
- * @internal
- * Return the last format that applies to a specific cursor or at the specific
- * position the cursor points to. This means either a cursor at or before the
- * position of the cursor in the text node is returned or the previous's text
- * node's format node.
- *
- * @param cur the position to look at.
- * @return the format node found.
- */
-static Evas_Object_Textblock_Node_Format *
-_evas_textblock_cursor_node_format_before_or_at_pos_get(const Evas_Textblock_Cursor *cur)
-{
-   Evas_Object_Textblock_Node_Format *node, *pitr = NULL;
-   Evas_Object_Textblock_Node_Format *itr;
-   size_t position = 0;
-
-   if (!cur->node) return NULL;
-
-   node = cur->node->format_node;
-   if (!node) return NULL;
-   /* If there is no exclusive format node to this paragraph return the
-    * previous's node */
-   if (node->text_node != cur->node)
-     {
-        return node;
-     }
-   else if (node->offset > cur->pos)
-     {
-        return _NODE_FORMAT(EINA_INLIST_GET(node)->prev);
-     }
-   /* Find the main format node */
-   pitr = _NODE_FORMAT(EINA_INLIST_GET(node)->prev);
-   EINA_INLIST_FOREACH(node, itr)
-     {
-        if ((itr->text_node != cur->node) ||
-            ((position + itr->offset) > cur->pos))
-          {
-             return pitr;
-          }
-        else if ((position + itr->offset) == cur->pos)
-          {
-             return itr;
-          }
-        pitr = itr;
-        position += itr->offset;
-     }
-   return pitr;
-}
-
-/**
- * @internal
- * Find the layout item and line that match the cursor.
- *
- * @param cur the cursor we are currently at. - NOT NULL.
- * @param[out] lnr the line found - not null.
- * @param[out] itr the item found - not null.
- * @return EINA_TRUE if we matched the previous format, EINA_FALSE otherwise.
- */
-static Eina_Bool
-_find_layout_item_match(const Evas_Textblock_Cursor *cur, Evas_Object_Textblock_Line **lnr, Evas_Object_Textblock_Item **itr)
-{
-   Evas_Textblock_Cursor cur2;
-   Eina_Bool previous_format = EINA_FALSE;
-
-   cur2.obj = cur->obj;
-   evas_textblock_cursor_copy(cur, &cur2);
-   if (cur2.pos > 0)
-     {
-        cur2.pos--;
-     }
-
-   if (_evas_textblock_cursor_is_at_the_end(cur) &&
-            evas_textblock_cursor_format_is_visible_get(&cur2))
-     {
-        _find_layout_item_line_match(cur2.obj, cur2.node, cur2.pos, lnr, itr);
-        previous_format = EINA_TRUE;
-     }
-   else
-     {
-        _find_layout_item_line_match(cur->obj, cur->node, cur->pos, lnr, itr);
-     }
-   return previous_format;
-}
-
-EAPI Evas_Textblock_Cursor *
-evas_object_textblock_cursor_get(const Evas_Object *obj)
-{
-   TB_HEAD_RETURN(NULL);
-   return o->cursor;
-}
-
-EAPI Evas_Textblock_Cursor *
-evas_object_textblock_cursor_new(const Evas_Object *obj)
-{
-   Evas_Textblock_Cursor *cur;
-
-   TB_HEAD_RETURN(NULL);
-   cur = calloc(1, sizeof(Evas_Textblock_Cursor));
-   cur->obj = (Evas_Object *) obj;
-   cur->node = o->text_nodes;
-   cur->pos = 0;
-
-   o->cursors = eina_list_append(o->cursors, cur);
-   return cur;
-}
-
-EAPI void
-evas_textblock_cursor_free(Evas_Textblock_Cursor *cur)
-{
-   Evas_Object_Textblock *o;
-
-   if (!cur) return;
-   o = (Evas_Object_Textblock *)(cur->obj->object_data);
-   if (cur == o->cursor) return;
-   o->cursors = eina_list_remove(o->cursors, cur);
-   free(cur);
-}
-
-EAPI Eina_Bool
-evas_textblock_cursor_is_format(const Evas_Textblock_Cursor *cur)
-{
-   if (!cur || !cur->node) return EINA_FALSE;
-   return (_evas_textblock_cursor_node_format_at_pos_get(cur)) ?
-      EINA_TRUE : EINA_FALSE;
-}
-
-EAPI const Eina_List *
-evas_textblock_node_format_list_get(const Evas_Object *obj, const char *anchor)
-{
-   TB_HEAD_RETURN(NULL);
-   if (!strcmp(anchor, "a"))
-      return o->anchors_a;
-   else if (!strcmp(anchor, "item"))
-      return o->anchors_item;
-
-   return NULL;
-}
-
-EAPI const Evas_Object_Textblock_Node_Format *
-evas_textblock_node_format_first_get(const Evas_Object *obj)
-{
-   TB_HEAD_RETURN(NULL);
-   return o->format_nodes;
-}
-
-EAPI const Evas_Object_Textblock_Node_Format *
-evas_textblock_node_format_last_get(const Evas_Object *obj)
-{
-   TB_HEAD_RETURN(NULL);
-   if (o->format_nodes)
-     {
-        return _NODE_FORMAT(EINA_INLIST_GET(o->format_nodes)->last);
-     }
-   return NULL;
-}
-
-EAPI const Evas_Object_Textblock_Node_Format *
-evas_textblock_node_format_next_get(const Evas_Object_Textblock_Node_Format *n)
-{
-   return _NODE_FORMAT(EINA_INLIST_GET(n)->next);
-}
-
-EAPI const Evas_Object_Textblock_Node_Format *
-evas_textblock_node_format_prev_get(const Evas_Object_Textblock_Node_Format *n)
-{
-   return _NODE_FORMAT(EINA_INLIST_GET(n)->prev);
-}
-
-EAPI void
-evas_textblock_node_format_remove_pair(Evas_Object *obj,
-      Evas_Object_Textblock_Node_Format *n)
-{
-   Evas_Object_Textblock_Node_Text *tnode1;
-   Evas_Object_Textblock_Node_Format *fmt, *found_node = NULL;
-   Eina_List *fstack = NULL;
-   TB_HEAD();
-
-   if (!n) return;
-
-   fmt = n;
-
-   do
-     {
-        const char *fstr = fmt->orig_format;
-
-        if (fmt->opener && !fmt->own_closer)
-          {
-             fstack = eina_list_prepend(fstack, fmt);
-          }
-        else if (fstr && !fmt->opener)
-          {
-             size_t fstr_len;
-             fstr_len = strlen(fstr);
-             /* Generic popper, just pop */
-             if (((fstr[0] == ' ') && !fstr[1]) || !fstr[0])
-               {
-                  fstack = eina_list_remove_list(fstack, fstack);
-                  if (!fstack)
-                    {
-                       found_node = fmt;
-                       goto found;
-                    }
-               }
-             /* Find the matching format and pop it, if the matching format
-              * is out format, i.e the last one, pop and break. */
-             else
-               {
-                  Eina_List *i;
-                  Evas_Object_Textblock_Node_Format *fnode;
-                  EINA_LIST_FOREACH(fstack, i, fnode)
-                    {
-                       if (_FORMAT_IS_CLOSER_OF(
-                                fnode->orig_format, fstr, fstr_len))
-                         {
-                            /* Last one, this is our item! */
-                            if (!eina_list_next(i))
-                              {
-                                 found_node = fmt;
-                                 goto found;
-                              }
-                            fstack = eina_list_remove_list(fstack, i);
-                            break;
-                         }
-                    }
-               }
-          }
-
-        fmt = _NODE_FORMAT(EINA_INLIST_GET(fmt)->next);
-     }
-   while (fmt && fstack);
-
-found:
-
-   fstack = eina_list_free(fstack);
-
-   if (n->visible)
-     {
-        size_t ind = _evas_textblock_node_format_pos_get(n);
-        const char *format = n->format;
-        Evas_Textblock_Cursor cur;
-        cur.obj = obj;
-
-        eina_ustrbuf_remove(n->text_node->unicode, ind, ind + 1);
-        if (format && _IS_PARAGRAPH_SEPARATOR(o, format))
-          {
-             evas_textblock_cursor_at_format_set(&cur, n);
-             _evas_textblock_cursor_nodes_merge(&cur);
-          }
-        _evas_textblock_cursors_update_offset(&cur, n->text_node, ind, -1);
-     }
-   tnode1 = n->text_node;
-   _evas_textblock_node_format_remove(o, n, 0);
-   if (found_node && (found_node != n))
-     {
-        Evas_Object_Textblock_Node_Text *tnode2;
-        tnode2 = found_node->text_node;
-        /* found_node can never be visible! (it's the closing format) */
-        _evas_textblock_node_format_remove(o, found_node, 0);
-
-        /* FIXME: Should be unified in the layout, for example, added to a list
-         * that checks this kind of removals. But until then, this is very fast
-         * and works. */
-        /* Mark all the text nodes in between the removed formats as dirty. */
-        while (tnode1)
-          {
-             tnode1->dirty = EINA_TRUE;
-             if (tnode1 == tnode2)
-                break;
-             tnode1 =
-                _NODE_TEXT(EINA_INLIST_GET(tnode1)->next);
-          }
-     }
-
-   _evas_textblock_changed(o, obj);
-}
-
-EAPI void
-evas_textblock_cursor_paragraph_first(Evas_Textblock_Cursor *cur)
-{
-   Evas_Object_Textblock *o;
-   if (!cur) return;
-   o = (Evas_Object_Textblock *)(cur->obj->object_data);
-   cur->node = o->text_nodes;
-   cur->pos = 0;
-
-}
-
-EAPI void
-evas_textblock_cursor_paragraph_last(Evas_Textblock_Cursor *cur)
-{
-   Evas_Object_Textblock *o;
-   Evas_Object_Textblock_Node_Text *node;
-
-   if (!cur) return;
-   o = (Evas_Object_Textblock *)(cur->obj->object_data);
-   node = o->text_nodes;
-   if (node)
-     {
-        node = _NODE_TEXT(EINA_INLIST_GET(node)->last);
-        cur->node = node;
-        cur->pos = 0;
-
-        evas_textblock_cursor_paragraph_char_last(cur);
-     }
-   else
-     {
-        cur->node = NULL;
-        cur->pos = 0;
-
-     }
-}
-
-EAPI Eina_Bool
-evas_textblock_cursor_paragraph_next(Evas_Textblock_Cursor *cur)
-{
-   if (!cur) return EINA_FALSE;
-   if (!cur->node) return EINA_FALSE;
-   /* If there is a current text node, return the next text node (if exists)
-    * otherwise, just return False. */
-   if (cur->node)
-     {
-        Evas_Object_Textblock_Node_Text *nnode;
-        nnode = _NODE_TEXT(EINA_INLIST_GET(cur->node)->next);
-        if (nnode)
-          {
-             cur->node = nnode;
-             cur->pos = 0;
-
-             return EINA_TRUE;
-          }
-     }
-   return EINA_FALSE;
-}
-
-EAPI Eina_Bool
-evas_textblock_cursor_paragraph_prev(Evas_Textblock_Cursor *cur)
-{
-   Evas_Object_Textblock_Node_Text *node;
-   if (!cur) return EINA_FALSE;
-   if (!cur->node) return EINA_FALSE;
-   /* If the current node is a text node, just get the prev if any,
-    * if it's a format, get the current text node out of the format and return
-    * the prev text node if any. */
-   node = cur->node;
-   /* If there is a current text node, return the prev text node
-    * (if exists) otherwise, just return False. */
-   if (node)
-     {
-        Evas_Object_Textblock_Node_Text *pnode;
-        pnode = _NODE_TEXT(EINA_INLIST_GET(cur->node)->prev);
-        if (pnode)
-          {
-             cur->node = pnode;
-             evas_textblock_cursor_paragraph_char_last(cur);
-             return EINA_TRUE;
-          }
-     }
-   return EINA_FALSE;
-}
-
-EAPI void
-evas_textblock_cursor_set_at_format(Evas_Textblock_Cursor *cur, const Evas_Object_Textblock_Node_Format *n)
-{
-   evas_textblock_cursor_at_format_set(cur, n);
-}
-
-EAPI Eina_Bool
-evas_textblock_cursor_format_next(Evas_Textblock_Cursor *cur)
-{
-   Evas_Object_Textblock_Node_Format *node;
-
-   if (!cur) return EINA_FALSE;
-   if (!cur->node) return EINA_FALSE;
-   /* If the current node is a format node, just get the next if any,
-    * if it's a text, get the current format node out of the text and return
-    * the next format node if any. */
-   node = _evas_textblock_cursor_node_format_before_or_at_pos_get(cur);
-   node = _evas_textblock_node_format_last_at_off(node);
-   if (!node)
-     {
-        if (cur->node->format_node)
-          {
-             cur->pos = _evas_textblock_node_format_pos_get(node);
-             return EINA_TRUE;
-          }
-     }
-   /* If there is a current text node, return the next format node (if exists)
-    * otherwise, just return False. */
-   else
-     {
-        Evas_Object_Textblock_Node_Format *nnode;
-        nnode = _NODE_FORMAT(EINA_INLIST_GET(node)->next);
-        if (nnode)
-          {
-             cur->node = nnode->text_node;
-             cur->pos = _evas_textblock_node_format_pos_get(nnode);
-
-             return EINA_TRUE;
-          }
-     }
-   return EINA_FALSE;
-}
-
-EAPI Eina_Bool
-evas_textblock_cursor_format_prev(Evas_Textblock_Cursor *cur)
-{
-   const Evas_Object_Textblock_Node_Format *node;
-   if (!cur) return EINA_FALSE;
-   if (!cur->node) return EINA_FALSE;
-   node = evas_textblock_cursor_format_get(cur);
-   if (!node)
-     {
-        node = _evas_textblock_cursor_node_format_before_or_at_pos_get(cur);
-        if (node)
-          {
-             cur->node = node->text_node;
-             cur->pos = _evas_textblock_node_format_pos_get(node);
-
-             return EINA_TRUE;
-          }
-     }
-   /* If there is a current text node, return the next text node (if exists)
-    * otherwise, just return False. */
-   if (node)
-     {
-        Evas_Object_Textblock_Node_Format *pnode;
-        pnode = _NODE_FORMAT(EINA_INLIST_GET(node)->prev);
-        if (pnode)
-          {
-             cur->node = pnode->text_node;
-             cur->pos = _evas_textblock_node_format_pos_get(pnode);
-
-             return EINA_TRUE;
-          }
-     }
-   return EINA_FALSE;
-}
-
-#ifdef HAVE_LINEBREAK
-
-/* BREAK_AFTER: true if we can break after the current char.
- * Both macros assume str[i] is not the terminating nul */
-#define BREAK_AFTER(i) \
-   (breaks[i] == WORDBREAK_BREAK)
-
-#else
-
-#define BREAK_AFTER(i) \
-   ((!text[i + 1]) || \
-    (_is_white(text[i]) && !_is_white(text[i + 1])) || \
-    (!_is_white(text[i]) && _is_white(text[i + 1])))
-
-#endif
-
-EAPI Eina_Bool
-evas_textblock_cursor_word_start(Evas_Textblock_Cursor *cur)
-{
-   const Eina_Unicode *text;
-   size_t i;
-#ifdef HAVE_LINEBREAK
-   char *breaks;
-#endif
-
-   if (!cur) return EINA_FALSE;
-   if (!cur->node) return EINA_FALSE;
-
-   text = eina_ustrbuf_string_get(cur->node->unicode);
-
-#ifdef HAVE_LINEBREAK
-     {
-        const char *lang = ""; /* FIXME: get lang */
-        size_t len = eina_ustrbuf_length_get(cur->node->unicode);
-        breaks = malloc(len);
-        set_wordbreaks_utf32((const utf32_t *) text, len, lang, breaks);
-     }
-#endif
-
-   i = cur->pos;
-
-   /* Skip the first one. This ensures we don't point to the nul, and also
-    * we just don't care about it anyway. */
-   if (i > 0) i--;
-
-   for ( ; i > 0 ; i--)
-     {
-        if (BREAK_AFTER(i))
-          {
-             /* Advance to the current char */
-             i++;
-             break;
-          }
-     }
-
-   cur->pos = i;
-
-#ifdef HAVE_LINEBREAK
-   free(breaks);
-#endif
-   return EINA_TRUE;
-}
-
-EAPI Eina_Bool
-evas_textblock_cursor_word_end(Evas_Textblock_Cursor *cur)
-{
-   const Eina_Unicode *text;
-   size_t i;
-#ifdef HAVE_LINEBREAK
-   char *breaks;
-#endif
-
-   if (!cur) return EINA_FALSE;
-   if (!cur->node) return EINA_FALSE;
-
-   text = eina_ustrbuf_string_get(cur->node->unicode);
-
-#ifdef HAVE_LINEBREAK
-     {
-        const char *lang = ""; /* FIXME: get lang */
-        size_t len = eina_ustrbuf_length_get(cur->node->unicode);
-        breaks = malloc(len);
-        set_wordbreaks_utf32((const utf32_t *) text, len, lang, breaks);
-     }
-#endif
-
-   i = cur->pos;
-
-   for ( ; text[i] ; i++)
-     {
-        if (BREAK_AFTER(i))
-          {
-             /* This is the one to break after. */
-             break;
-          }
-     }
-
-   cur->pos = i;
-
-#ifdef HAVE_LINEBREAK
-   free(breaks);
-#endif
-   return EINA_TRUE;;
-}
-
-EAPI Eina_Bool
-evas_textblock_cursor_char_next(Evas_Textblock_Cursor *cur)
-{
-   int ind;
-   const Eina_Unicode *text;
-
-   if (!cur) return EINA_FALSE;
-   if (!cur->node) return EINA_FALSE;
-
-   ind = cur->pos;
-   text = eina_ustrbuf_string_get(cur->node->unicode);
-   if (text[ind]) ind++;
-   /* Only allow pointing a null if it's the last paragraph.
-    * because we don't have a PS there. */
-   if (text[ind])
-     {
-        cur->pos = ind;
-        return EINA_TRUE;
-     }
-   else
-     {
-        if (!evas_textblock_cursor_paragraph_next(cur))
-          {
-             /* If we already were at the end, that means we don't have
-              * where to go next we should return FALSE */
-             if (cur->pos == (size_t) ind)
-               return EINA_FALSE;
-
-             cur->pos = ind;
-             return EINA_TRUE;
-          }
-        else
-          {
-             return EINA_TRUE;
-          }
-     }
-}
-
-EAPI Eina_Bool
-evas_textblock_cursor_char_prev(Evas_Textblock_Cursor *cur)
-{
-   if (!cur) return EINA_FALSE;
-   if (!cur->node) return EINA_FALSE;
-
-   if (cur->pos != 0)
-     {
-        cur->pos--;
-        return EINA_TRUE;
-     }
-   return evas_textblock_cursor_paragraph_prev(cur);
-}
-
-EAPI void
-evas_textblock_cursor_paragraph_char_first(Evas_Textblock_Cursor *cur)
-{
-   if (!cur) return;
-   cur->pos = 0;
-
-}
-
-EAPI void
-evas_textblock_cursor_paragraph_char_last(Evas_Textblock_Cursor *cur)
-{
-   int ind;
-
-   if (!cur) return;
-   if (!cur->node) return;
-   ind = eina_ustrbuf_length_get(cur->node->unicode);
-   /* If it's not the last paragraph, go back one, because we want to point
-    * to the PS, not the NULL */
-   if (EINA_INLIST_GET(cur->node)->next)
-      ind--;
-
-   if (ind >= 0)
-      cur->pos = ind;
-   else
-      cur->pos = 0;
-
-}
-
-EAPI void
-evas_textblock_cursor_line_char_first(Evas_Textblock_Cursor *cur)
-{
-   Evas_Object_Textblock *o;
-   Evas_Object_Textblock_Line *ln = NULL;
-   Evas_Object_Textblock_Item *it = NULL;
-
-   if (!cur) return;
-   if (!cur->node) return;
-   o = (Evas_Object_Textblock *)(cur->obj->object_data);
-   if (!o->formatted.valid) _relayout(cur->obj);
-
-   _find_layout_item_match(cur, &ln, &it);
-
-   if (!ln) return;
-   if (ln->items)
-     {
-        Evas_Object_Textblock_Item *i;
-        it = ln->items;
-        EINA_INLIST_FOREACH(ln->items, i)
-          {
-             if (it->text_pos > i->text_pos)
-               {
-                  it = i;
-               }
-          }
-     }
-   if (it)
-     {
-        cur->pos = it->text_pos;
-        cur->node = it->text_node;
-     }
-}
-
-EAPI void
-evas_textblock_cursor_line_char_last(Evas_Textblock_Cursor *cur)
-{
-   Evas_Object_Textblock *o;
-   Evas_Object_Textblock_Line *ln = NULL;
-   Evas_Object_Textblock_Item *it = NULL;
-
-   if (!cur) return;
-   if (!cur->node) return;
-   o = (Evas_Object_Textblock *)(cur->obj->object_data);
-   if (!o->formatted.valid) _relayout(cur->obj);
-
-   _find_layout_item_match(cur, &ln, &it);
-
-   if (!ln) return;
-   if (ln->items)
-     {
-        Evas_Object_Textblock_Item *i;
-        it = ln->items;
-        EINA_INLIST_FOREACH(ln->items, i)
-          {
-             if (it->text_pos < i->text_pos)
-               {
-                  it = i;
-               }
-          }
-     }
-   if (it)
-     {
-        size_t ind;
-
-        cur->node = it->text_node;
-        cur->pos = it->text_pos;
-        if (it->type == EVAS_TEXTBLOCK_ITEM_TEXT)
-          {
-             ind = _ITEM_TEXT(it)->text_props.text_len - 1;
-             if (!IS_AT_END(_ITEM_TEXT(it), ind)) ind++;
-             cur->pos += ind;
-          }
-        else if (!EINA_INLIST_GET(ln)->next && !EINA_INLIST_GET(ln->par)->next)
-          {
-             cur->pos++;
-          }
-     }
-}
-
-/**
- * @internal
- * checks if a format (as a string) is visible/changes format and sets the
- * fnode properties accordingly.
- *
- * @param fnode the format node
- * @param s the string.
- */
-static void
-_evas_textblock_format_is_visible(Evas_Object_Textblock_Node_Format *fnode,
-      const char *s)
-{
-   const char *item;
-   Eina_Bool is_opener = EINA_TRUE;
-
-   fnode->visible = fnode->format_change = EINA_FALSE;
-   fnode->anchor = ANCHOR_NONE;
-   if (!s) return;
-
-   if (!fnode->own_closer)
-     {
-        is_opener = fnode->opener;
-        fnode->format_change = EINA_TRUE;
-     }
-
-   while ((item = _format_parse(&s)))
-     {
-        int itlen = s - item;
-        /* We care about all of the formats even after a - except for
-         * item which we don't care after a - because it's just a standard
-         * closing */
-        if ((!strncmp(item, "\n", itlen) || !strncmp(item, "\\n", itlen)) ||
-              (!strncmp(item, "\t", itlen) || !strncmp(item, "\\t", itlen)) ||
-              (!strncmp(item, "br", itlen) && (itlen >= 2)) ||
-              (!strncmp(item, "tab", itlen) && (itlen >= 3)) ||
-              (!strncmp(item, "ps", itlen) && (itlen >= 2)) ||
-              (!strncmp(item, "item", itlen) && (itlen >= 4) && is_opener))
-          {
-             fnode->visible = EINA_TRUE;
-          }
-
-        if (is_opener && !strncmp(item, "a", itlen))
-          {
-             fnode->anchor = ANCHOR_A;
-          }
-        else if (is_opener && !strncmp(item, "item", itlen) && (itlen >= 4))
-          {
-             fnode->anchor = ANCHOR_ITEM;
-          }
-     }
-}
-
-/**
- * Sets the cursor to the position of where the fmt points to.
- *
- * @param cur the cursor to update.
- * @param fmt the format to set according to.
- * @return nothing.
- */
-static void __UNUSED__
-_evas_textblock_cursor_node_text_at_format(Evas_Textblock_Cursor *cur, Evas_Object_Textblock_Node_Format *fmt)
-{
-   Evas_Object_Textblock_Node_Text *text;
-   Evas_Object_Textblock_Node_Format *base_format;
-   Evas_Object_Textblock_Node_Format *itr;
-   size_t position = 0;
-
-   if (!cur || !fmt) return;
-   /* Find the main format node */
-   text = fmt->text_node;
-   cur->node = text;
-   base_format = text->format_node;
-   EINA_INLIST_FOREACH(base_format, itr)
-     {
-        if (itr == fmt)
-          {
-             break;
-          }
-        position += itr->offset;
-     }
-   cur->pos = position;
-
-}
-
-
-/**
- * @internal
- * Remove pairs of + and - formats and also remove formats without + or -
- * i.e formats that pair to themselves. Only removes invisible formats
- * that pair themselves, if you want to remove invisible formats that pair
- * themselves, please first change fmt->visible to EINA_FALSE.
- *
- * @param o the textblock object.
- * @param fmt the current format.
- */
-static void
-_evas_textblock_node_format_remove_matching(Evas_Object_Textblock *o,
-      Evas_Object_Textblock_Node_Format *fmt)
-{
-   Evas_Object_Textblock_Node_Text *tnode;
-   Eina_List *formats = NULL;
-   size_t offset = 0;
-
-   if (!fmt) return;
-
-   tnode = fmt->text_node;
-
-   do
-     {
-        Evas_Object_Textblock_Node_Format *nnode;
-        const char *fstr = fmt->orig_format;
-
-        nnode = _NODE_FORMAT(EINA_INLIST_GET(fmt)->next);
-        if (nnode)
-          {
-             offset = nnode->offset;
-          }
-
-
-        if (fmt->opener && !fmt->own_closer)
-          {
-             formats = eina_list_prepend(formats, fmt);
-          }
-        else if (fstr && !fmt->opener)
-          {
-             Evas_Object_Textblock_Node_Format *fnode;
-             size_t fstr_len;
-             fstr_len = strlen(fstr);
-             /* Generic popper, just pop (if there's anything to pop). */
-             if (formats && (((fstr[0] == ' ') && !fstr[1]) || !fstr[0]))
-               {
-                  fnode = eina_list_data_get(formats);
-                  formats = eina_list_remove_list(formats, formats);
-                  _evas_textblock_node_format_remove(o, fnode, 0);
-                  _evas_textblock_node_format_remove(o, fmt, 0);
-               }
-             /* Find the matching format and pop it, if the matching format
-              * is our format, i.e the last one, pop and break. */
-             else
-               {
-                  Eina_List *i, *next;
-                  EINA_LIST_FOREACH_SAFE(formats, i, next, fnode)
-                    {
-                       if (_FORMAT_IS_CLOSER_OF(
-                                fnode->orig_format, fstr, fstr_len))
-                         {
-                            fnode = eina_list_data_get(i);
-                            formats = eina_list_remove_list(formats, i);
-                            _evas_textblock_node_format_remove(o, fnode, 0);
-                            _evas_textblock_node_format_remove(o, fmt, 0);
-                            break;
-                         }
-                    }
-               }
-          }
-        else if (!fmt->visible)
-          {
-             _evas_textblock_node_format_remove(o, fmt, 0);
-          }
-        fmt = nnode;
-     }
-   while (fmt && (offset == 0) && (fmt->text_node == tnode));
-   eina_list_free(formats);
-}
-/**
- * @internal
- * Add the offset (may be negative) to the first node after fmt which is
- * pointing to the text node tnode or to o->format_nodes if fmt is null
- * and it points to tnode.
- *
- * @param o the textblock object.
- * @param tnode the text node the format should point to.
- * @param fmt the current format.
- * @param offset the offest to add (may be negative).
- */
-static void
-_evas_textblock_node_format_adjust_offset(Evas_Object_Textblock *o,
-      Evas_Object_Textblock_Node_Text *tnode,
-      Evas_Object_Textblock_Node_Format *fmt, int offset)
-{
-   if (fmt)
-     {
-        fmt = _NODE_FORMAT(EINA_INLIST_GET(fmt)->next);
-     }
-   else
-     {
-        fmt = o->format_nodes;
-     }
-   if (fmt && (tnode == fmt->text_node))
-     {
-        fmt->offset += offset;
-     }
-}
-
-/**
- * @internal
- * Removes a format node updating the offset of the next format node and the
- * text nodes pointing to this node.
- *
- * @param o the textblock object.
- * @param n the fromat node to remove
- */
-static void
-_evas_textblock_node_format_remove(Evas_Object_Textblock *o, Evas_Object_Textblock_Node_Format *n, int visible_adjustment)
-{
-   /* Update the text nodes about the change */
-     {
-        Evas_Object_Textblock_Node_Format *nnode;
-        nnode = _NODE_FORMAT(EINA_INLIST_GET(n)->next);
-        /* If there's a next node that belongs to the same text node
-         * and the curret node was the main one, advance the format node */
-        if (nnode && (nnode->text_node == n->text_node))
-          {
-             if (nnode->text_node->format_node == n)
-               {
-                  nnode->text_node->format_node = nnode;
-               }
-          }
-        else
-          {
-             Evas_Object_Textblock_Node_Text *tnode;
-             /* If there's no next one update the text nodes */
-             nnode = _NODE_FORMAT(EINA_INLIST_GET(n)->prev);
-             tnode = n->text_node;
-             /* Even if it's not the current text_node's main node
-              * it can still be the next's. */
-             if (tnode && (tnode->format_node != n))
-               {
-                  tnode = _NODE_TEXT(EINA_INLIST_GET(tnode)->next);
-               }
-             while (tnode && (tnode->format_node == n))
-               {
-                  tnode->format_node = nnode;
-                  tnode = _NODE_TEXT(EINA_INLIST_GET(tnode)->next);
-               }
-          }
-     }
-   _evas_textblock_node_format_adjust_offset(o, n->text_node, n,
-         n->offset - visible_adjustment);
-
-   o->format_nodes = _NODE_FORMAT(eina_inlist_remove(
-           EINA_INLIST_GET(o->format_nodes), EINA_INLIST_GET(n)));
-   _evas_textblock_node_format_free(o, n);
-}
-
-/**
- * @internal
- * Sets all the offsets of the format nodes between start and end in the text
- * node n to 0 and sets visibility to EINA_FALSE.
- * If end == -1 end means the end of the string.
- * Assumes there is a prev node or the current node will be preserved.
- *
- * @param n the text node the positinos refer to.
- * @param start the start of where to delete from.
- * @param end the end of the section to delete, if end == -1 it means the end of the string.
- * @returns #EINA_TRUE if removed a PS, false otherwise.
- */
-static Eina_Bool
-_evas_textblock_node_text_adjust_offsets_to_start(Evas_Object_Textblock *o,
-      Evas_Object_Textblock_Node_Text *n, size_t start, int end)
-{
-   Evas_Object_Textblock_Node_Format *last_node, *itr;
-   Evas_Object_Textblock_Node_Text *new_node;
-   int use_end = 1;
-   int delta = 0;
-   int first = 1;
-   int update_format_node;
-   size_t pos = 0;
-   int orig_end;
-
-   itr = n->format_node;
-   if (!itr || (itr->text_node != n)) return EINA_FALSE;
-
-   orig_end = end;
-   if ((end < 0) || ((size_t) end == eina_ustrbuf_length_get(n->unicode)))
-     {
-        use_end = 0;
-     }
-   else if (end > 0)
-     {
-        /* We don't want the last one */
-        end--;
-     }
-
-   /* If we are not removing the text node, all should stay in this text
-    * node, otherwise, everything should move to the previous node */
-   if ((start == 0) && !use_end)
-     {
-        new_node = _NODE_TEXT(EINA_INLIST_GET(n)->prev);
-        if (!new_node)
-          {
-             new_node = n;
-          }
-     }
-   else
-     {
-        new_node = n;
-     }
-
-   /* Find the first node after start */
-   while (itr && (itr->text_node == n))
-     {
-        pos += itr->offset;
-        if (pos >= start)
-          {
-             break;
-          }
-        itr = _NODE_FORMAT(EINA_INLIST_GET(itr)->next);
-     }
-
-   if (!itr || (itr->text_node != n))
-     {
-        return EINA_FALSE;
-     }
-
-   update_format_node = ((itr == n->format_node) && (new_node != n));
-   delta = orig_end - pos;
-   itr->offset -= pos - start;
-
-   while (itr && (itr->text_node == n))
-     {
-        last_node = itr;
-        itr = _NODE_FORMAT(EINA_INLIST_GET(itr)->next);
-
-        if (!first)
-          {
-             pos += last_node->offset;
-          }
-
-        /* start is negative when this gets relevant */
-        if (use_end && (pos > (size_t) end))
-          {
-             last_node->offset -= delta;
-             break;
-          }
-
-        delta = orig_end - pos;
-        if (!first)
-          {
-             last_node->offset = 0;
-          }
-        else
-          {
-             first = 0;
-          }
-        last_node->visible = EINA_FALSE;
-
-        if (!itr || (itr && (itr->text_node != n)))
-          {
-             /* Remove the PS, and return since it's the end of the node */
-             if (_IS_PARAGRAPH_SEPARATOR(o, last_node->format))
-               {
-                  _evas_textblock_node_format_remove(o, last_node, 0);
-                  return EINA_TRUE;
-               }
-
-          }
-        last_node->text_node = new_node;
-        if (update_format_node)
-          {
-             n->format_node = last_node;
-          }
-     }
-
-   return EINA_FALSE;
-}
-
-/**
- * @internal
- * Removes all the format nodes between start and end in the text node n.
- * This function updates the offset of the next format node and the
- * text nodes pointing to it. if end == -1 end means the end of the string.
- *
- * @param o the textblock object.
- * @param n the text node the positinos refer to.
- * @param start the start of where to delete from.
- * @param end the end of the section to delete, if end == -1 it means the end of the string.
- */
-static void
-_evas_textblock_node_text_remove_formats_between(Evas_Object_Textblock *o,
-      Evas_Object_Textblock_Node_Text *n, int start, int end)
-{
-   Evas_Object_Textblock_Node_Format *itr;
-   int use_end = 1;
-   int offset = end - start;
-   itr = n->format_node;
-
-   if (itr)
-     start -= itr->offset;
-   if (offset < 0) offset = 0;
-   if (end < 0) use_end = 0;
-   while (itr && (itr->text_node == n))
-     {
-        Evas_Object_Textblock_Node_Format *nnode;
-        int tmp_offset = 0;
-
-        /* start is negative when this gets relevant */
-        if ((offset + start < 0) && use_end)
-          {
-             break;
-          }
-        nnode = _NODE_FORMAT(EINA_INLIST_GET(itr)->next);
-        if (nnode)
-          {
-             tmp_offset = nnode->offset;
-          }
-        if (start <= 0)
-          {
-             /* Don't do visible adjustments because we are removing the visual
-              * chars anyway and taking those into account */
-             _evas_textblock_node_format_remove(o, itr, 0);
-          }
-        start -= tmp_offset;
-        itr = nnode;
-     }
-}
-
-/**
- * @internal
- * Returns the first format in the range between start and end in the textblock
- * n.
- *
- * @param o the textblock object.
- * @param n the text node the positinos refer to.
- * @param start the start of where to delete from.
- * @param end the end of the section to delete, if end == -1 it means the end of the string.
- */
-static Evas_Object_Textblock_Node_Format *
-_evas_textblock_node_text_get_first_format_between(
-      Evas_Object_Textblock_Node_Text *n, int start, int end)
-{
-   Evas_Object_Textblock_Node_Format *itr;
-   int use_end = 1;
-   itr = n->format_node;
-   if (end < 0) use_end = 0;
-   while (itr && (itr->text_node == n))
-     {
-        start -= itr->offset;
-        end -= itr->offset;
-        if ((end <= 0) && use_end)
-          {
-             break;
-          }
-        if (start <= 0)
-          {
-             return itr;
-          }
-        itr = _NODE_FORMAT(EINA_INLIST_GET(itr)->next);
-     }
-   return NULL;
-}
-
-/**
- * Removes a text node and the corresponding format nodes.
- *
- * @param o the textblock objec.t
- * @param n the node to remove.
- */
-static void
-_evas_textblock_node_text_remove(Evas_Object_Textblock *o, Evas_Object_Textblock_Node_Text *n)
-{
-   _evas_textblock_node_text_adjust_offsets_to_start(o, n, 0, -1);
-
-   o->text_nodes = _NODE_TEXT(eina_inlist_remove(
-           EINA_INLIST_GET(o->text_nodes), EINA_INLIST_GET(n)));
-   _evas_textblock_node_text_free(n);
-}
-
-/**
- * @internal
- * Return the position where the formats starts at.
- *
- * @param fmt the format to return the position of.
- * @return the position of the format in the text node it points to.
- */
-static size_t
-_evas_textblock_node_format_pos_get(const Evas_Object_Textblock_Node_Format *fmt)
-{
-   Evas_Object_Textblock_Node_Text *text;
-   Evas_Object_Textblock_Node_Format *base_format;
-   Evas_Object_Textblock_Node_Format *itr;
-   size_t position = 0;
-
-   if (!fmt) return 0;
-   /* Find the main format node */
-   text = fmt->text_node;
-   base_format = text->format_node;
-   EINA_INLIST_FOREACH(base_format, itr)
-     {
-        if (itr == fmt)
-          {
-             break;
-          }
-        position += itr->offset;
-     }
-   return position + fmt->offset;
-}
-
-EAPI int
-evas_textblock_cursor_pos_get(const Evas_Textblock_Cursor *cur)
-{
-   Evas_Object_Textblock *o;
-   Evas_Object_Textblock_Node_Text *n;
-   size_t npos = 0;
-
-   if (!cur) return -1;
-   if (!cur->node) return 0;
-   o = (Evas_Object_Textblock *)(cur->obj->object_data);
-   n = o->text_nodes;
-   while (n != cur->node)
-     {
-        npos += eina_ustrbuf_length_get(n->unicode);
-        n = _NODE_TEXT(EINA_INLIST_GET(n)->next);
-     }
-   return npos + cur->pos;
-}
-
-EAPI void
-evas_textblock_cursor_pos_set(Evas_Textblock_Cursor *cur, int _pos)
-{
-   Evas_Object_Textblock *o;
-   Evas_Object_Textblock_Node_Text *n;
-   size_t pos;
-
-   if (!cur) return;
-   o = (Evas_Object_Textblock *)(cur->obj->object_data);
-
-   if (_pos < 0)
-     {
-        pos = 0;
-     }
-   else
-     {
-        pos = (size_t) _pos;
-     }
-
-   n = o->text_nodes;
-   while (n && (pos >= eina_ustrbuf_length_get(n->unicode)))
-     {
-        pos -= eina_ustrbuf_length_get(n->unicode);
-        n = _NODE_TEXT(EINA_INLIST_GET(n)->next);
-     }
-
-   if (n)
-     {
-        cur->node = n;
-        cur->pos = pos;
-     }
-   else if (o->text_nodes)
-     {
-        /* In case we went pass the last node, we need to put the cursor
-         * at the absolute end. */
-        Evas_Object_Textblock_Node_Text *last_n;
-
-        last_n = _NODE_TEXT(EINA_INLIST_GET(o->text_nodes)->last);
-        pos = eina_ustrbuf_length_get(last_n->unicode);
-
-        cur->node = last_n;
-        cur->pos = pos;
-     }
-
-}
-
-EAPI Eina_Bool
-evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line)
-{
-   Evas_Object_Textblock *o;
-   Evas_Object_Textblock_Line *ln;
-   Evas_Object_Textblock_Item *it;
-
-   if (!cur) return EINA_FALSE;
-   o = (Evas_Object_Textblock *)(cur->obj->object_data);
-   if (!o->formatted.valid) _relayout(cur->obj);
-
-   ln = _find_layout_line_num(cur->obj, line);
-   if (!ln) return EINA_FALSE;
-   it = (Evas_Object_Textblock_Item *)ln->items;
-   if (it)
-     {
-        cur->pos = it->text_pos;
-        cur->node = it->text_node;
-     }
-   else
-     {
-        cur->pos = 0;
-
-        cur->node = o->text_nodes;
-     }
-   return EINA_TRUE;
-}
-
-EAPI int
-evas_textblock_cursor_compare(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2)
-{
-   Eina_Inlist *l1, *l2;
-
-   if (!cur1) return 0;
-   if (!cur2) return 0;
-   if (cur1->obj != cur2->obj) return 0;
-   if ((!cur1->node) || (!cur2->node)) return 0;
-   if (cur1->node == cur2->node)
-     {
-        if (cur1->pos < cur2->pos) return -1; /* cur1 < cur2 */
-        else if (cur1->pos > cur2->pos) return 1; /* cur2 < cur1 */
-        return 0;
-     }
-   for (l1 = EINA_INLIST_GET(cur1->node),
-        l2 = EINA_INLIST_GET(cur1->node); (l1) || (l2);)
-     {
-        if (l1 == EINA_INLIST_GET(cur2->node)) return 1; /* cur2 < cur 1 */
-        else if (l2 == EINA_INLIST_GET(cur2->node)) return -1; /* cur1 < cur 2 */
-        else if (!l1) return -1; /* cur1 < cur 2 */
-        else if (!l2) return 1; /* cur2 < cur 1 */
-        l1 = l1->prev;
-        l2 = l2->next;
-     }
-   return 0;
-}
-
-EAPI void
-evas_textblock_cursor_copy(const Evas_Textblock_Cursor *cur, Evas_Textblock_Cursor *cur_dest)
-{
-   if (!cur) return;
-   if (!cur_dest) return;
-   if (cur->obj != cur_dest->obj) return;
-   cur_dest->pos = cur->pos;
-   cur_dest->node = cur->node;
-
-}
-
-
-/* text controls */
-/**
- * @internal
- * Free a text node. Shouldn't be used usually, it's better to use
- * @ref _evas_textblock_node_text_remove for most cases .
- *
- * @param n the text node to free
- * @see _evas_textblock_node_text_remove
- */
-static void
-_evas_textblock_node_text_free(Evas_Object_Textblock_Node_Text *n)
-{
-   if (!n) return;
-   eina_ustrbuf_free(n->unicode);
-   if (n->utf8)
-     free(n->utf8);
-   if (n->par)
-      n->par->text_node = NULL;
-   free(n);
-}
-
-/**
- * @internal
- * Create a new text node
- *
- * @return the new text node.
- */
-static Evas_Object_Textblock_Node_Text *
-_evas_textblock_node_text_new(void)
-{
-   Evas_Object_Textblock_Node_Text *n;
-
-   n = calloc(1, sizeof(Evas_Object_Textblock_Node_Text));
-   n->unicode = eina_ustrbuf_new();
-   /* We want to layout each paragraph at least once. */
-   n->dirty = EINA_TRUE;
-   n->is_new = EINA_TRUE;
-
-   return n;
-}
-
-/**
- * @internal
- * Break a paragraph. This does not add a PS but only splits the paragraph
- * where a ps was just added!
- *
- * @param cur the cursor to break at.
- * @param fnode the format node of the PS just added.
- * @return Returns no value.
- */
-static void
-_evas_textblock_cursor_break_paragraph(Evas_Textblock_Cursor *cur,
-                              Evas_Object_Textblock_Node_Format *fnode)
-{
-   Evas_Object_Textblock *o;
-   Evas_Object_Textblock_Node_Text *n;
-
-   if (!cur) return;
-   o = (Evas_Object_Textblock *)(cur->obj->object_data);
-
-   n = _evas_textblock_node_text_new();
-   o->text_nodes = _NODE_TEXT(eina_inlist_append_relative(
-                   EINA_INLIST_GET(o->text_nodes),
-                   EINA_INLIST_GET(n),
-                   EINA_INLIST_GET(cur->node)));
-   /* Handle text and format changes. */
-   if (cur->node)
-     {
-        Evas_Object_Textblock_Node_Format *nnode;
-        size_t len, start;
-        const Eina_Unicode *text;
-
-        /* If there was a format node in the delete range,
-         * make it our format and update the text_node fields,
-         * otherwise, use the paragraph separator
-         * of the previous paragraph. */
-        nnode  = _NODE_FORMAT(EINA_INLIST_GET(fnode)->next);
-        if (nnode && (nnode->text_node == cur->node))
-          {
-             n->format_node = nnode;
-             nnode->offset--; /* We don't have to take the replacement char
-                                 into account anymore */
-             while (nnode && (nnode->text_node == cur->node))
-               {
-                  nnode->text_node = n;
-                  nnode = _NODE_FORMAT(EINA_INLIST_GET(nnode)->next);
-               }
-          }
-        else
-          {
-             n->format_node = fnode;
-          }
-
-        /* cur->pos now points to the PS, move after. */
-        start = cur->pos + 1;
-        len = eina_ustrbuf_length_get(cur->node->unicode) - start;
-        if (len > 0)
-          {
-             text = eina_ustrbuf_string_get(cur->node->unicode);
-             eina_ustrbuf_append_length(n->unicode, text + start, len);
-             eina_ustrbuf_remove(cur->node->unicode, start, start + len);
-             cur->node->dirty = EINA_TRUE;
-          }
-     }
-   else
-     {
-        fnode = o->format_nodes;
-        if (fnode)
-          {
-             fnode = _NODE_FORMAT(EINA_INLIST_GET(fnode)->last);
-          }
-        n->format_node = fnode;
-     }
-}
-
-/**
- * @internal
- * Set the node and offset of all the curs after cur.
- *
- * @param cur the cursor.
- * @param n the current textblock node.
- * @param new_node the new node to set.
- */
-static void
-_evas_textblock_cursors_set_node(Evas_Object_Textblock *o,
-      const Evas_Object_Textblock_Node_Text *n,
-      Evas_Object_Textblock_Node_Text *new_node)
-{
-   Eina_List *l;
-   Evas_Textblock_Cursor *data;
-
-   if (n == o->cursor->node)
-     {
-        o->cursor->pos = 0;
-        o->cursor->node = new_node;
-     }
-   EINA_LIST_FOREACH(o->cursors, l, data)
-     {
-        if (n == data->node)
-          {
-             data->pos = 0;
-             data->node = new_node;
-          }
-     }
-}
-
-/**
- * @internal
- * Update the offset of all the cursors after cur.
- *
- * @param cur the cursor.
- * @param n the current textblock node.
- * @param start the starting pos.
- * @param offset how much to adjust (can be negative).
- */
-static void
-_evas_textblock_cursors_update_offset(const Evas_Textblock_Cursor *cur,
-      const Evas_Object_Textblock_Node_Text *n,
-      size_t start, int offset)
-{
-   Eina_List *l;
-   Evas_Textblock_Cursor *data;
-   Evas_Object_Textblock *o;
-   o = (Evas_Object_Textblock *)(cur->obj->object_data);
-
-   if (cur != o->cursor)
-     {
-        if ((n == o->cursor->node) &&
-              (o->cursor->pos > start))
-          {
-             if ((offset < 0) && (o->cursor->pos <= (size_t) (-1 * offset)))
-               {
-                  o->cursor->pos = 0;
-               }
-             else
-               {
-                  o->cursor->pos += offset;
-               }
-          }
-     }
-   EINA_LIST_FOREACH(o->cursors, l, data)
-     {
-        if (data != cur)
-          {
-             if ((n == data->node) &&
-                   (data->pos > start))
-               {
-                  if ((offset < 0) && (data->pos <= (size_t) (-1 * offset)))
-                    {
-                       data->pos = 0;
-                    }
-                  else
-                    {
-                       data->pos += offset;
-                    }
-               }
-             else if (!data->node)
-               {
-                  data->node = o->text_nodes;
-                  data->pos = 0;
-               }
-          }
-     }
-}
-
-/**
- * @internal
- * Mark that the textblock has changed.
- *
- * @param o the textblock object.
- * @param obj the evas object.
- */
-static void
-_evas_textblock_changed(Evas_Object_Textblock *o, Evas_Object *obj)
-{
-   o->formatted.valid = 0;
-   o->native.valid = 0;
-   o->content_changed = 1;
-   if (o->markup_text)
-     {
-        free(o->markup_text);
-        o->markup_text = NULL;
-     }
-
-   evas_object_change(obj);
-}
-
-static void
-_evas_textblock_invalidate_all(Evas_Object_Textblock *o)
-{
-   Evas_Object_Textblock_Node_Text *n;
-
-   EINA_INLIST_FOREACH(o->text_nodes, n)
-     {
-        n->dirty = EINA_TRUE;
-     }
-}
-
-EAPI int
-evas_textblock_cursor_text_append(Evas_Textblock_Cursor *cur, const char *_text)
-{
-   Evas_Object_Textblock *o;
-   Evas_Object_Textblock_Node_Text *n;
-   Evas_Object_Textblock_Node_Format *fnode = NULL;
-   Eina_Unicode *text;
-   int len = 0;
-
-   if (!cur) return 0;
-   text = eina_unicode_utf8_to_unicode(_text, &len);
-   o = (Evas_Object_Textblock *)(cur->obj->object_data);
-
-   n = cur->node;
-   if (n)
-     {
-        Evas_Object_Textblock_Node_Format *nnode;
-        fnode = _evas_textblock_cursor_node_format_before_or_at_pos_get(cur);
-        fnode = _evas_textblock_node_format_last_at_off(fnode);
-        /* find the node after the current in the same paragraph
-         * either we find one and then take the next, or we try to get
-         * the first for the paragraph which must be after our position  */
-        if (fnode)
-          {
-             if (!evas_textblock_cursor_format_is_visible_get(cur))
-               {
-                  nnode = _NODE_FORMAT(EINA_INLIST_GET(fnode)->next);
-                  if (nnode && (nnode->text_node == n))
-                    {
-                       fnode = nnode;
-                    }
-                  else
-                    {
-                       fnode = NULL;
-                    }
-               }
-          }
-        else
-          {
-             fnode = n->format_node;
-          }
-     }
-   else if (o->text_nodes)
-     {
-        n = cur->node = o->text_nodes;
-        cur->pos = 0;
-     }
-   else
-     {
-        n = _evas_textblock_node_text_new();
-        o->text_nodes = _NODE_TEXT(eina_inlist_append(
-                   EINA_INLIST_GET(o->text_nodes),
-                   EINA_INLIST_GET(n)));
-        cur->node = n;
-     }
-
-   eina_ustrbuf_insert_length(n->unicode, text, len, cur->pos);
-   /* Advance the formats */
-   if (fnode && (fnode->text_node == cur->node))
-     fnode->offset += len;
-
-   /* Update all the cursors after our position. */
-   _evas_textblock_cursors_update_offset(cur, cur->node, cur->pos, len);
-
-   _evas_textblock_changed(o, cur->obj);
-   n->dirty = EINA_TRUE;
-   free(text);
-
-   if (!o->cursor->node)
-      o->cursor->node = o->text_nodes;
-   return len;
-}
-
-EAPI int
-evas_textblock_cursor_text_prepend(Evas_Textblock_Cursor *cur, const char *_text)
-{
-   int len;
-   /*append is essentially prepend without advancing */
-   len = evas_textblock_cursor_text_append(cur, _text);
-   cur->pos += len; /*Advance */
-   return len;
-}
-
-/**
- * @internal
- * Free a format node
- *
- * @param o the textblock object
- * @param n the format node to free
- */
-static void
-_evas_textblock_node_format_free(Evas_Object_Textblock *o,
-      Evas_Object_Textblock_Node_Format *n)
-{
-   if (!n) return;
-   eina_stringshare_del(n->format);
-   eina_stringshare_del(n->orig_format);
-   if (n->anchor == ANCHOR_ITEM)
-      o->anchors_item = eina_list_remove(o->anchors_item, n);
-   else if (n->anchor == ANCHOR_A)
-      o->anchors_a = eina_list_remove(o->anchors_a, n);
-   free(n);
-}
-
-/**
- * @internal
- * Create a new format node.
- *
- * @param format the text to create the format node from.
- * @param o the textblock object.
- * @return Returns the new format node
- */
-static Evas_Object_Textblock_Node_Format *
-_evas_textblock_node_format_new(Evas_Object_Textblock *o, const char *_format)
-{
-   Evas_Object_Textblock_Node_Format *n;
-   const char *format = _format;
-   const char *pre_stripped_format = NULL;
-
-   n = calloc(1, sizeof(Evas_Object_Textblock_Node_Format));
-   /* Create orig_format and format */
-   if (format[0] == '<')
-     {
-        const char *match;
-        size_t format_len;
-        size_t replace_len;
-
-        format++; /* Advance after '<' */
-        format_len = strlen(format);
-        if ((format_len > 0) && format[format_len - 1] == '>')
-          {
-             format_len--; /* We don't care about '>' */
-             /* Check if it closes itself. Skip the </> case. */
-             if ((format_len > 1) && format[format_len - 1] == '/')
-               {
-                  format_len--; /* We don't care about '/' */
-                  n->own_closer = EINA_TRUE;
-               }
-          }
-
-        if (!o->style_user || !(match = _style_match_tag(o->style_user, format,
-                    format_len, &replace_len)))
-          {
-             match = _style_match_tag(o->style, format, format_len,
-                   &replace_len);
-          }
-
-        if (match)
-          {
-             if (match[0] != '-')
-               {
-                  n->opener = EINA_TRUE;
-                  if (match[0] != '+')
-                    {
-                       n->own_closer = EINA_TRUE;
-                    }
-               }
-
-             pre_stripped_format = match;
-          }
-        else
-          {
-             if (format[0] == '/')
-               {
-                  format++;
-                  format_len--;
-               }
-             else
-               {
-                  n->opener = EINA_TRUE;
-               }
-          }
-
-        n->orig_format = eina_stringshare_add_length(format, format_len);
-
-        if (!pre_stripped_format)
-           pre_stripped_format = n->orig_format;
-     }
-   /* Just use as is, it's a special format. */
-   else
-     {
-        const char *tmp = format;
-        if (format[0] != '-')
-          {
-             n->opener = EINA_TRUE;
-             if (format[0] != '+')
-               {
-                  n->own_closer = EINA_TRUE;
-               }
-          }
-        if ((*tmp == '+') || (*tmp == '-'))
-          {
-             tmp++;
-             while (*tmp == ' ') tmp++;
-          }
-        n->orig_format = eina_stringshare_add(tmp);
-        pre_stripped_format = n->orig_format;
-     }
-
-   /* Strip format */
-     {
-        const char *tmp = pre_stripped_format;
-        if ((*tmp == '+') || (*tmp == '-'))
-          {
-             tmp++;
-             while (*tmp == ' ') tmp++;
-          }
-        n->format = eina_stringshare_add(tmp);
-     }
-   format = n->format;
-
-   _evas_textblock_format_is_visible(n, format);
-   if (n->anchor == ANCHOR_A)
-     {
-        o->anchors_a = eina_list_append(o->anchors_a, n);
-     }
-   else if (n->anchor == ANCHOR_ITEM)
-     {
-        o->anchors_item = eina_list_append(o->anchors_item, n);
-     }
-   n->is_new = EINA_TRUE;
-
-   return n;
-}
-
-static Eina_Bool
-_evas_textblock_cursor_is_at_the_end(const Evas_Textblock_Cursor *cur)
-{
-   const Eina_Unicode *text;
-
-   if (!cur) return EINA_FALSE;
-   if (!cur->node) return EINA_FALSE;
-   text = eina_ustrbuf_string_get(cur->node->unicode);
-   return ((text[cur->pos] == 0) && (!EINA_INLIST_GET(cur->node)->next)) ?
-              EINA_TRUE : EINA_FALSE;
-}
-
-EAPI Eina_Bool
-evas_textblock_cursor_format_append(Evas_Textblock_Cursor *cur, const char *format)
-{
-   Evas_Object_Textblock *o;
-   Evas_Object_Textblock_Node_Format *n;
-   Eina_Bool is_visible;
-
-   if (!cur) return EINA_FALSE;
-   if ((!format) || (format[0] == 0)) return EINA_FALSE;
-   o = (Evas_Object_Textblock *)(cur->obj->object_data);
-   /* We should always have at least one text node */
-   if (!o->text_nodes)
-     {
-        evas_textblock_cursor_text_prepend(cur, "");
-     }
-
-   n = _evas_textblock_node_format_new(o, format);
-   is_visible = n->visible;
-   format = n->format;
-   if (!cur->node)
-     {
-        o->format_nodes = _NODE_FORMAT(eina_inlist_append(
-                 EINA_INLIST_GET(o->format_nodes),
-                 EINA_INLIST_GET(n)));
-        cur->pos = 0;
-        n->text_node = (EINA_INLIST_GET(n)->prev) ?
-           _NODE_FORMAT(EINA_INLIST_GET(n)->prev)->text_node :
-           o->text_nodes;
-        cur->node = n->text_node;
-     }
-   else
-     {
-        Evas_Object_Textblock_Node_Format *fmt;
-        fmt = _evas_textblock_cursor_node_format_before_or_at_pos_get(cur);
-        n->text_node = cur->node;
-        if (!fmt)
-          {
-             o->format_nodes = _NODE_FORMAT(eina_inlist_prepend(
-                      EINA_INLIST_GET(o->format_nodes),
-                      EINA_INLIST_GET(n)));
-             n->offset = cur->pos;
-          }
-        else
-          {
-             if (evas_textblock_cursor_format_is_visible_get(cur))
-               {
-                  o->format_nodes = _NODE_FORMAT(eina_inlist_prepend_relative(
-                           EINA_INLIST_GET(o->format_nodes),
-                           EINA_INLIST_GET(n),
-                           EINA_INLIST_GET(fmt)
-                           ));
-                  n->offset = fmt->offset;
-                  if (fmt->text_node->format_node == fmt)
-                    {
-                       fmt->text_node->format_node = n;
-                    }
-               }
-             else
-               {
-                  fmt = _evas_textblock_node_format_last_at_off(fmt);
-                  o->format_nodes = _NODE_FORMAT(eina_inlist_append_relative(
-                           EINA_INLIST_GET(o->format_nodes),
-                           EINA_INLIST_GET(n),
-                           EINA_INLIST_GET(fmt)
-                           ));
-                  if (fmt->text_node != cur->node)
-                    {
-                       n->offset = cur->pos;
-                    }
-                  else
-                    {
-                       n->offset = cur->pos -
-                          _evas_textblock_node_format_pos_get(fmt);
-                    }
-               }
-          }
-        /* Adjust differently if we insert a format char */
-        if (is_visible)
-          {
-             _evas_textblock_node_format_adjust_offset(o, cur->node, n,
-                   -(n->offset - 1));
-          }
-        else
-          {
-             _evas_textblock_node_format_adjust_offset(o, cur->node, n,
-                   -n->offset);
-          }
-
-        if (!fmt || (fmt->text_node != cur->node))
-          {
-             cur->node->format_node = n;
-          }
-     }
-   if (is_visible && cur->node)
-     {
-        Eina_Unicode insert_char;
-        /* Insert a visual representation according to the type of the
-           format */
-        if (_IS_PARAGRAPH_SEPARATOR(o, format))
-           insert_char = _PARAGRAPH_SEPARATOR;
-        else if (_IS_LINE_SEPARATOR(format))
-           insert_char = _NEWLINE;
-        else if (_IS_TAB(format))
-           insert_char = _TAB;
-        else
-           insert_char = _REPLACEMENT_CHAR;
-
-        eina_ustrbuf_insert_char(cur->node->unicode, insert_char, cur->pos);
-
-        /* Advance all the cursors after our cursor */
-        _evas_textblock_cursors_update_offset(cur, cur->node, cur->pos, 1);
-        if (_IS_PARAGRAPH_SEPARATOR(o, format))
-          {
-             _evas_textblock_cursor_break_paragraph(cur, n);
-          }
-        else
-          {
-             /* Handle visible format nodes here */
-             cur->node->dirty = EINA_TRUE;
-             n->is_new = EINA_FALSE;
-          }
-     }
-   else
-     {
-        o->format_changed = EINA_TRUE;
-     }
-
-   _evas_textblock_changed(o, cur->obj);
-
-   if (!o->cursor->node)
-      o->cursor->node = o->text_nodes;
-   return is_visible;
-}
-
-EAPI Eina_Bool
-evas_textblock_cursor_format_prepend(Evas_Textblock_Cursor *cur, const char *format)
-{
-   Eina_Bool is_visible;
-   /* append is essentially prepend without advancing */
-   is_visible = evas_textblock_cursor_format_append(cur, format);
-   if (is_visible)
-     {
-        /* Advance after the replacement char */
-        evas_textblock_cursor_char_next(cur);
-     }
-
-   return is_visible;
-}
-
-
-EAPI void
-evas_textblock_cursor_char_delete(Evas_Textblock_Cursor *cur)
-{
-   Evas_Object_Textblock *o;
-   Evas_Object_Textblock_Node_Text *n, *n2;
-   const Eina_Unicode *text;
-   int chr, ind, ppos;
-
-   if (!cur || !cur->node) return;
-   o = (Evas_Object_Textblock *)(cur->obj->object_data);
-   n = cur->node;
-
-   text = eina_ustrbuf_string_get(n->unicode);
-   ind = cur->pos;
-   if (text[ind])
-      chr = text[ind++];
-   else
-      chr = 0;
-
-   if (chr == 0) return;
-   ppos = cur->pos;
-   eina_ustrbuf_remove(n->unicode, cur->pos, ind);
-   /* Remove a format node if needed, and remove the char only if the
-    * fmt node is not visible */
-     {
-        Eina_Bool should_merge = EINA_FALSE;
-        Evas_Object_Textblock_Node_Format *fmt, *fmt2;
-        fmt = _evas_textblock_cursor_node_format_at_pos_get(cur);
-        if (fmt)
-          {
-             const char *format = NULL;
-             Evas_Object_Textblock_Node_Format *last_fmt;
-             /* If there's a PS it must be the last become it delimits paragraphs */
-             last_fmt = _evas_textblock_node_format_last_at_off(fmt);
-             format = last_fmt->format;
-             if (format && _IS_PARAGRAPH_SEPARATOR(o, format))
-               {
-                  /* If it was a paragraph separator, we should merge the
-                   * current with the next, there must be a next. */
-                  should_merge = EINA_TRUE;
-               }
-             /* If a singnular, mark as invisible, so we'll delete it. */
-             if (!format || last_fmt->own_closer)
-               {
-                  last_fmt->visible = EINA_FALSE;
-               }
-          }
-
-        fmt2 = _evas_textblock_cursor_node_format_before_or_at_pos_get(cur);
-        fmt2 = _evas_textblock_node_format_last_at_off(fmt2);
-        _evas_textblock_node_format_adjust_offset(o, cur->node, fmt2,
-              -(ind - cur->pos));
-
-        if (should_merge)
-          {
-             _evas_textblock_cursor_nodes_merge(cur);
-          }
-
-        _evas_textblock_node_format_remove_matching(o, fmt);
-     }
-
-   if (cur->pos == eina_ustrbuf_length_get(n->unicode))
-     {
-        n2 = _NODE_TEXT(EINA_INLIST_GET(n)->next);
-        if (n2)
-          {
-             cur->node = n2;
-             cur->pos = 0;
-          }
-     }
-
-   _evas_textblock_cursors_update_offset(cur, n, ppos, -(ind - ppos));
-   _evas_textblock_changed(o, cur->obj);
-   cur->node->dirty = EINA_TRUE;
-}
-
-EAPI void
-evas_textblock_cursor_range_delete(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2)
-{
-   Evas_Object_Textblock_Node_Format *fnode = NULL;
-   Evas_Object_Textblock *o;
-   Evas_Object_Textblock_Node_Text *n1, *n2;
-   Eina_Bool should_merge = EINA_FALSE, reset_cursor = EINA_FALSE;
-
-   if (!cur1 || !cur1->node) return;
-   if (!cur2 || !cur2->node) return;
-   if (cur1->obj != cur2->obj) return;
-   o = (Evas_Object_Textblock *)(cur1->obj->object_data);
-   if (evas_textblock_cursor_compare(cur1, cur2) > 0)
-     {
-        Evas_Textblock_Cursor *tc;
-
-        tc = cur1;
-        cur1 = cur2;
-        cur2 = tc;
-     }
-   n1 = cur1->node;
-   n2 = cur2->node;
-   if ((evas_textblock_cursor_compare(o->cursor, cur1) >= 0) &&
-         (evas_textblock_cursor_compare(cur2, o->cursor) >= 0))
-     {
-        reset_cursor = EINA_TRUE;
-     }
-
-
-   if (n1 == n2)
-     {
-        if ((cur1->pos == 0) &&
-              (cur2->pos == eina_ustrbuf_length_get(n1->unicode)))
-          {
-             _evas_textblock_node_text_remove_formats_between(o, n1, 0, -1);
-          }
-        else
-          {
-             should_merge = _evas_textblock_node_text_adjust_offsets_to_start(o,
-                   n1, cur1->pos, cur2->pos);
-          }
-        eina_ustrbuf_remove(n1->unicode, cur1->pos, cur2->pos);
-        _evas_textblock_cursors_update_offset(cur1, cur1->node, cur1->pos, - (cur2->pos - cur1->pos));
-     }
-   else
-     {
-        Evas_Object_Textblock_Node_Text *n;
-        int len;
-        _evas_textblock_node_text_adjust_offsets_to_start(o, n1, cur1->pos, -1);
-        n = _NODE_TEXT(EINA_INLIST_GET(n1)->next);
-        /* Remove all the text nodes between */
-        while (n && (n != n2))
-          {
-             Evas_Object_Textblock_Node_Text *nnode;
-
-             nnode = _NODE_TEXT(EINA_INLIST_GET(n)->next);
-             _evas_textblock_cursors_set_node(o, n, n1);
-             _evas_textblock_node_text_remove(o, n);
-             n = nnode;
-          }
-        should_merge = _evas_textblock_node_text_adjust_offsets_to_start(o, n2,
-              0, cur2->pos);
-
-        /* Remove the formats and the strings in the first and last nodes */
-        len = eina_ustrbuf_length_get(n1->unicode);
-        eina_ustrbuf_remove(n1->unicode, cur1->pos, len);
-        eina_ustrbuf_remove(n2->unicode, 0, cur2->pos);
-        /* Merge the nodes because we removed the PS */
-        _evas_textblock_cursors_update_offset(cur1, cur1->node, cur1->pos,
-              - cur1->pos);
-        _evas_textblock_cursors_update_offset(cur2, cur2->node, 0, - cur2->pos);
-        _evas_textblock_nodes_merge(o, n1);
-     }
-   fnode = _evas_textblock_cursor_node_format_at_pos_get(cur1);
-
-   n1->dirty = n2->dirty = EINA_TRUE;
-   if (should_merge)
-     {
-        /* We call this function instead of the cursor one because we already
-         * updated the cursors */
-        _evas_textblock_nodes_merge(o, n1);
-     }
-   _evas_textblock_node_format_remove_matching(o, fnode);
-
-   evas_textblock_cursor_copy(cur1, cur2);
-   if (reset_cursor)
-     evas_textblock_cursor_copy(cur1, o->cursor);
-
-   _evas_textblock_changed(o, cur1->obj);
-}
-
-
-EAPI char *
-evas_textblock_cursor_content_get(const Evas_Textblock_Cursor *cur)
-{
-   if (!cur || !cur->node) return NULL;
-   if (evas_textblock_cursor_format_is_visible_get(cur))
-     {
-        Eina_Strbuf *buf;
-        Evas_Object_Textblock_Node_Format *fnode;
-        char *ret;
-        fnode = _evas_textblock_node_visible_at_pos_get(
-                 evas_textblock_cursor_format_get(cur));
-
-        buf = eina_strbuf_new();
-        _markup_get_format_append(buf, fnode);
-        ret = eina_strbuf_string_steal(buf);
-        eina_strbuf_free(buf);
-
-        return ret;
-     }
-   else
-     {
-        const Eina_Unicode *ustr;
-        Eina_Unicode buf[2];
-        char *s;
-
-        ustr = eina_ustrbuf_string_get(cur->node->unicode);
-        buf[0] = ustr[cur->pos];
-        buf[1] = 0;
-        s = eina_unicode_unicode_to_utf8(buf, NULL);
-
-        return s;
-     }
-}
-
-static char *
-_evas_textblock_cursor_range_text_markup_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *_cur2)
-{
-   Evas_Object_Textblock_Node_Text *tnode;
-   Eina_Strbuf *buf;
-   Evas_Textblock_Cursor *cur2;
-   buf = eina_strbuf_new();
-
-   if (!cur1 || !cur1->node) return NULL;
-   if (!_cur2 || !_cur2->node) return NULL;
-   if (cur1->obj != _cur2->obj) return NULL;
-   if (evas_textblock_cursor_compare(cur1, _cur2) > 0)
-     {
-        const Evas_Textblock_Cursor *tc;
-
-        tc = cur1;
-        cur1 = _cur2;
-        _cur2 = tc;
-     }
-   /* Work on a local copy of the cur */
-   cur2 = alloca(sizeof(Evas_Textblock_Cursor));
-   cur2->obj = _cur2->obj;
-   evas_textblock_cursor_copy(_cur2, cur2);
-
-   /* Parse the text between the cursors. */
-   for (tnode = cur1->node ; tnode ;
-         tnode = _NODE_TEXT(EINA_INLIST_GET(tnode)->next))
-     {
-        Evas_Object_Textblock_Node_Format *fnode;
-        Eina_Unicode *text_base, *text;
-        int off = 0;
-
-        text_base = text =
-           eina_unicode_strndup(eina_ustrbuf_string_get(tnode->unicode),
-                                eina_ustrbuf_length_get(tnode->unicode));
-        if (tnode == cur2->node)
-          {
-             fnode = _evas_textblock_node_text_get_first_format_between(tnode,
-                   cur1->pos, cur2->pos);
-          }
-        else if (tnode == cur1->node)
-          {
-             fnode = _evas_textblock_node_text_get_first_format_between(tnode,
-                   cur1->pos, -1);
-          }
-        else
-          {
-             fnode = _evas_textblock_node_text_get_first_format_between(tnode,
-                   0, -1);
-          }
-        /* Init the offset so the first one will count starting from cur1->pos
-         * and not the previous format node */
-        if (tnode == cur1->node)
-          {
-             if (fnode)
-               {
-                  off = _evas_textblock_node_format_pos_get(fnode) -
-                     cur1->pos - fnode->offset;
-               }
-             text += cur1->pos;
-          }
-        else
-          {
-             off = 0;
-          }
-        while (fnode && (fnode->text_node == tnode))
-          {
-             Eina_Unicode tmp_ch;
-             off += fnode->offset;
-             if ((tnode == cur2->node) &&
-                   ((size_t) (text - text_base + off) >= cur2->pos))
-               {
-                  break;
-               }
-             /* No need to skip on the first run */
-             tmp_ch = text[off];
-             text[off] = 0; /* Null terminate the part of the string */
-             _markup_get_text_append(buf, text);
-             _markup_get_format_append(buf, fnode);
-             text[off] = tmp_ch; /* Restore the char */
-             text += off;
-             if (fnode->visible)
-               {
-                  off = -1;
-                  text++;
-               }
-             else
-               {
-                  off = 0;
-               }
-             fnode = _NODE_FORMAT(EINA_INLIST_GET(fnode)->next);
-          }
-        /* If we got to the last node, stop and add the rest outside */
-        if (cur2->node == tnode)
-          {
-             /* Add the rest, skip replacement */
-             /* Don't go past the second cursor pos */
-             text_base[cur2->pos] = '\0';
-             _markup_get_text_append(buf, text);
-             free(text_base);
-             break;
-          }
-        else
-          {
-             /* Add the rest, skip replacement */
-             _markup_get_text_append(buf, text);
-             free(text_base);
-          }
-     }
-   /* return the string */
-     {
-        char *ret;
-        ret = eina_strbuf_string_steal(buf);
-        eina_strbuf_free(buf);
-        return ret;
-     }
-}
-
-static char *
-_evas_textblock_cursor_range_text_plain_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *_cur2)
-{
-   Eina_UStrbuf *buf;
-   Evas_Object_Textblock_Node_Text *n1, *n2;
-   Evas_Textblock_Cursor *cur2;
-
-   buf = eina_ustrbuf_new();
-
-   if (!cur1 || !cur1->node) return NULL;
-   if (!_cur2 || !_cur2->node) return NULL;
-   if (cur1->obj != _cur2->obj) return NULL;
-   if (evas_textblock_cursor_compare(cur1, _cur2) > 0)
-     {
-        const Evas_Textblock_Cursor *tc;
-
-        tc = cur1;
-        cur1 = _cur2;
-        _cur2 = tc;
-     }
-   n1 = cur1->node;
-   n2 = _cur2->node;
-   /* Work on a local copy of the cur */
-   cur2 = alloca(sizeof(Evas_Textblock_Cursor));
-   cur2->obj = _cur2->obj;
-   evas_textblock_cursor_copy(_cur2, cur2);
-
-
-   if (n1 == n2)
-     {
-        const Eina_Unicode *tmp;
-        tmp = eina_ustrbuf_string_get(n1->unicode);
-        eina_ustrbuf_append_length(buf, tmp + cur1->pos, cur2->pos - cur1->pos);
-     }
-   else
-     {
-        const Eina_Unicode *tmp;
-        tmp = eina_ustrbuf_string_get(n1->unicode);
-        eina_ustrbuf_append(buf, tmp + cur1->pos);
-        n1 = _NODE_TEXT(EINA_INLIST_GET(n1)->next);
-        while (n1 != n2)
-          {
-             tmp = eina_ustrbuf_string_get(n1->unicode);
-             eina_ustrbuf_append_length(buf, tmp,
-                   eina_ustrbuf_length_get(n1->unicode));
-             n1 = _NODE_TEXT(EINA_INLIST_GET(n1)->next);
-          }
-        tmp = eina_ustrbuf_string_get(n2->unicode);
-        eina_ustrbuf_append_length(buf, tmp, cur2->pos);
-     }
-
-   /* Free and return */
-     {
-        char *ret;
-        ret = eina_unicode_unicode_to_utf8(eina_ustrbuf_string_get(buf), NULL);
-        eina_ustrbuf_free(buf);
-        return ret;
-     }
-}
-
-EAPI Eina_List *
-evas_textblock_cursor_range_formats_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2)
-{
-   Evas_Object *obj = cur1->obj;
-   Eina_List *ret = NULL;
-   Evas_Object_Textblock_Node_Text *n1, *n2;
-   Evas_Object_Textblock_Node_Format *first, *last;
-   TB_HEAD_RETURN(NULL);
-   if (!cur1 || !cur1->node) return NULL;
-   if (!cur2 || !cur2->node) return NULL;
-   if (cur1->obj != cur2->obj) return NULL;
-   if (evas_textblock_cursor_compare(cur1, cur2) > 0)
-     {
-        const Evas_Textblock_Cursor *tc;
-
-        tc = cur1;
-        cur1 = cur2;
-        cur2 = tc;
-     }
-   n1 = cur1->node;
-   n2 = cur2->node;
-
-   /* FIXME: Change first and last getting to format_before_or_at_pos_get */
-
-   last = n2->format_node;
-
-   /* If n2->format_node is NULL, we don't have formats in the tb/range. */
-   if (!last)
-      return NULL;
-   /* If the found format is on our text node, we should go to the last
-    * one, otherwise, the one we found is good enough. */
-   if (last->text_node == n2)
-     {
-        Evas_Object_Textblock_Node_Format *fnode = last;
-        while (fnode && (fnode->text_node == n2))
-          {
-             last = fnode;
-             fnode = _NODE_FORMAT(EINA_INLIST_GET(fnode)->next);
-          }
-     }
-
-   /* If the first format node is within the range (i.e points to n1) or if
-    * we have other formats in the range, go through them */
-   first = n1->format_node;
-   if ((first->text_node == n1) || (first != last))
-     {
-        Evas_Object_Textblock_Node_Format *fnode = first;
-        /* Go to the first one in the range */
-        if (first->text_node != n1)
-          {
-             first = _NODE_FORMAT(EINA_INLIST_GET(first)->next);
-          }
-
-        while (fnode)
-          {
-             ret = eina_list_append(ret, fnode);
-             if (fnode == last)
-                break;
-             fnode = _NODE_FORMAT(EINA_INLIST_GET(fnode)->next);
-          }
-     }
-
-   return ret;
-
-}
-
-EAPI char *
-evas_textblock_cursor_range_text_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2, Evas_Textblock_Text_Type format)
-{
-   if (format == EVAS_TEXTBLOCK_TEXT_MARKUP)
-      return _evas_textblock_cursor_range_text_markup_get(cur1, cur2);
-   else if (format == EVAS_TEXTBLOCK_TEXT_PLAIN)
-      return _evas_textblock_cursor_range_text_plain_get(cur1, cur2);
-   else
-      return NULL; /* Not yet supported */
-}
-
-EAPI const char *
-evas_textblock_cursor_paragraph_text_get(const Evas_Textblock_Cursor *cur)
-{
-   Evas_Textblock_Cursor cur1, cur2;
-   if (!cur) return NULL;
-   if (!cur->node) return NULL;
-   if (cur->node->utf8)
-     {
-        free(cur->node->utf8);
-     }
-   cur1.obj = cur2.obj = cur->obj;
-   cur1.node = cur2.node = cur->node;
-   evas_textblock_cursor_paragraph_char_first(&cur1);
-   evas_textblock_cursor_paragraph_char_last(&cur2);
-
-   cur->node->utf8 = evas_textblock_cursor_range_text_get(&cur1, &cur2,
-         EVAS_TEXTBLOCK_TEXT_MARKUP);
-   return cur->node->utf8;
-}
-
-EAPI int
-evas_textblock_cursor_paragraph_text_length_get(const Evas_Textblock_Cursor *cur)
-{
-   int len;
-   if (!cur) return -1;
-   if (!cur->node) return -1;
-   len = eina_ustrbuf_length_get(cur->node->unicode);
-
-   if (EINA_INLIST_GET(cur->node)->next)
-      return len - 1; /* Remove the paragraph separator */
-   else
-      return len;
-}
-
-EAPI const Evas_Object_Textblock_Node_Format *
-evas_textblock_cursor_format_get(const Evas_Textblock_Cursor *cur)
-{
-   if (!cur) return NULL;
-   if (!cur->node) return NULL;
-   return _evas_textblock_cursor_node_format_at_pos_get(cur);
-}
-
-EAPI const char *
-evas_textblock_node_format_text_get(const Evas_Object_Textblock_Node_Format *fmt)
-{
-   static char *ret = NULL;
-   char *tmp;
-
-   if (!fmt) return NULL;
-
-   if (ret) free(ret);
-   ret = malloc(strlen(fmt->orig_format) + 2 + 1);
-   tmp = ret;
-
-   if (fmt->opener && !fmt->own_closer)
-     {
-        *(tmp++) = '+';
-        *(tmp++) = ' ';
-     }
-   else if (!fmt->opener)
-     {
-        *(tmp++) = '-';
-        *(tmp++) = ' ';
-     }
-   strcpy(tmp, fmt->orig_format);
-   return ret;
-}
-
-EAPI void
-evas_textblock_cursor_at_format_set(Evas_Textblock_Cursor *cur, const Evas_Object_Textblock_Node_Format *fmt)
-{
-   if (!fmt || !cur) return;
-   cur->node = fmt->text_node;
-   cur->pos = _evas_textblock_node_format_pos_get(fmt);
-}
-
-EAPI Eina_Bool
-evas_textblock_cursor_format_is_visible_get(const Evas_Textblock_Cursor *cur)
-{
-   const Eina_Unicode *text;
-
-   if (!cur) return EINA_FALSE;
-   if (!cur->node) return EINA_FALSE;
-   if (!evas_textblock_cursor_is_format(cur)) return EINA_FALSE;
-   text = eina_ustrbuf_string_get(cur->node->unicode);
-   return EVAS_TEXTBLOCK_IS_VISIBLE_FORMAT_CHAR(text[cur->pos]);
-}
-
-EAPI int
-evas_textblock_cursor_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch, Evas_BiDi_Direction *dir, Evas_Textblock_Cursor_Type ctype)
-{
-   int ret = -1;
-   const Evas_Textblock_Cursor *dir_cur;
-   Evas_Textblock_Cursor cur2;
-   Evas_Object_Textblock *o;
-   o = (Evas_Object_Textblock *)(cur->obj->object_data);
-   if (!o->formatted.valid) _relayout(cur->obj);
-
-   dir_cur = cur;
-   if (ctype == EVAS_TEXTBLOCK_CURSOR_UNDER)
-     {
-        ret = evas_textblock_cursor_pen_geometry_get(cur, cx, cy, cw, ch);
-     }
-   else if (ctype == EVAS_TEXTBLOCK_CURSOR_BEFORE)
-     {
-        /* In the case of a "before cursor", we should get the coordinates
-         * of just after the previous char (which in bidi text may not be
-         * just before the current char). */
-        Evas_Coord x, y, h, w;
-        Evas_Object_Textblock_Node_Format *fmt;
-
-        /* If it's at the end of the line, we want to get the position, not
-         * the position of the previous */
-        if ((cur->pos > 0) && !_evas_textblock_cursor_is_at_the_end(cur))
-          {
-#ifdef BIDI_SUPPORT
-             Eina_Bool before_char = EINA_FALSE;
-#endif
-             cur2.obj = cur->obj;
-             evas_textblock_cursor_copy(cur, &cur2);
-             evas_textblock_cursor_char_prev(&cur2);
-
-             fmt = _evas_textblock_cursor_node_format_at_pos_get(&cur2);
-
-             if (!fmt || !_IS_LINE_SEPARATOR(fmt->format))
-               {
-                  dir_cur = &cur2;
-#ifdef BIDI_SUPPORT
-                  before_char = EINA_FALSE;
-#endif
-               }
-#ifdef BIDI_SUPPORT
-             else
-               {
-                  before_char = EINA_TRUE;
-               }
-#endif
-             ret = evas_textblock_cursor_pen_geometry_get(
-                   dir_cur, &x, &y, &w, &h);
-#ifdef BIDI_SUPPORT
-             /* Adjust if the char is an rtl char */
-             if (ret >= 0)
-               {
-                  Eina_Bool is_rtl = EINA_FALSE;
-                  if (dir_cur->node->par->is_bidi)
-                    {
-                       Evas_Object_Textblock_Line *ln;
-                       Evas_Object_Textblock_Item *it;
-                       _find_layout_item_match(dir_cur, &ln, &it);
-                       if ((it->type == EVAS_TEXTBLOCK_ITEM_TEXT) &&
-                             (_ITEM_TEXT(it)->text_props.bidi.dir ==
-                              EVAS_BIDI_DIRECTION_RTL))
-                          is_rtl = EINA_TRUE;
-                       else if ((it->type == EVAS_TEXTBLOCK_ITEM_FORMAT) &&
-                             (_ITEM_FORMAT(it)->bidi_dir ==
-                              EVAS_BIDI_DIRECTION_RTL))
-                          is_rtl = EINA_TRUE;
-                    }
-
-                  if ((!before_char && is_rtl) ||
-                        (before_char && !is_rtl))
-                    {
-                       /* Just don't advance the width */
-                       w = 0;
-                    }
-               }
-#endif
-          }
-        else if (cur->pos == 0)
-          {
-             ret = evas_textblock_cursor_pen_geometry_get(
-                   dir_cur, &x, &y, &w, &h);
-#ifdef BIDI_SUPPORT
-             Eina_Bool is_rtl = EINA_FALSE;
-             if (dir_cur->node && dir_cur->node->par->is_bidi)
-               {
-                  Evas_Object_Textblock_Line *ln;
-                  Evas_Object_Textblock_Item *it;
-                  _find_layout_item_match(dir_cur, &ln, &it);
-                  if ((it->type == EVAS_TEXTBLOCK_ITEM_TEXT) &&
-                        (_ITEM_TEXT(it)->text_props.bidi.dir ==
-                         EVAS_BIDI_DIRECTION_RTL))
-                     is_rtl = EINA_TRUE;
-                  else if ((it->type == EVAS_TEXTBLOCK_ITEM_FORMAT) &&
-                        (_ITEM_FORMAT(it)->bidi_dir ==
-                         EVAS_BIDI_DIRECTION_RTL))
-                     is_rtl = EINA_TRUE;
-               }
-
-             /* Adjust if the char is an rtl char */
-             if ((ret >= 0) && (!is_rtl))
-               {
-                  /* Just don't advance the width */
-                  w = 0;
-               }
-#endif
-          }
-        else
-          {
-             ret = evas_textblock_cursor_pen_geometry_get(
-                   dir_cur, &x, &y, &w, &h);
-          }
-        if (ret >= 0)
-          {
-             if (cx) *cx = x + w;
-             if (cy) *cy = y;
-             if (cw) *cw = 0;
-             if (ch) *ch = h;
-          }
-     }
-
-   if (dir && dir_cur && dir_cur->node)
-     {
-#ifdef BIDI_SUPPORT
-        Eina_Bool is_rtl = EINA_FALSE;
-        if (dir_cur->node->par->is_bidi)
-          {
-             Evas_Object_Textblock_Line *ln;
-             Evas_Object_Textblock_Item *it;
-             _find_layout_item_match(dir_cur, &ln, &it);
-             if ((it->type == EVAS_TEXTBLOCK_ITEM_TEXT) &&
-                   (_ITEM_TEXT(it)->text_props.bidi.dir ==
-                    EVAS_BIDI_DIRECTION_RTL))
-                is_rtl = EINA_TRUE;
-             else if ((it->type == EVAS_TEXTBLOCK_ITEM_FORMAT) &&
-                   (_ITEM_FORMAT(it)->bidi_dir ==
-                    EVAS_BIDI_DIRECTION_RTL))
-                is_rtl = EINA_TRUE;
-          }
-
-        if (_evas_textblock_cursor_is_at_the_end(dir_cur) && (dir_cur->pos > 0))
-          {
-             *dir = (is_rtl) ?
-                EVAS_BIDI_DIRECTION_RTL : EVAS_BIDI_DIRECTION_LTR;
-          }
-        else if (dir_cur->pos > 0)
-          {
-             *dir = (is_rtl) ?
-                EVAS_BIDI_DIRECTION_RTL : EVAS_BIDI_DIRECTION_LTR;
-          }
-        else
-#endif
-          {
-             *dir = EVAS_BIDI_DIRECTION_LTR;
-          }
-     }
-   return ret;
-}
-
-/**
- * @internal
- * Returns the geometry/pen position (depending on query_func) of the char
- * at pos.
- *
- * @param cur the position of the char.
- * @param query_func the query function to use.
- * @param cx the x of the char (or pen_x in the case of pen position).
- * @param cy the y of the char.
- * @param cw the w of the char (or advance in the case pen position).
- * @param ch the h of the char.
- * @return line number of the char on success, -1 on error.
- */
-static int
-_evas_textblock_cursor_char_pen_geometry_common_get(int (*query_func) (void *data, Evas_Font_Set *font, const Evas_Text_Props *intl_props, int pos, int *cx, int *cy, int *cw, int *ch), const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
-{
-   Evas_Object_Textblock *o;
-   Evas_Object_Textblock_Line *ln = NULL;
-   Evas_Object_Textblock_Item *it = NULL;
-   Evas_Object_Textblock_Text_Item *ti = NULL;
-   Evas_Object_Textblock_Format_Item *fi = NULL;
-   int x = 0, y = 0, w = 0, h = 0;
-   int pos;
-   Eina_Bool previous_format;
-
-   if (!cur) return -1;
-   o = (Evas_Object_Textblock *)(cur->obj->object_data);
-   if (!o->formatted.valid) _relayout(cur->obj);
-
-   if (!cur->node)
-     {
-        if (!o->text_nodes)
-          {
-             if (!o->paragraphs) return -1;
-             ln = o->paragraphs->lines;
-             if (!ln) return -1;
-             if (cx) *cx = ln->x;
-             if (cy) *cy = ln->par->y + ln->y;
-             if (cw) *cw = ln->w;
-             if (ch) *ch = ln->h;
-             return ln->par->line_no + ln->line_no;
-          }
-        else
-          return -1;
-     }
-
-   previous_format = _find_layout_item_match(cur, &ln, &it);
-   if (!it)
-     {
-        return -1;
-     }
-   if (it->type == EVAS_TEXTBLOCK_ITEM_TEXT)
-     {
-        ti = _ITEM_TEXT(it);
-     }
-   else
-     {
-        fi = _ITEM_FORMAT(it);
-     }
-
-   if (ln && ti)
-     {
-        pos = cur->pos - ti->parent.text_pos;
-
-        if (pos < 0) pos = 0;
-        if (ti->parent.format->font.font)
-          {
-             query_func(cur->ENDT,
-                   ti->parent.format->font.font,
-                   &ti->text_props,
-                   pos,
-                   &x, &y, &w, &h);
-          }
-
-        x += ln->x + _ITEM(ti)->x;
-
-        if (x < ln->x)
-          {
-             x = ln->x;
-          }
-        y = ln->par->y + ln->y;
-        h = ln->h;
-     }
-   else if (ln && fi)
-     {
-        if (previous_format)
-          {
-             if (_IS_LINE_SEPARATOR(fi->item))
-               {
-                  x = 0;
-                  y = ln->par->y + ln->y + ln->h;
-               }
-             else
-               {
-#ifdef BIDI_SUPPORT
-                  if (ln->par->direction == EVAS_BIDI_DIRECTION_RTL)
-                    {
-                       x = ln->x;
-                    }
-                  else
-#endif
-                    {
-                       x = ln->x + ln->w;
-                    }
-                  y = ln->par->y + ln->y;
-               }
-             w = 0;
-             h = ln->h;
-          }
-        else
-          {
-             x = ln->x + _ITEM(fi)->x;
-             y = ln->par->y + ln->y;
-             w = _ITEM(fi)->w;
-             h = ln->h;
-          }
-     }
-   else
-     {
-        return -1;
-     }
-   if (cx) *cx = x;
-   if (cy) *cy = y;
-   if (cw) *cw = w;
-   if (ch) *ch = h;
-   return ln->par->line_no + ln->line_no;
-}
-
-EAPI int
-evas_textblock_cursor_char_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
-{
-   return _evas_textblock_cursor_char_pen_geometry_common_get(
-         cur->ENFN->font_char_coords_get, cur, cx, cy, cw, ch);
-}
-
-EAPI int
-evas_textblock_cursor_pen_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
-{
-   return _evas_textblock_cursor_char_pen_geometry_common_get(
-         cur->ENFN->font_pen_coords_get, cur, cx, cy, cw, ch);
-}
-
-EAPI int
-evas_textblock_cursor_line_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
-{
-   Evas_Object_Textblock *o;
-   Evas_Object_Textblock_Line *ln = NULL;
-   Evas_Object_Textblock_Item *it = NULL;
-   int x, y, w, h;
-
-   if (!cur) return -1;
-   o = (Evas_Object_Textblock *)(cur->obj->object_data);
-   if (!o->formatted.valid) _relayout(cur->obj);
-   if (!cur->node)
-     {
-        ln = o->paragraphs->lines;
-     }
-   else
-     {
-        _find_layout_item_match(cur, &ln, &it);
-     }
-   if (!ln) return -1;
-   x = ln->x;
-   y = ln->par->y + ln->y;
-   w = ln->w;
-   h = ln->h;
-   if (cx) *cx = x;
-   if (cy) *cy = y;
-   if (cw) *cw = w;
-   if (ch) *ch = h;
-   return ln->par->line_no + ln->line_no;
-}
-
-EAPI Eina_Bool
-evas_textblock_cursor_visible_range_get(Evas_Textblock_Cursor *start, Evas_Textblock_Cursor *end)
-{
-   Evas *e;
-   Evas_Coord cy, ch;
-   Evas_Object *obj = start->obj;
-   TB_HEAD_RETURN(EINA_FALSE);
-   e = evas_object_evas_get(obj);
-   cy = 0 - obj->cur.geometry.y;
-   ch = e->viewport.h;
-   evas_textblock_cursor_line_coord_set(start, cy);
-   evas_textblock_cursor_line_coord_set(end, cy + ch);
-   evas_textblock_cursor_line_char_last(end);
-
-   return EINA_TRUE;
-}
-
-EAPI Eina_Bool
-evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, Evas_Coord y)
-{
-   Evas_Object_Textblock *o;
-   Evas_Object_Textblock_Paragraph *found_par;
-   Evas_Object_Textblock_Line *ln;
-   Evas_Object_Textblock_Item *it = NULL;
-
-   if (!cur) return EINA_FALSE;
-   o = (Evas_Object_Textblock *)(cur->obj->object_data);
-   if (!o->formatted.valid) _relayout(cur->obj);
-   x += o->style_pad.l;
-   y += o->style_pad.t;
-
-   found_par = _layout_find_paragraph_by_y(o, y);
-   if (found_par)
-     {
-        _layout_paragraph_render(o, found_par);
-        EINA_INLIST_FOREACH(found_par->lines, ln)
-          {
-             if (ln->par->y + ln->y > y) break;
-             if ((ln->par->y + ln->y <= y) && ((ln->par->y + ln->y + ln->h) > y))
-               {
-                  /* If before or after the line, go to start/end according
-                   * to paragraph direction. */
-                  if (x < ln->x)
-                    {
-                       cur->pos = ln->items->text_pos;
-                       cur->node = found_par->text_node;
-                       if (found_par->direction == EVAS_BIDI_DIRECTION_RTL)
-                         {
-                            evas_textblock_cursor_line_char_last(cur);
-                         }
-                       else
-                         {
-                            evas_textblock_cursor_line_char_first(cur);
-                         }
-                       return EINA_TRUE;
-                    }
-                  else if (x >= ln->x + ln->w)
-                    {
-                       cur->pos = ln->items->text_pos;
-                       cur->node = found_par->text_node;
-                       if (found_par->direction == EVAS_BIDI_DIRECTION_RTL)
-                         {
-                            evas_textblock_cursor_line_char_first(cur);
-                         }
-                       else
-                         {
-                            evas_textblock_cursor_line_char_last(cur);
-                         }
-                       return EINA_TRUE;
-                    }
-
-                  EINA_INLIST_FOREACH(ln->items, it)
-                    {
-                       if (((it->x + ln->x) <= x) && (((it->x + ln->x) + it->adv) > x))
-                         {
-                            if (it->type == EVAS_TEXTBLOCK_ITEM_TEXT)
-                              {
-                                 int pos;
-                                 int cx, cy, cw, ch;
-                                 Evas_Object_Textblock_Text_Item *ti;
-                                 ti = _ITEM_TEXT(it);
-
-                                 pos = -1;
-                                 if (ti->parent.format->font.font)
-                                   pos = cur->ENFN->font_char_at_coords_get(
-                                         cur->ENDT,
-                                         ti->parent.format->font.font,
-                                         &ti->text_props,
-                                         x - it->x - ln->x, 0,
-                                         &cx, &cy, &cw, &ch);
-                                 if (pos < 0)
-                                   return EINA_FALSE;
-                                 cur->pos = pos + it->text_pos;
-                                 cur->node = it->text_node;
-                                 return EINA_TRUE;
-                              }
-                            else
-                              {
-                                 Evas_Object_Textblock_Format_Item *fi;
-                                 fi = _ITEM_FORMAT(it);
-                                 cur->pos = fi->parent.text_pos;
-                                 cur->node = found_par->text_node;
-                                 return EINA_TRUE;
-                              }
-                         }
-                    }
-               }
-          }
-     }
-   else if (o->paragraphs && (y >= o->paragraphs->y + o->formatted.h))
-     {
-        /* If we are after the last paragraph, use the last position in the
-         * text. */
-        evas_textblock_cursor_paragraph_last(cur);
-        return EINA_TRUE;
-     }
-   else if (o->paragraphs && (y < o->paragraphs->y))
-     {
-        evas_textblock_cursor_paragraph_first(cur);
-        return EINA_TRUE;
-     }
-
-   return EINA_FALSE;
-}
-
-EAPI int
-evas_textblock_cursor_line_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord y)
-{
-   Evas_Object_Textblock *o;
-   Evas_Object_Textblock_Paragraph *found_par;
-   Evas_Object_Textblock_Line *ln;
-
-   if (!cur) return -1;
-   o = (Evas_Object_Textblock *)(cur->obj->object_data);
-   if (!o->formatted.valid) _relayout(cur->obj);
-   y += o->style_pad.t;
-
-   found_par = _layout_find_paragraph_by_y(o, y);
-
-   if (found_par)
-     {
-        _layout_paragraph_render(o, found_par);
-        EINA_INLIST_FOREACH(found_par->lines, ln)
-          {
-             if (ln->par->y + ln->y > y) break;
-             if ((ln->par->y + ln->y <= y) && ((ln->par->y + ln->y + ln->h) > y))
-               {
-                  evas_textblock_cursor_line_set(cur, ln->par->line_no +
-                        ln->line_no);
-                  return ln->par->line_no + ln->line_no;
-               }
-          }
-     }
-   else if (o->paragraphs && (y >= o->paragraphs->y + o->formatted.h))
-     {
-        int line_no = 0;
-        /* If we are after the last paragraph, use the last position in the
-         * text. */
-        evas_textblock_cursor_paragraph_last(cur);
-        if (cur->node && cur->node->par)
-          {
-             line_no = cur->node->par->line_no;
-             if (cur->node->par->lines)
-               {
-                  line_no += ((Evas_Object_Textblock_Line *)
-                        EINA_INLIST_GET(cur->node->par->lines)->last)->line_no;
-               }
-          }
-        return line_no;
-     }
-   else if (o->paragraphs && (y < o->paragraphs->y))
-     {
-        int line_no = 0;
-        evas_textblock_cursor_paragraph_first(cur);
-        if (cur->node && cur->node->par)
-          {
-             line_no = cur->node->par->line_no;
-          }
-        return line_no;
-     }
-   return -1;
-}
-
-/**
- * @internal
- * Updates x and w according to the text direction, position in text and
- * if it's a special case switch
- *
- * @param ti the text item we are working on
- * @param x the current x (we get) and the x we return
- * @param w the current w (we get) and the w we return
- * @param start if this is the first item or not
- * @param switch_items toogles item switching (rtl cases)
- */
-static void
-_evas_textblock_range_calc_x_w(const Evas_Object_Textblock_Item *it,
-      Evas_Coord *x, Evas_Coord *w, Eina_Bool start, Eina_Bool switch_items)
-{
-   if ((start && !switch_items) || (!start && switch_items))
-     {
-#ifdef BIDI_SUPPORT
-        if (((it->type == EVAS_TEXTBLOCK_ITEM_TEXT) &&
-            _ITEM_TEXT(it)->text_props.bidi.dir == EVAS_BIDI_DIRECTION_RTL)
-            ||
-            ((it->type == EVAS_TEXTBLOCK_ITEM_FORMAT) &&
-             _ITEM_FORMAT(it)->bidi_dir == EVAS_BIDI_DIRECTION_RTL))
-          {
-             *w = *x + *w;
-             *x = 0;
-          }
-        else
-#endif
-          {
-             *w = it->adv - *x;
-          }
-     }
-   else
-     {
-#ifdef BIDI_SUPPORT
-        if (((it->type == EVAS_TEXTBLOCK_ITEM_TEXT) &&
-            _ITEM_TEXT(it)->text_props.bidi.dir == EVAS_BIDI_DIRECTION_RTL)
-            ||
-            ((it->type == EVAS_TEXTBLOCK_ITEM_FORMAT) &&
-             _ITEM_FORMAT(it)->bidi_dir == EVAS_BIDI_DIRECTION_RTL))
-          {
-             *x = *x + *w;
-             *w = it->adv - *x;
-          }
-        else
-#endif
-          {
-             *w = *x;
-             *x = 0;
-          }
-     }
-
-}
-
-/**
- * @internal
- * Returns the geometry of the range in line ln. Cur1 is the start cursor,
- * cur2 is the end cursor, NULL means from the start or to the end accordingly.
- * Assumes that ln is valid, and that at least one of cur1 and cur2 is not NULL.
- *
- * @param ln the line to work on.
- * @param cur1 the start cursor
- * @param cur2 the end cursor
- * @return Returns the geometry of the range
- */
-static Eina_List *
-_evas_textblock_cursor_range_in_line_geometry_get(
-      const Evas_Object_Textblock_Line *ln, const Evas_Textblock_Cursor *cur1,
-      const Evas_Textblock_Cursor *cur2)
-{
-   Evas_Object_Textblock_Item *it;
-   Evas_Object_Textblock_Item *it1, *it2;
-   Eina_List *rects = NULL;
-   Evas_Textblock_Rectangle *tr;
-   size_t start, end;
-   Eina_Bool switch_items;
-   const Evas_Textblock_Cursor *cur;
-
-   cur = (cur1) ? cur1 : cur2;
-
-   if (!cur) return NULL;
-
-   /* Find the first and last items */
-   it1 = it2 = NULL;
-   start = end = 0;
-   EINA_INLIST_FOREACH(ln->items, it)
-     {
-        size_t item_len;
-        item_len = (it->type == EVAS_TEXTBLOCK_ITEM_TEXT) ?
-           _ITEM_TEXT(it)->text_props.text_len
-           : 1;
-        if ((!cur1 || (cur1->pos < it->text_pos + item_len)) &&
-              (!cur2 || (cur2->pos >= it->text_pos)))
-          {
-             if (!it1)
-               {
-                  it1 = it;
-                  start = item_len; /* start stores the first item_len */
-               }
-             it2 = it;
-             end = item_len; /* end stores the last item_len */
-          }
-     }
-
-   /* If we couldn't find even one item, return */
-   if (!it1) return NULL;
-
-   /* If the first item is logically before or equal the second item
-    * we have to set start and end differently than in the other case */
-   if (it1->text_pos <= it2->text_pos)
-     {
-        start = (cur1) ? (cur1->pos - it1->text_pos) : 0;
-        end = (cur2) ? (cur2->pos - it2->text_pos) : end;
-        switch_items = EINA_FALSE;
-     }
-   else
-     {
-        start = (cur2) ? (cur2->pos - it1->text_pos) : start;
-        end = (cur1) ? (cur1->pos - it2->text_pos) : 0;
-        switch_items = EINA_TRUE;
-     }
-
-   /* IMPORTANT: Don't use cur1/cur2 past this point (because they probably
-    * don't make sense anymore. That's why there are start and end),
-    * unless you know what you are doing */
-
-   /* Special case when they share the same item and it's a text item */
-   if ((it1 == it2) && (it1->type == EVAS_TEXTBLOCK_ITEM_TEXT))
-     {
-        Evas_Coord x1, w1, x2, w2;
-        Evas_Coord x, w, y, h;
-        Evas_Object_Textblock_Text_Item *ti;
-        int ret = 0;
-
-        ti = _ITEM_TEXT(it1);
-        if (ti->parent.format->font.font)
-          {
-             ret = cur->ENFN->font_pen_coords_get(cur->ENDT,
-                   ti->parent.format->font.font,
-                   &ti->text_props,
-                   start,
-                   &x1, &y, &w1, &h);
-          }
-        if (!ret)
-          {
-             return NULL;
-          }
-        ret = cur->ENFN->font_pen_coords_get(cur->ENDT,
-              ti->parent.format->font.font,
-              &ti->text_props,
-              end,
-              &x2, &y, &w2, &h);
-        if (!ret)
-          {
-             return NULL;
-          }
-
-        /* Make x2 the one on the right */
-        if (x2 < x1)
-          {
-             Evas_Coord tmp;
-             tmp = x1;
-             x1 = x2;
-             x2 = tmp;
-
-             tmp = w1;
-             w1 = w2;
-             w2 = tmp;
-          }
-
-#ifdef BIDI_SUPPORT
-        if (ti->text_props.bidi.dir == EVAS_BIDI_DIRECTION_RTL)
-          {
-             x = x1 + w1;
-             w = x2 + w2 - x;
-          }
-        else
-#endif
-          {
-             x = x1;
-             w = x2 - x1;
-          }
-        if (w > 0)
-          {
-             tr = calloc(1, sizeof(Evas_Textblock_Rectangle));
-             rects = eina_list_append(rects, tr);
-             tr->x = ln->x + it1->x + x;
-             tr->y = ln->par->y + ln->y;
-             tr->h = ln->h;
-             tr->w = w;
-          }
-     }
-   else if (it1 != it2)
-     {
-        /* Get the middle items */
-        Evas_Coord min_x, max_x;
-        Evas_Coord x, w;
-        it = _ITEM(EINA_INLIST_GET(it1)->next);
-        min_x = max_x = it->x;
-
-        if (it1->type == EVAS_TEXTBLOCK_ITEM_TEXT)
-          {
-             Evas_Coord y, h;
-             Evas_Object_Textblock_Text_Item *ti;
-             int ret;
-             ti = _ITEM_TEXT(it1);
-
-             ret = cur->ENFN->font_pen_coords_get(cur->ENDT,
-                   ti->parent.format->font.font,
-                   &ti->text_props,
-                   start,
-                   &x, &y, &w, &h);
-             if (!ret)
-               {
-                  /* BUG! Skip the first item */
-                  x = w = 0;
-               }
-             else
-               {
-                  _evas_textblock_range_calc_x_w(it1, &x, &w, EINA_TRUE,
-                        switch_items);
-               }
-          }
-        else
-          {
-             x = 0;
-             w = it1->w;
-             _evas_textblock_range_calc_x_w(it1, &x, &w, EINA_TRUE,
-                   switch_items);
-          }
-        if (w > 0)
-          {
-             tr = calloc(1, sizeof(Evas_Textblock_Rectangle));
-             rects = eina_list_append(rects, tr);
-             tr->x = ln->x + it1->x + x;
-             tr->y = ln->par->y + ln->y;
-             tr->h = ln->h;
-             tr->w = w;
-          }
-
-        while (it && (it != it2))
-          {
-             max_x = it->x + it->adv;
-             it = (Evas_Object_Textblock_Item *) EINA_INLIST_GET(it)->next;
-          }
-        if (min_x != max_x)
-          {
-             tr = calloc(1, sizeof(Evas_Textblock_Rectangle));
-             rects = eina_list_append(rects, tr);
-             tr->x = ln->x + min_x;
-             tr->y = ln->par->y + ln->y;
-             tr->h = ln->h;
-             tr->w = max_x - min_x;
-          }
-        if (it2->type == EVAS_TEXTBLOCK_ITEM_TEXT)
-          {
-             Evas_Coord y, h;
-             Evas_Object_Textblock_Text_Item *ti;
-             int ret;
-             ti = _ITEM_TEXT(it2);
-
-             ret = cur->ENFN->font_pen_coords_get(cur->ENDT,
-                   ti->parent.format->font.font,
-                   &ti->text_props,
-                   end,
-                   &x, &y, &w, &h);
-             if (!ret)
-               {
-                  /* BUG! skip the last item */
-                  x = w = 0;
-               }
-             else
-               {
-                  _evas_textblock_range_calc_x_w(it2, &x, &w, EINA_FALSE,
-                        switch_items);
-               }
-          }
-        else
-          {
-             x = 0;
-             w = it2->w;
-             _evas_textblock_range_calc_x_w(it2, &x, &w, EINA_FALSE,
-                        switch_items);
-          }
-        if (w > 0)
-          {
-             tr = calloc(1, sizeof(Evas_Textblock_Rectangle));
-             rects = eina_list_append(rects, tr);
-             tr->x = ln->x + it2->x + x;
-             tr->y = ln->par->y + ln->y;
-             tr->h = ln->h;
-             tr->w = w;
-          }
-     }
-   return rects;
-}
-
-EAPI Eina_List *
-evas_textblock_cursor_range_geometry_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2)
-{
-   Evas_Object_Textblock *o;
-   Evas_Object_Textblock_Line *ln1, *ln2;
-   Evas_Object_Textblock_Item *it1, *it2;
-   Eina_List *rects = NULL;
-   Evas_Textblock_Rectangle *tr;
-
-   if (!cur1 || !cur1->node) return NULL;
-   if (!cur2 || !cur2->node) return NULL;
-   if (cur1->obj != cur2->obj) return NULL;
-   o = (Evas_Object_Textblock *)(cur1->obj->object_data);
-   if (!o->formatted.valid) _relayout(cur1->obj);
-   if (evas_textblock_cursor_compare(cur1, cur2) > 0)
-     {
-        const Evas_Textblock_Cursor *tc;
-
-        tc = cur1;
-        cur1 = cur2;
-        cur2 = tc;
-     }
-
-   ln1 = ln2 = NULL;
-   it1 = it2 = NULL;
-   _find_layout_item_match(cur1, &ln1, &it1);
-   if (!ln1 || !it1) return NULL;
-   _find_layout_item_match(cur2, &ln2, &it2);
-   if (!ln2 || !it2) return NULL;
-
-   if (ln1 == ln2)
-     {
-        rects = _evas_textblock_cursor_range_in_line_geometry_get(ln1,
-              cur1, cur2);
-     }
-   else
-     {
-        Evas_Object_Textblock_Line *plni, *lni;
-        Eina_List *rects2 = NULL;
-        /* Handle the first line */
-        rects = _evas_textblock_cursor_range_in_line_geometry_get(ln1,
-              cur1, NULL);
-
-        /* Handle the lines between the first and the last line */
-        lni = (Evas_Object_Textblock_Line *) EINA_INLIST_GET(ln1)->next;
-        if (!lni && (ln1->par != ln2->par))
-          {
-             lni = ((Evas_Object_Textblock_Paragraph *)
-                    EINA_INLIST_GET(ln1->par)->next)->lines;
-          }
-        while (lni && (lni != ln2))
-          {
-             tr = calloc(1, sizeof(Evas_Textblock_Rectangle));
-             rects = eina_list_append(rects, tr);
-             tr->x = lni->x;
-             tr->y = lni->par->y + lni->y;
-             tr->h = lni->h;
-             tr->w = lni->w;
-             plni = lni;
-             lni = (Evas_Object_Textblock_Line *) EINA_INLIST_GET(lni)->next;
-             if (!lni && (plni->par != ln2->par))
-               {
-                  lni = ((Evas_Object_Textblock_Paragraph *)
-                     EINA_INLIST_GET(plni->par)->next)->lines;
-               }
-          }
-        rects2 = _evas_textblock_cursor_range_in_line_geometry_get(ln2,
-              NULL, cur2);
-        rects = eina_list_merge(rects, rects2);
-     }
-   return rects;
-}
-
-EAPI Eina_Bool
-evas_textblock_cursor_format_item_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
-{
-   Evas_Object_Textblock *o;
-   Evas_Object_Textblock_Line *ln = NULL;
-   Evas_Object_Textblock_Format_Item *fi;
-   Evas_Object_Textblock_Item *it = NULL;
-   Evas_Coord x, y, w, h;
-
-   if (!cur || !evas_textblock_cursor_format_is_visible_get(cur)) return EINA_FALSE;
-   o = (Evas_Object_Textblock *)(cur->obj->object_data);
-   if (!o->formatted.valid) _relayout(cur->obj);
-   if (!evas_textblock_cursor_format_is_visible_get(cur)) return EINA_FALSE;
-   _find_layout_item_line_match(cur->obj, cur->node, cur->pos, &ln, &it);
-   fi = _ITEM_FORMAT(it);
-   if ((!ln) || (!fi)) return EINA_FALSE;
-   x = ln->x + fi->parent.x;
-   y = ln->par->y + ln->y + ln->baseline + fi->y;
-   w = fi->parent.w;
-   h = fi->parent.h;
-   if (cx) *cx = x;
-   if (cy) *cy = y;
-   if (cw) *cw = w;
-   if (ch) *ch = h;
-   return EINA_TRUE;
-}
-
-EAPI Eina_Bool
-evas_textblock_cursor_eol_get(const Evas_Textblock_Cursor *cur)
-{
-   Eina_Bool ret = EINA_FALSE;
-   Evas_Textblock_Cursor cur2;
-   if (!cur) return EINA_FALSE;
-
-   cur2.obj = cur->obj;
-   evas_textblock_cursor_copy(cur, &cur2);
-   evas_textblock_cursor_line_char_last(&cur2);
-   if (cur2.pos == cur->pos)
-     {
-        ret = EINA_TRUE;
-     }
-   return ret;
-}
-
-/* general controls */
-EAPI Eina_Bool
-evas_object_textblock_line_number_geometry_get(const Evas_Object *obj, int line, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
-{
-   Evas_Object_Textblock_Line *ln;
-
-   TB_HEAD_RETURN(0);
-   ln = _find_layout_line_num(obj, line);
-   if (!ln) return EINA_FALSE;
-   if (cx) *cx = ln->x;
-   if (cy) *cy = ln->par->y + ln->y;
-   if (cw) *cw = ln->w;
-   if (ch) *ch = ln->h;
-   return EINA_TRUE;
-}
-
-EAPI void
-evas_object_textblock_clear(Evas_Object *obj)
-{
-   Eina_List *l;
-   Evas_Textblock_Cursor *cur;
-
-   TB_HEAD();
-   if (o->paragraphs)
-     {
-        _paragraphs_free(obj, o->paragraphs);
-        o->paragraphs = NULL;
-     }
-
-   _nodes_clear(obj);
-   o->cursor->node = NULL;
-   o->cursor->pos = 0;
-   EINA_LIST_FOREACH(o->cursors, l, cur)
-     {
-        cur->node = NULL;
-        cur->pos = 0;
-
-     }
-   _evas_textblock_changed(o, obj);
-}
-
-EAPI void
-evas_object_textblock_size_formatted_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
-{
-   TB_HEAD();
-   if (!o->formatted.valid) _relayout(obj);
-   if (w) *w = o->formatted.w;
-   if (h) *h = o->formatted.h;
-}
-
-static void
-_size_native_calc_line_finalize(const Evas_Object *obj, Eina_List *items,
-      Evas_Coord *ascent, Evas_Coord *descent, Evas_Coord *w)
-{
-   Evas_Object_Textblock_Item *it;
-   Eina_List *i;
-
-   it = eina_list_data_get(items);
-   *w = 0;
-
-   if (it)
-     {
-        /* If there are no text items yet, calc ascent/descent
-         * according to the current format. */
-        if (*ascent + *descent == 0)
-           _layout_format_ascent_descent_adjust(obj, ascent, descent,
-                 it->format);
-
-        /* Add margins. */
-        if (it->format)
-           *w = it->format->margin.l + it->format->margin.r;
-      }
-
-
-   /* Adjust all the item sizes according to the final line size,
-    * and update the x positions of all the items of the line. */
-   EINA_LIST_FOREACH(items, i, it)
-     {
-        if (it->type == EVAS_TEXTBLOCK_ITEM_FORMAT)
-          {
-             Evas_Coord fw, fh, fy;
-
-             Evas_Object_Textblock_Format_Item *fi = _ITEM_FORMAT(it);
-             if (!fi->formatme) goto loop_advance;
-             _layout_calculate_format_item_size(obj, fi, ascent,
-                   descent, &fy, &fw, &fh);
-          }
-
-loop_advance:
-        *w += it->adv;
-     }
-}
-
-/* FIXME: doc */
-static void
-_size_native_calc_paragraph_size(const Evas_Object *obj,
-      const Evas_Object_Textblock *o,
-      const Evas_Object_Textblock_Paragraph *par,
-      Evas_Coord *_w, Evas_Coord *_h)
-{
-   Eina_List *i;
-   Evas_Object_Textblock_Item *it;
-   Eina_List *line_items = NULL;
-   Evas_Coord w = 0, y = 0, wmax = 0, h = 0, ascent = 0, descent = 0;
-
-   EINA_LIST_FOREACH(par->logical_items, i, it)
-     {
-        line_items = eina_list_append(line_items, it);
-        if (it->type == EVAS_TEXTBLOCK_ITEM_FORMAT)
-          {
-             Evas_Object_Textblock_Format_Item *fi = _ITEM_FORMAT(it);
-             if (fi->item && (_IS_LINE_SEPARATOR(fi->item) ||
-                      _IS_PARAGRAPH_SEPARATOR(o, fi->item)))
-               {
-                  _size_native_calc_line_finalize(obj, line_items, &ascent,
-                        &descent, &w);
-
-                  if (ascent + descent > h)
-                     h = ascent + descent;
-
-                  y += h;
-                  if (w > wmax)
-                     wmax = w;
-                  h = 0;
-                  ascent = descent = 0;
-                  line_items = eina_list_free(line_items);
-               }
-             else
-               {
-                  Evas_Coord fw, fh, fy;
-                  /* If there are no text items yet, calc ascent/descent
-                   * according to the current format. */
-                  if (it && (ascent + descent == 0))
-                     _layout_format_ascent_descent_adjust(obj, &ascent,
-                           &descent, it->format);
-
-                  _layout_calculate_format_item_size(obj, fi, &ascent,
-                        &descent, &fy, &fw, &fh);
-               }
-          }
-        else
-          {
-             _layout_format_ascent_descent_adjust(obj, &ascent,
-                   &descent, it->format);
-          }
-     }
-
-   _size_native_calc_line_finalize(obj, line_items, &ascent, &descent, &w);
-
-   line_items = eina_list_free(line_items);
-
-   /* Do the last addition */
-   if (ascent + descent > h)
-      h = ascent + descent;
-
-   if (w > wmax)
-      wmax = w;
-
-   *_h = y + h;
-   *_w = wmax;
-}
-
-EAPI void
-evas_object_textblock_size_native_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
-{
-   TB_HEAD();
-   if (!o->native.valid)
-     {
-        Evas_Coord wmax = 0, hmax = 0;
-        Evas_Object_Textblock_Paragraph *par;
-        /* We just want the layout objects to update, should probably
-         * split that. */
-        if (!o->formatted.valid) _relayout(obj);
-        EINA_INLIST_FOREACH(o->paragraphs, par)
-          {
-             Evas_Coord tw, th;
-             _size_native_calc_paragraph_size(obj, o, par, &tw, &th);
-             if (tw > wmax)
-                wmax = tw;
-             hmax += th;
-          }
-
-        o->native.w = wmax;
-        o->native.h = hmax;
-
-        o->native.valid = 1;
-        o->content_changed = 0;
-        o->format_changed = EINA_FALSE;
-     }
-   if (w) *w = o->native.w;
-   if (h) *h = o->native.h;
-}
-
-EAPI void
-evas_object_textblock_style_insets_get(const Evas_Object *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b)
-{
-   TB_HEAD();
-   if (!o->formatted.valid) _relayout(obj);
-   if (l) *l = o->style_pad.l;
-   if (r) *r = o->style_pad.r;
-   if (t) *t = o->style_pad.t;
-   if (b) *b = o->style_pad.b;
-}
-
-/** @internal
- * FIXME: DELETE ME! DELETE ME!
- * This is an ugly workaround to get around the fact that
- * evas_object_textblock_coords_recalc isn't really called when it's supposed
- * to. When that bug is fixed please remove this. */
-static void
-_workaround_object_coords_recalc(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
-{
-   evas_object_textblock_coords_recalc(obj);
-}
-
-/* all nice and private */
-static void
-evas_object_textblock_init(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-#ifdef HAVE_LINEBREAK
-   static Eina_Bool linebreak_init = EINA_FALSE;
-   if (!linebreak_init)
-     {
-        linebreak_init = EINA_TRUE;
-        init_linebreak();
-        init_wordbreak();
-     }
-#endif
-
-   /* alloc image ob, setup methods and default values */
-   obj->object_data = evas_object_textblock_new();
-   /* set up default settings for this kind of object */
-   obj->cur.color.r = 255;
-   obj->cur.color.g = 255;
-   obj->cur.color.b = 255;
-   obj->cur.color.a = 255;
-   obj->cur.geometry.x = 0.0;
-   obj->cur.geometry.y = 0.0;
-   obj->cur.geometry.w = 0.0;
-   obj->cur.geometry.h = 0.0;
-   obj->cur.layer = 0;
-   /* set up object-specific settings */
-   obj->prev = obj->cur;
-   /* set up methods (compulsory) */
-   obj->func = &object_func;
-   obj->type = o_type;
-
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   o->cursor->obj = obj;
-   o->legacy_newline = EINA_TRUE;
-   evas_object_event_callback_priority_add(obj, EVAS_CALLBACK_RESIZE, -1000,
-         _workaround_object_coords_recalc, NULL);
-}
-
-static void *
-evas_object_textblock_new(void)
-{
-   Evas_Object_Textblock *o;
-
-   /* alloc obj private data */
-   EVAS_MEMPOOL_INIT(_mp_obj, "evas_object_textblock", Evas_Object_Textblock, 64, NULL);
-   o = EVAS_MEMPOOL_ALLOC(_mp_obj, Evas_Object_Textblock);
-   if (!o) return NULL;
-   EVAS_MEMPOOL_PREP(_mp_obj, o, Evas_Object_Textblock);
-   o->magic = MAGIC_OBJ_TEXTBLOCK;
-   o->cursor = calloc(1, sizeof(Evas_Textblock_Cursor));
-   _format_command_init();
-   return o;
-}
-
-static void
-evas_object_textblock_free(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-
-   evas_object_textblock_clear(obj);
-   evas_object_textblock_style_set(obj, NULL);
-   while (evas_object_textblock_style_user_peek(obj))
-     {
-        evas_object_textblock_style_user_pop(obj);
-     }
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   free(o->cursor);
-   while (o->cursors)
-     {
-        Evas_Textblock_Cursor *cur;
-
-        cur = (Evas_Textblock_Cursor *)o->cursors->data;
-        o->cursors = eina_list_remove_list(o->cursors, o->cursors);
-        free(cur);
-     }
-   if (o->repch) eina_stringshare_del(o->repch);
-   if (o->ellip_ti) _item_free(obj, NULL, _ITEM(o->ellip_ti));
-   o->magic = 0;
-   EVAS_MEMPOOL_FREE(_mp_obj, o);
-  _format_command_shutdown();
-}
-
-
-static void
-evas_object_textblock_render(Evas_Object *obj, void *output, void *context, void *surface, int x, int y)
-{
-   Evas_Object_Textblock_Paragraph *par, *start = NULL;
-   Evas_Object_Textblock_Line *ln;
-   Evas_Object_Textblock *o;
-   int i, j;
-   int cx, cy, cw, ch, clip;
-   const char vals[5][5] =
-     {
-          {0, 1, 2, 1, 0},
-          {1, 3, 4, 3, 1},
-          {2, 4, 5, 4, 2},
-          {1, 3, 4, 3, 1},
-          {0, 1, 2, 1, 0}
-     };
-
-   /* render object to surface with context, and offxet by x,y */
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   obj->layer->evas->engine.func->context_multiplier_unset(output,
-                                                           context);
-   /* FIXME: This clipping is just until we fix inset handling correctly. */
-   ENFN->context_clip_clip(output, context,
-                              obj->cur.geometry.x + x,
-                              obj->cur.geometry.y + y,
-                              obj->cur.geometry.w,
-                              obj->cur.geometry.h);
-   clip = ENFN->context_clip_get(output, context, &cx, &cy, &cw, &ch);
-   /* If there are no paragraphs and thus there are no lines,
-    * there's nothing left to do. */
-   if (!o->paragraphs) return;
-
-#define ITEM_WALK() \
-   EINA_INLIST_FOREACH(start, par) \
-     { \
-        if (!par->visible) continue; \
-        if (clip) \
-          { \
-             if ((obj->cur.geometry.y + y + par->y + par->h) < (cy - 20)) \
-             continue; \
-             if ((obj->cur.geometry.y + y + par->y) > (cy + ch + 20)) \
-             break; \
-          } \
-        _layout_paragraph_render(o, par); \
-        EINA_INLIST_FOREACH(par->lines, ln) \
-          { \
-             Evas_Object_Textblock_Item *itr; \
-             \
-             if (clip) \
-               { \
-                  if ((obj->cur.geometry.y + y + par->y + ln->y + ln->h) < (cy - 20)) \
-                  continue; \
-                  if ((obj->cur.geometry.y + y + par->y + ln->y) > (cy + ch + 20)) \
-                  break; \
-               } \
-             EINA_INLIST_FOREACH(ln->items, itr) \
-               { \
-                  Evas_Coord yoff; \
-                  yoff = ln->baseline; \
-                  if (itr->format->valign != -1.0) \
-                    { \
-                       yoff += itr->format->valign * (ln->h - itr->h); \
-                    } \
-                  if (clip) \
-                    { \
-                       if ((obj->cur.geometry.x + x + ln->x + itr->x + itr->w) < (cx - 20)) \
-                       continue; \
-                       if ((obj->cur.geometry.x + x + ln->x + itr->x) > (cx + cw + 20)) \
-                       break; \
-                    } \
-                  if ((ln->x + itr->x + itr->w) <= 0) continue; \
-                  if (ln->x + itr->x > obj->cur.geometry.w) break; \
-                  do
-
-#define ITEM_WALK_END() \
-                  while (0); \
-               } \
-          } \
-     } \
-   do {} while(0)
-#define COLOR_SET(col) \
-   ENFN->context_color_set(output, context, \
-         (obj->cur.cache.clip.r * ti->parent.format->color.col.r) / 255, \
-         (obj->cur.cache.clip.g * ti->parent.format->color.col.g) / 255, \
-         (obj->cur.cache.clip.b * ti->parent.format->color.col.b) / 255, \
-         (obj->cur.cache.clip.a * ti->parent.format->color.col.a) / 255);
-#define COLOR_SET_AMUL(col, amul) \
-   ENFN->context_color_set(output, context, \
-         (obj->cur.cache.clip.r * ti->parent.format->color.col.r * (amul)) / 65025, \
-         (obj->cur.cache.clip.g * ti->parent.format->color.col.g * (amul)) / 65025, \
-         (obj->cur.cache.clip.b * ti->parent.format->color.col.b * (amul)) / 65025, \
-         (obj->cur.cache.clip.a * ti->parent.format->color.col.a * (amul)) / 65025);
-#define DRAW_TEXT(ox, oy) \
-   if (ti->parent.format->font.font) ENFN->font_draw(output, context, surface, ti->parent.format->font.font, \
-         obj->cur.geometry.x + ln->x + ti->parent.x + x + (ox), \
-         obj->cur.geometry.y + ln->par->y + ln->y + yoff + y + (oy), \
-         ti->parent.w, ti->parent.h, ti->parent.w, ti->parent.h, \
-         &ti->text_props);
-
-   /* backing */
-#define DRAW_RECT(ox, oy, ow, oh, or, og, ob, oa) \
-   do \
-     { \
-        ENFN->context_color_set(output, \
-              context, \
-              (obj->cur.cache.clip.r * or) / 255, \
-              (obj->cur.cache.clip.g * og) / 255, \
-              (obj->cur.cache.clip.b * ob) / 255, \
-              (obj->cur.cache.clip.a * oa) / 255); \
-        ENFN->rectangle_draw(output, \
-              context, \
-              surface, \
-              obj->cur.geometry.x + ln->x + x + (ox), \
-              obj->cur.geometry.y + ln->par->y + ln->y + y + (oy), \
-              (ow), \
-              (oh)); \
-     } \
-   while (0)
-
-#define DRAW_FORMAT_DASHED(oname, oy, oh, dw, dp) \
-   do \
-     { \
-        if (itr->format->oname) \
-          { \
-             unsigned char _or, _og, _ob, _oa; \
-             int _ind, _dx = 0, _dn, _dr; \
-             _or = itr->format->color.oname.r; \
-             _og = itr->format->color.oname.g; \
-             _ob = itr->format->color.oname.b; \
-             _oa = itr->format->color.oname.a; \
-             if (!EINA_INLIST_GET(itr)->next) \
-               { \
-                  _dn = itr->w / (dw + dp); \
-                  _dr = itr->w % (dw + dp); \
-               } \
-             else \
-               { \
-                  _dn = itr->adv / (dw + dp); \
-                  _dr = itr->adv % (dw + dp); \
-               } \
-             if (_dr > dw) _dr = dw; \
-             for (_ind = 0 ; _ind < _dn ; _ind++) \
-               { \
-                  DRAW_RECT(itr->x + _dx, oy, dw, oh, _or, _og, _ob, _oa); \
-                  _dx += dw + dp; \
-               } \
-             DRAW_RECT(itr->x + _dx, oy, _dr, oh, _or, _og, _ob, _oa); \
-          } \
-     } \
-   while (0)
-
-#define DRAW_FORMAT(oname, oy, oh) \
-   do \
-     { \
-        if (itr->format->oname) \
-          { \
-             unsigned char _or, _og, _ob, _oa; \
-             _or = itr->format->color.oname.r; \
-             _og = itr->format->color.oname.g; \
-             _ob = itr->format->color.oname.b; \
-             _oa = itr->format->color.oname.a; \
-             if (!EINA_INLIST_GET(itr)->next) \
-               { \
-                  DRAW_RECT(itr->x, oy, itr->w, oh, _or, _og, _ob, _oa); \
-               } \
-             else \
-               { \
-                  DRAW_RECT(itr->x, oy, itr->adv, oh, _or, _og, _ob, _oa); \
-               } \
-          } \
-     } \
-   while (0)
-
-     {
-        Evas_Coord look_for_y = 0 - (obj->cur.geometry.y + y);
-        if (clip)
-          {
-             Evas_Coord tmp_lfy = cy - (obj->cur.geometry.y + y);
-             if (tmp_lfy > look_for_y)
-                look_for_y = tmp_lfy;
-          }
-
-        if (look_for_y >= 0)
-           start = _layout_find_paragraph_by_y(o, look_for_y);
-
-        if (!start)
-           start = o->paragraphs;
-     }
-
-   ITEM_WALK()
-     {
-        DRAW_FORMAT(backing, 0, ln->h);
-     }
-   ITEM_WALK_END();
-
-   /* There are size adjustments that depend on the styles drawn here back
-    * in "_text_item_update_sizes" should not modify one without the other. */
-
-   /* prepare everything for text draw */
-
-   /* shadows */
-   ITEM_WALK()
-     {
-        int shad_dst, shad_sz, dx, dy, haveshad;
-        Evas_Object_Textblock_Text_Item *ti;
-        ti = (itr->type == EVAS_TEXTBLOCK_ITEM_TEXT) ? _ITEM_TEXT(itr) : NULL;
-        if (!ti) continue;
-
-        shad_dst = shad_sz = dx = dy = haveshad = 0;
-        switch (ti->parent.format->style & EVAS_TEXT_STYLE_MASK_BASIC)
-          {
-           case EVAS_TEXT_STYLE_SHADOW:
-           case EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW:
-             shad_dst = 1;
-             haveshad = 1;
-             break;
-           case EVAS_TEXT_STYLE_OUTLINE_SHADOW:
-           case EVAS_TEXT_STYLE_FAR_SHADOW:
-             shad_dst = 2;
-             haveshad = 1;
-             break;
-           case EVAS_TEXT_STYLE_FAR_SOFT_SHADOW:
-             shad_dst = 2;
-             shad_sz = 2;
-             haveshad = 1;
-             break;
-           case EVAS_TEXT_STYLE_SOFT_SHADOW:
-             shad_dst = 1;
-             shad_sz = 2;
-             haveshad = 1;
-             break;
-           default:
-             break;
-          }
-        if (haveshad)
-          {
-             if (shad_dst > 0)
-               {
-                  switch (ti->parent.format->style & EVAS_TEXT_STYLE_MASK_SHADOW_DIRECTION)
-                    {
-                     case EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_RIGHT:
-                       dx = 1;
-                       dy = 1;
-                       break;
-                     case EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM:
-                       dx = 0;
-                       dy = 1;
-                       break;
-                     case EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_LEFT:
-                       dx = -1;
-                       dy = 1;
-                       break;
-                     case EVAS_TEXT_STYLE_SHADOW_DIRECTION_LEFT:
-                       dx = -1;
-                       dy = 0;
-                       break;
-                     case EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP_LEFT:
-                       dx = -1;
-                       dy = -1;
-                       break;
-                     case EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP:
-                       dx = 0;
-                       dy = -1;
-                       break;
-                     case EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP_RIGHT:
-                       dx = 1;
-                       dy = -1;
-                       break;
-                     case EVAS_TEXT_STYLE_SHADOW_DIRECTION_RIGHT:
-                       dx = 1;
-                       dy = 0;
-                     default:
-                       break;
-                    }
-                  dx *= shad_dst;
-                  dy *= shad_dst;
-               }
-             switch (shad_sz)
-               {
-                case 0:
-                  COLOR_SET(shadow);
-                  DRAW_TEXT(dx, dy);
-                  break;
-                case 2:
-                  for (j = 0; j < 5; j++)
-                    {
-                       for (i = 0; i < 5; i++)
-                         {
-                            if (vals[i][j] != 0)
-                              {
-                                 COLOR_SET_AMUL(shadow, vals[i][j] * 50);
-                                 DRAW_TEXT(i - 2 + dx, j - 2 + dy);
-                              }
-                         }
-                    }
-                  break;
-                default:
-                  break;
-               }
-          }
-     }
-   ITEM_WALK_END();
-
-   /* glows */
-   ITEM_WALK()
-     {
-        Evas_Object_Textblock_Text_Item *ti;
-        ti = (itr->type == EVAS_TEXTBLOCK_ITEM_TEXT) ? _ITEM_TEXT(itr) : NULL;
-        if (!ti) continue;
-
-        if (ti->parent.format->style == EVAS_TEXT_STYLE_GLOW)
-          {
-             for (j = 0; j < 5; j++)
-               {
-                  for (i = 0; i < 5; i++)
-                    {
-                       if (vals[i][j] != 0)
-                         {
-                            COLOR_SET_AMUL(glow, vals[i][j] * 50);
-                            DRAW_TEXT(i - 2, j - 2);
-                         }
-                    }
-               }
-             COLOR_SET(glow2);
-             DRAW_TEXT(-1, 0);
-             DRAW_TEXT(1, 0);
-             DRAW_TEXT(0, -1);
-             DRAW_TEXT(0, 1);
-          }
-     }
-   ITEM_WALK_END();
-
-   /* outlines */
-   ITEM_WALK()
-     {
-        Evas_Object_Textblock_Text_Item *ti;
-        ti = (itr->type == EVAS_TEXTBLOCK_ITEM_TEXT) ? _ITEM_TEXT(itr) : NULL;
-        if (!ti) continue;
-
-        if ((ti->parent.format->style == EVAS_TEXT_STYLE_OUTLINE) ||
-              (ti->parent.format->style == EVAS_TEXT_STYLE_OUTLINE_SHADOW) ||
-              (ti->parent.format->style == EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW))
-          {
-             COLOR_SET(outline);
-             DRAW_TEXT(-1, 0);
-             DRAW_TEXT(1, 0);
-             DRAW_TEXT(0, -1);
-             DRAW_TEXT(0, 1);
-          }
-        else if (ti->parent.format->style == EVAS_TEXT_STYLE_SOFT_OUTLINE)
-          {
-             for (j = 0; j < 5; j++)
-               {
-                  for (i = 0; i < 5; i++)
-                    {
-                       if (((i != 2) || (j != 2)) && (vals[i][j] != 0))
-                         {
-                            COLOR_SET_AMUL(outline, vals[i][j] * 50);
-                            DRAW_TEXT(i - 2, j - 2);
-                         }
-                    }
-               }
-          }
-     }
-   ITEM_WALK_END();
-
-   /* normal text and lines */
-   ITEM_WALK()
-     {
-        Evas_Object_Textblock_Text_Item *ti;
-        ti = (itr->type == EVAS_TEXTBLOCK_ITEM_TEXT) ? _ITEM_TEXT(itr) : NULL;
-        /* NORMAL TEXT */
-        if (ti)
-          {
-             COLOR_SET(normal);
-             DRAW_TEXT(0, 0);
-          }
-
-        /* STRIKETHROUGH */
-        DRAW_FORMAT(strikethrough, (ln->h / 2), 1);
-
-        /* UNDERLINE */
-        DRAW_FORMAT(underline, ln->baseline + 1, 1);
-
-        /* UNDERLINE DASHED */
-        DRAW_FORMAT_DASHED(underline_dash, ln->baseline + 1, 1,
-                         ti->parent.format->underline_dash_width,
-                         ti->parent.format->underline_dash_gap);
-
-        /* UNDERLINE2 */
-        DRAW_FORMAT(underline2, ln->baseline + 3, 1);
-     }
-   ITEM_WALK_END();
-}
-
-static void
-evas_object_textblock_render_pre(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-   int is_v, was_v;
-
-   /* dont pre-render the obj twice! */
-   if (obj->pre_render_done) return;
-   obj->pre_render_done = 1;
-   /* pre-render phase. this does anything an object needs to do just before */
-   /* rendering. this could mean loading the image data, retrieving it from */
-   /* elsewhere, decoding video etc. */
-   /* then when this is done the object needs to figure if it changed and */
-   /* if so what and where and add the appropriate redraw textblocks */
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   if ((o->changed) || (o->content_changed) || (o->format_changed) ||
-       ((obj->cur.geometry.w != o->last_w) ||
-           (((o->valign != 0.0) || (o->have_ellipsis)) &&
-               (obj->cur.geometry.h != o->last_h))))
-     {
-        _relayout(obj);
-        o->redraw = 0;
-        evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, obj);
-        is_v = evas_object_is_visible(obj);
-        was_v = evas_object_was_visible(obj);
-        goto done;
-     }
-   if (o->redraw)
-     {
-        o->redraw = 0;
-        evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, obj);
-        is_v = evas_object_is_visible(obj);
-        was_v = evas_object_was_visible(obj);
-        goto done;
-     }
-   /* if someone is clipping this obj - go calculate the clipper */
-   if (obj->cur.clipper)
-     {
-        if (obj->cur.cache.clip.dirty)
-          evas_object_clip_recalc(obj->cur.clipper);
-        obj->cur.clipper->func->render_pre(obj->cur.clipper);
-     }
-   /* now figure what changed and add draw rects */
-   /* if it just became visible or invisible */
-   is_v = evas_object_is_visible(obj);
-   was_v = evas_object_was_visible(obj);
-   if (is_v != was_v)
-     {
-        evas_object_render_pre_visible_change(&obj->layer->evas->clip_changes, obj, is_v, was_v);
-        goto done;
-     }
-   if ((obj->cur.map != obj->prev.map) ||
-       (obj->cur.usemap != obj->prev.usemap))
-     {
-        evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, obj);
-        goto done;
-     }
-   /* it's not visible - we accounted for it appearing or not so just abort */
-   if (!is_v) goto done;
-   /* clipper changed this is in addition to anything else for obj */
-   evas_object_render_pre_clipper_change(&obj->layer->evas->clip_changes, obj);
-   /* if we restacked (layer or just within a layer) and don't clip anyone */
-   if (obj->restack)
-     {
-        evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, obj);
-        goto done;
-     }
-   /* if it changed color */
-   if ((obj->cur.color.r != obj->prev.color.r) ||
-       (obj->cur.color.g != obj->prev.color.g) ||
-       (obj->cur.color.b != obj->prev.color.b) ||
-       (obj->cur.color.a != obj->prev.color.a))
-     {
-        evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, obj);
-        goto done;
-     }
-   /* if it changed geometry - and obviously not visibility or color */
-   /* calculate differences since we have a constant color fill */
-   /* we really only need to update the differences */
-   if ((obj->cur.geometry.x != obj->prev.geometry.x) ||
-       (obj->cur.geometry.y != obj->prev.geometry.y) ||
-       (obj->cur.geometry.w != obj->prev.geometry.w) ||
-       (obj->cur.geometry.h != obj->prev.geometry.h))
-     {
-        evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, obj);
-        goto done;
-     }
-   done:
-   evas_object_render_pre_effect_updates(&obj->layer->evas->clip_changes, obj, is_v, was_v);
-}
-
-static void
-evas_object_textblock_render_post(Evas_Object *obj)
-{
-/*   Evas_Object_Textblock *o; */
-
-   /* this moves the current data to the previous state parts of the object */
-   /* in whatever way is safest for the object. also if we don't need object */
-   /* data anymore we can free it if the object deems this is a good idea */
-/*   o = (Evas_Object_Textblock *)(obj->object_data); */
-   /* remove those pesky changes */
-   evas_object_clip_changes_clean(obj);
-   /* move cur to prev safely for object data */
-   obj->prev = obj->cur;
-/*   o->prev = o->cur; */
-/*   o->changed = 0; */
-}
-
-static unsigned int evas_object_textblock_id_get(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   if (!o) return 0;
-   return MAGIC_OBJ_TEXTBLOCK;
-}
-
-static unsigned int evas_object_textblock_visual_id_get(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   if (!o) return 0;
-   return MAGIC_OBJ_CUSTOM;
-}
-
-static void *evas_object_textblock_engine_data_get(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   if (!o) return NULL;
-   return o->engine_data;
-}
-
-static int
-evas_object_textblock_is_opaque(Evas_Object *obj __UNUSED__)
-{
-   /* this returns 1 if the internal object data implies that the object is */
-   /* currently fulyl opque over the entire gradient it occupies */
-   return 0;
-}
-
-static int
-evas_object_textblock_was_opaque(Evas_Object *obj __UNUSED__)
-{
-   /* this returns 1 if the internal object data implies that the object was */
-   /* currently fulyl opque over the entire gradient it occupies */
-   return 0;
-}
-
-static void
-evas_object_textblock_coords_recalc(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   if ((obj->cur.geometry.w != o->last_w) ||
-       (((o->valign != 0.0) || (o->have_ellipsis)) &&
-           (obj->cur.geometry.h != o->last_h)))
-     {
-        o->formatted.valid = 0;
-        o->changed = 1;
-     }
-}
-
-static void
-evas_object_textblock_scale_update(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   _evas_textblock_invalidate_all(o);
-   _evas_textblock_changed(o, obj);
-}
-
-void
-_evas_object_textblock_rehint(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-   Evas_Object_Textblock_Paragraph *par;
-   Evas_Object_Textblock_Line *ln;
-
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   EINA_INLIST_FOREACH(o->paragraphs, par)
-     {
-        EINA_INLIST_FOREACH(par->lines, ln)
-          {
-             Evas_Object_Textblock_Item *it;
-
-             EINA_INLIST_FOREACH(ln->items, it)
-               {
-                  if (it->type == EVAS_TEXTBLOCK_ITEM_TEXT)
-                    {
-                       Evas_Object_Textblock_Text_Item *ti = _ITEM_TEXT(it);
-                       if (ti->parent.format->font.font)
-                         {  
-#ifdef EVAS_FRAME_QUEUING
-                            evas_common_pipe_op_text_flush((RGBA_Font *) ti->parent.format->font.font);
-#endif
-                            evas_font_load_hinting_set(obj->layer->evas,
-                                  ti->parent.format->font.font,
-                                  obj->layer->evas->hinting);
-                         }
-                    }
-               }
-          }
-     }
-   _evas_textblock_invalidate_all(o);
-   _evas_textblock_changed(o, obj);
-}
-
-/**
- * @}
- */
-
-#ifdef HAVE_TESTS
-/* return EINA_FALSE on error, used in unit_testing */
-EAPI Eina_Bool
-_evas_textblock_check_item_node_link(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-   Evas_Object_Textblock_Paragraph *par;
-   Evas_Object_Textblock_Line *ln;
-   Evas_Object_Textblock_Item *it;
-
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   if (!o) return EINA_FALSE;
-
-   if (!o->formatted.valid) _relayout(obj);
-
-   EINA_INLIST_FOREACH(o->paragraphs, par)
-     {
-        EINA_INLIST_FOREACH(par->lines, ln)
-          {
-             EINA_INLIST_FOREACH(ln->items, it)
-               {
-                  if (it->text_node != par->text_node)
-                     return EINA_FALSE;
-               }
-          }
-     }
-   return EINA_TRUE;
-}
-
-EAPI int
-_evas_textblock_format_offset_get(const Evas_Object_Textblock_Node_Format *n)
-{
-   return n->offset;
-}
-#endif
-
-#if 0
-/* Good for debugging */
-void
-pfnode(Evas_Object_Textblock_Node_Format *n)
-{
-   printf("Format Node: %p\n", n);
-   printf("next = %p, prev = %p, last = %p\n", EINA_INLIST_GET(n)->next, EINA_INLIST_GET(n)->prev, EINA_INLIST_GET(n)->last);
-   printf("text_node = %p, offset = %u, visible = %d\n", n->text_node, n->offset, n->visible);
-   printf("'%s'\n", eina_strbuf_string_get(n->format));
-}
-
-void
-ptnode(Evas_Object_Textblock_Node_Text *n)
-{
-   printf("Text Node: %p\n", n);
-   printf("next = %p, prev = %p, last = %p\n", EINA_INLIST_GET(n)->next, EINA_INLIST_GET(n)->prev, EINA_INLIST_GET(n)->last);
-   printf("format_node = %p\n", n->format_node);
-   printf("'%ls'\n", eina_ustrbuf_string_get(n->unicode));
-}
-
-void
-pitem(Evas_Object_Textblock_Item *it)
-{
-   Evas_Object_Textblock_Text_Item *ti;
-   Evas_Object_Textblock_Format_Item *fi;
-   printf("Item: %p\n", it);
-   printf("Type: %s (%d)\n", (it->type == EVAS_TEXTBLOCK_ITEM_TEXT) ?
-         "TEXT" : "FORMAT", it->type);
-   printf("Text pos: %d Visual pos: %d\n", it->text_pos,
-#ifdef BIDI_SUPPORT
-         it->visual_pos
-#else
-         it->text_pos
-#endif
-         );
-   printf("Coords: x = %d w = %d adv = %d\n", (int) it->x, (int) it->w,
-         (int) it->adv);
-   if (it->type == EVAS_TEXTBLOCK_ITEM_TEXT)
-     {
-        ti = _ITEM_TEXT(it);
-        printf("Text: '%*ls'\n", ti->text_props.text_len, GET_ITEM_TEXT(ti));
-     }
-   else
-     {
-        fi = _ITEM_FORMAT(it);
-        printf("Format: '%s'\n", fi->item);
-     }
-}
-
-void
-ppar(Evas_Object_Textblock_Paragraph *par)
-{
-   Evas_Object_Textblock_Item *it;
-   Eina_List *i;
-   EINA_LIST_FOREACH(par->logical_items, i, it)
-     {
-        printf("***********************\n");
-        pitem(it);
-     }
-}
-
-#endif
-
diff --git a/libraries/evas/src/lib/canvas/evas_rectangle.c b/libraries/evas/src/lib/canvas/evas_rectangle.c
deleted file mode 100644
index da6b701..0000000
--- a/libraries/evas/src/lib/canvas/evas_rectangle.c
+++ /dev/null
@@ -1,98 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-
-void
-evas_rects_return_difference_rects(Eina_Array *rects, int x, int y, int w, int h, int xx, int yy, int ww, int hh)
-{
-   if (!RECTS_INTERSECT(x, y, w, h, xx, yy, ww, hh))
-     {
-        evas_add_rect(rects, x, y, w, h);
-        evas_add_rect(rects, xx, yy, ww, hh);
-     }
-   else
-     {
-        int pt_x[4], pt_y[4], i, j;
-
-        if (x < xx)
-          {
-             pt_x[0] = x;
-             pt_x[1] = xx;
-          }
-        else
-          {
-             pt_x[0] = xx;
-             pt_x[1] = x;
-          }
-        if ((x + w) < (xx + ww))
-          {
-             pt_x[2] = x + w;
-             pt_x[3] = xx + ww;
-          }
-        else
-          {
-             pt_x[2] = xx + ww;
-             pt_x[3] = x + w;
-          }
-        if (y < yy)
-          {
-             pt_y[0] = y;
-             pt_y[1] = yy;
-          }
-        else
-          {
-             pt_y[0] = yy;
-             pt_y[1] = y;
-          }
-        if ((y + h) < (yy + hh))
-          {
-             pt_y[2] = y + h;
-             pt_y[3] = yy + hh;
-          }
-        else
-          {
-             pt_y[2] = yy + hh;
-             pt_y[3] = y + h;
-          }
-        for (j = 0; j < 3; j++)
-          {
-             for (i = 0; i < 3; i++)
-               {
-                  int intsec1, intsec2;
-                  int tx, ty, tw, th;
-
-                  tx = pt_x[i];
-                  ty = pt_y[j];
-                  tw = pt_x[i + 1] - pt_x[i];
-                  th = pt_y[j + 1] - pt_y[j];
-
-                  intsec1 = (RECTS_INTERSECT(tx, ty, tw, th, x, y, w, h));
-                  intsec2 = (RECTS_INTERSECT(tx, ty, tw, th, xx, yy, ww, hh));
-                  if (intsec1 ^ intsec2)
-                    {
-                       evas_add_rect(rects, tx, ty, tw, th);
-                    }
-               }
-          }
-/*      if (tmp.count > 0) */
-/*        { */
-/*           unsigned int i; */
-
-/*           for (i = 0; i < tmp.count; ++i) */
-/*             { */
-/*                if ((tmp.array[i].w > 0) && (tmp.array[i].h > 0)) */
-/*                  { */
-/*                     int intsec1, intsec2; */
-
-/*                     intsec1 = (RECTS_INTERSECT(tmp.array[i].x, tmp.array[i].y, tmp.array[i].w, tmp.array[i].h, x, y, w, h)); */
-/*                     intsec2 = (RECTS_INTERSECT(tmp.array[i].x, tmp.array[i].y, tmp.array[i].w, tmp.array[i].h, xx, yy, ww, hh)); */
-/*                     if (intsec1 ^ intsec2) */
-/*                       { */
-/*                          evas_add_rect(rects, tmp.array[i].x, tmp.array[i].y, tmp.array[i].w, tmp.array[i].h); */
-/*                       } */
-/*                  } */
-/*             } */
-/*           free(tmp.array); */
-/*        } */
-
-     }
-}
diff --git a/libraries/evas/src/lib/canvas/evas_render.c b/libraries/evas/src/lib/canvas/evas_render.c
deleted file mode 100644
index 32ce988..0000000
--- a/libraries/evas/src/lib/canvas/evas_render.c
+++ /dev/null
@@ -1,1914 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-#include <math.h>
-
-// debug rendering
-/* #define REND_DGB 1 */
-/* #define STDOUT_DBG 1 */
-
-#ifdef REND_DGB
-static FILE *dbf = NULL;
-
-static void
-rend_dbg(const char *txt)
-{
-   if (!dbf)
-     {
-#ifdef STDOUT_DBG
-        dbf = stdout;
-#else
-        dbf = fopen("EVAS-RENDER-DEBUG.log", "w");
-#endif
-        if (!dbf) return;
-     }
-   fputs(txt, dbf);
-   fflush(dbf);
-}
-#define RD(args...) \
-   { \
-      char __tmpbuf[4096]; \
-      \
-      snprintf(__tmpbuf, sizeof(__tmpbuf), ##args); \
-      rend_dbg(__tmpbuf); \
-   }
-#define RDI(xxxx) \
-   { \
-      char __tmpbuf[4096]; int __tmpi; \
-      for (__tmpi = 0; __tmpi < xxxx; __tmpi++) \
-        __tmpbuf[__tmpi] = ' '; \
-      __tmpbuf[__tmpi] = 0; \
-      rend_dbg(__tmpbuf); \
-   }
-#else
-#define RD(args...)
-#define RDI(x)
-#endif
-
-static Eina_List *
-evas_render_updates_internal(Evas *e, unsigned char make_updates, unsigned char do_draw);
-
-EAPI void
-evas_damage_rectangle_add(Evas *e, int x, int y, int w, int h)
-{
-   Eina_Rectangle *r;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-   NEW_RECT(r, x, y, w, h);
-   if (!r) return;
-   e->damages = eina_list_append(e->damages, r);
-   e->changed = 1;
-}
-
-EAPI void
-evas_obscured_rectangle_add(Evas *e, int x, int y, int w, int h)
-{
-   Eina_Rectangle *r;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-   NEW_RECT(r, x, y, w, h);
-   if (!r) return;
-   e->obscures = eina_list_append(e->obscures, r);
-}
-
-EAPI void
-evas_obscured_clear(Evas *e)
-{
-   Eina_Rectangle *r;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-   EINA_LIST_FREE(e->obscures, r)
-     {
-        eina_rectangle_free(r);
-     }
-}
-
-static Eina_Bool
-_evas_render_has_map(Evas_Object *obj)
-{
-   return ((!((obj->func->can_map) && (obj->func->can_map(obj)))) &&
-           ((obj->cur.map) && (obj->cur.usemap)));
-   //   return ((obj->cur.map) && (obj->cur.usemap));
-}
-
-static Eina_Bool
-_evas_render_had_map(Evas_Object *obj)
-{
-   return ((obj->prev.map) && (obj->prev.usemap));
-   //   return ((!obj->cur.map) && (obj->prev.usemap));
-}
-
-static Eina_Bool
-_evas_render_is_relevant(Evas_Object *obj)
-{
-   return ((evas_object_is_visible(obj) && (!obj->cur.have_clipees)) ||
-           (evas_object_was_visible(obj) && (!obj->prev.have_clipees)));
-}
-
-static Eina_Bool
-_evas_render_can_render(Evas_Object *obj)
-{
-   return (evas_object_is_visible(obj) && (!obj->cur.have_clipees));
-}
-
-static void
-_evas_render_prev_cur_clip_cache_add(Evas *e, Evas_Object *obj)
-{
-   e->engine.func->output_redraws_rect_add(e->engine.data.output,
-                                           obj->prev.cache.clip.x,
-                                           obj->prev.cache.clip.y,
-                                           obj->prev.cache.clip.w,
-                                           obj->prev.cache.clip.h);
-   e->engine.func->output_redraws_rect_add(e->engine.data.output,
-                                           obj->cur.cache.clip.x,
-                                           obj->cur.cache.clip.y,
-                                           obj->cur.cache.clip.w,
-                                           obj->cur.cache.clip.h);
-}
-
-static void
-_evas_render_cur_clip_cache_del(Evas *e, Evas_Object *obj)
-{
-   Evas_Coord x, y, w, h;
-   
-   x = obj->cur.cache.clip.x;
-   y = obj->cur.cache.clip.y;
-   w = obj->cur.cache.clip.w;
-   h = obj->cur.cache.clip.h;
-   if (obj->cur.clipper)
-     {
-        RECTS_CLIP_TO_RECT(x, y, w, h,
-                           obj->cur.clipper->cur.cache.clip.x,
-                           obj->cur.clipper->cur.cache.clip.y,
-                           obj->cur.clipper->cur.cache.clip.w,
-                           obj->cur.clipper->cur.cache.clip.h);
-     }
-   e->engine.func->output_redraws_rect_del(e->engine.data.output,
-                                           x, y, w, h);
-}
-
-static void
-_evas_render_phase1_direct(Evas *e,
-                           Eina_Array *active_objects,
-                           Eina_Array *restack_objects __UNUSED__,
-                           Eina_Array *delete_objects __UNUSED__,
-                           Eina_Array *render_objects)
-{
-   unsigned int i;
-   Eina_List *l;
-   Evas_Object *proxy;
-
-   RD("  [--- PHASE 1 DIRECT\n");
-   for (i = 0; i < active_objects->count; i++)
-     {
-        Evas_Object *obj;
-
-        obj = eina_array_data_get(active_objects, i);
-        if (obj->changed)
-          {
-             /* Flag need redraw on proxy too */
-             evas_object_clip_recalc(obj);
-             if (obj->proxy.proxies)
-               {
-                  EINA_LIST_FOREACH(obj->proxy.proxies, l, proxy)
-                    proxy->proxy.redraw = 1;
-               }
-          }
-     }
-   for (i = 0; i < render_objects->count; i++)
-     {
-        Evas_Object *obj;
-
-        obj = eina_array_data_get(render_objects, i);
-        RD("    OBJ [%p] changed %i\n", obj, obj->changed);
-        if (obj->changed)
-          {
-             /* Flag need redraw on proxy too */
-             evas_object_clip_recalc(obj);
-             obj->func->render_pre(obj);
-             if (obj->proxy.proxies)
-               {
-                  obj->proxy.redraw = 1;
-                  EINA_LIST_FOREACH(obj->proxy.proxies, l, proxy)
-                    {
-                       proxy->func->render_pre(proxy);
-                       _evas_render_prev_cur_clip_cache_add(e, proxy);
-                    }
-               }
-             else if (obj->proxy.redraw)
-               {
-                  _evas_render_prev_cur_clip_cache_add(e, obj);
-               }
-             if (obj->pre_render_done)
-               {
-                  RD("      pre-render-done smart:%p|%p  [%p, %i] | [%p, %i] has_map:%i had_map:%i\n",
-                     obj->smart.smart,
-                     evas_object_smart_members_get_direct(obj),
-                     obj->cur.map, obj->cur.usemap,
-                     obj->prev.map, obj->prev.usemap,
-                     _evas_render_has_map(obj),
-                     _evas_render_had_map(obj));
-                  if ((obj->smart.smart) &&
-                      (_evas_render_has_map(obj)))
-                    {
-                       RD("      has map + smart\n");
-                       _evas_render_prev_cur_clip_cache_add(e, obj);
-                    }
-               }
-             else if (_evas_render_had_map(obj))
-               {
-                  RD("      no pre-render done\n");
-                  _evas_render_prev_cur_clip_cache_add(e, obj);
-               }
-          }
-        else
-          {
-             if (obj->smart.smart)
-               {
-                  //                  obj->func->render_pre(obj);
-               }
-             else if ((obj->rect_del) ||
-                      (evas_object_is_opaque(obj) && evas_object_is_visible(obj)))
-               {
-                  RD("    rect del\n");
-                  _evas_render_cur_clip_cache_del(e, obj);
-               }
-          }
-     }
-   RD("  ---]\n");
-}
-
-static Eina_Bool
-_evas_render_phase1_object_process(Evas *e, Evas_Object *obj,
-                                   Eina_Array *active_objects,
-                                   Eina_Array *restack_objects,
-                                   Eina_Array *delete_objects,
-                                   Eina_Array *render_objects,
-                                   int restack, int map,
-                                   int *redraw_all
-#ifdef REND_DGB
-                                   , int level
-#endif
-                                  )
-{
-   Eina_Bool clean_them = EINA_FALSE;
-   Evas_Object *obj2;
-   int is_active;
-   Eina_Bool hmap;
-
-   obj->rect_del = 0;
-   obj->render_pre = 0;
-
-#ifndef EVAS_FRAME_QUEUING
-   /* because of clip objects - delete 2 cycles later */
-   if (obj->delete_me == 2)
-#else
-     if (obj->delete_me == evas_common_frameq_get_frameq_sz() + 2)
-#endif
-       eina_array_push(delete_objects, obj);
-     else if (obj->delete_me != 0) obj->delete_me++;
-   /* If the object will be removed, we should not cache anything during this run. */
-   if (obj->delete_me != 0) clean_them = EINA_TRUE;
-
-   /* build active object list */
-   evas_object_clip_recalc(obj);
-   is_active = evas_object_is_active(obj);
-   obj->is_active = is_active;
-
-   RDI(level);
-   RD("    [--- PROCESS [%p] '%s' active = %i, del = %i | %i %i %ix%i\n", obj, obj->type, is_active, obj->delete_me, obj->cur.geometry.x, obj->cur.geometry.y, obj->cur.geometry.w, obj->cur.geometry.h);
-   if ((is_active) || (obj->delete_me != 0))
-     eina_array_push(active_objects, obj);
-
-#ifdef REND_DGB
-   if (!is_active)
-     {
-        RDI(level);
-        RD("     [%p] vis: %i, cache.clip.vis: %i cache.clip.a: %i [%p]\n", obj, obj->cur.visible, obj->cur.cache.clip.visible, obj->cur.cache.clip.a, obj->func->is_visible);
-     }
-#endif
-
-   map = _evas_render_has_map(obj);
-   hmap = _evas_render_had_map(obj);
-
-   if ((restack) && (!map))
-     {
-        if (!obj->changed)
-          {
-             eina_array_push(&e->pending_objects, obj);
-             obj->changed = 1;
-          }
-        obj->restack = 1;
-        clean_them = EINA_TRUE;
-     }
-
-   if (map)
-     {
-        RDI(level);
-        RD("      obj mapped\n");
-        if (obj->changed)
-          {
-             if (map != hmap)
-               {
-                  *redraw_all = 1;
-               }
-             evas_object_clip_recalc(obj);
-             if ((obj->restack) &&
-                 (is_active) && (!obj->clip.clipees) &&
-                 ((evas_object_is_visible(obj) && (!obj->cur.have_clipees)) ||
-                  (evas_object_was_visible(obj) && (!obj->prev.have_clipees))))
-               {
-                  eina_array_push(render_objects, obj);
-                  _evas_render_prev_cur_clip_cache_add(e, obj);
-                  obj->render_pre = 1;
-               }
-             else if ((is_active) && (!obj->clip.clipees) &&
-                      ((evas_object_is_visible(obj) && (!obj->cur.have_clipees)) ||
-                       (evas_object_was_visible(obj) && (!obj->prev.have_clipees))))
-               {
-                  eina_array_push(render_objects, obj);
-                  _evas_render_prev_cur_clip_cache_add(e, obj);
-                  obj->render_pre = 1;
-               }
-          }
-        return clean_them;
-     }
-   else if (_evas_render_had_map(obj))
-     {
-        RDI(level);
-        RD("      had map - restack objs\n");
-        //        eina_array_push(restack_objects, obj);
-        _evas_render_prev_cur_clip_cache_add(e, obj);
-        if (obj->changed)
-          {
-             if (hmap)
-               {
-                  if (!map)
-                    {
-                       if ((obj->cur.map) && (obj->cur.usemap)) map = 1;
-                    }
-               }
-             if (map != hmap)
-               {
-                  *redraw_all = 1;
-               }
-          }
-     }
-
-   /* handle normal rendering. this object knows how to handle maps */
-   if (obj->changed)
-     {
-        if (obj->smart.smart)
-          {
-             RDI(level);
-             RD("      changed + smart - render ok\n");
-             eina_array_push(render_objects, obj);
-             obj->render_pre = 1;
-             EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(obj), obj2)
-               {
-                  _evas_render_phase1_object_process(e, obj2,
-                                                     active_objects,
-                                                     restack_objects,
-                                                     delete_objects,
-                                                     render_objects,
-                                                     obj->restack,
-                                                     map,
-                                                     redraw_all
-#ifdef REND_DGB
-                                                     , level + 1
-#endif
-                                                    );
-               }
-          }
-        else
-          {
-             if ((is_active) && (!obj->clip.clipees) &&
-                 _evas_render_is_relevant(obj))
-               {
-                  RDI(level);
-                  RD("      relevant + active\n");
-                  if (obj->restack)
-                    eina_array_push(restack_objects, obj);
-                  else
-                    {
-                       eina_array_push(render_objects, obj);
-                       obj->render_pre = 1;
-                    }
-               }
-             else
-               {
-                  RDI(level);
-                  RD("      skip - not smart, not active or clippees or not relevant\n");
-               }
-          }
-     }
-   else
-     {
-        RD("      not changed... [%i] -> (%i %i %p %i) [%i]\n",
-           evas_object_is_visible(obj),
-           obj->cur.visible, obj->cur.cache.clip.visible, obj->smart.smart, obj->cur.cache.clip.a,
-           evas_object_was_visible(obj));
-        if ((!obj->clip.clipees) && (obj->delete_me == 0) &&
-            (_evas_render_can_render(obj) ||
-             (evas_object_was_visible(obj) && (!obj->prev.have_clipees))))
-          {
-             if (obj->smart.smart)
-               {
-                  RDI(level);
-                  RD("      smart + visible/was visible + not clip\n");
-                  eina_array_push(render_objects, obj);
-                  obj->render_pre = 1;
-                  EINA_INLIST_FOREACH
-                     (evas_object_smart_members_get_direct(obj), obj2)
-                       {
-                          _evas_render_phase1_object_process(e, obj2,
-                                                             active_objects,
-                                                             restack_objects,
-                                                             delete_objects,
-                                                             render_objects,
-                                                             restack, map,
-                                                             redraw_all
-#ifdef REND_DGB
-                                                             , level + 1
-#endif
-                                                            );
-                       }
-               }
-             else
-               {
-                  if (evas_object_is_opaque(obj) &&
-                      evas_object_is_visible(obj))
-                    {
-                       RDI(level);
-                       RD("      opaque + visible\n");
-                       eina_array_push(render_objects, obj);
-                       obj->rect_del = 1;
-                    }
-                  else if (evas_object_is_visible(obj))
-                    {
-                       RDI(level);
-                       RD("      visible\n");
-                       eina_array_push(render_objects, obj);
-                       obj->render_pre = 1;
-                    }
-                  else
-                    {
-                       RDI(level);
-                       RD("      skip\n");
-                    }
-               }
-          }
-        /*
-           else if (obj->smart.smart)
-           {
-           RDI(level);
-           RD("      smart + mot visible/was visible\n");
-           eina_array_push(render_objects, obj);
-           obj->render_pre = 1;
-           EINA_INLIST_FOREACH
-           (evas_object_smart_members_get_direct(obj), obj2)
-           {
-           _evas_render_phase1_object_process(e, obj2,
-           active_objects,
-           restack_objects,
-           delete_objects,
-           render_objects,
-           restack, map,
-           redraw_all
-#ifdef REND_DGB
-, level + 1
-#endif
-);
-}
-}
-         */
-}
-if (!is_active) obj->restack = 0;
-RDI(level);
-RD("    ---]\n");
-return clean_them;
-}
-
-static Eina_Bool
-_evas_render_phase1_process(Evas *e,
-                            Eina_Array *active_objects,
-                            Eina_Array *restack_objects,
-                            Eina_Array *delete_objects,
-                            Eina_Array *render_objects,
-                            int *redraw_all)
-{
-   Evas_Layer *lay;
-   Eina_Bool clean_them = EINA_FALSE;
-
-   RD("  [--- PHASE 1\n");
-   EINA_INLIST_FOREACH(e->layers, lay)
-     {
-        Evas_Object *obj;
-
-        EINA_INLIST_FOREACH(lay->objects, obj)
-          {
-             clean_them |= _evas_render_phase1_object_process
-                (e, obj, active_objects, restack_objects, delete_objects,
-                 render_objects, 0, 0, redraw_all
-#ifdef REND_DGB
-                 , 1
-#endif
-                );
-          }
-     }
-   RD("  ---]\n");
-   return clean_them;
-}
-
-static void
-_evas_render_check_pending_objects(Eina_Array *pending_objects, Evas *e)
-{
-   unsigned int i;
-
-   for (i = 0; i < pending_objects->count; ++i)
-     {
-        Evas_Object *obj;
-        int is_active, ok = 0;
-
-        obj = eina_array_data_get(pending_objects, i);
-
-        if (!obj->layer) goto clean_stuff;
-
-        evas_object_clip_recalc(obj);
-        is_active = evas_object_is_active(obj);
-
-        if ((!is_active) && (!obj->is_active) && (!obj->render_pre) &&
-            (!obj->rect_del))
-          {
-             ok = 1;
-             goto clean_stuff;
-          }
-
-        if (obj->is_active == is_active)
-          {
-             if (obj->changed)
-               {
-                  if (obj->smart.smart)
-                    {
-                       if (obj->render_pre || obj->rect_del) ok = 1;
-                    }
-                  else
-                    if ((is_active) && (obj->restack) && (!obj->clip.clipees) &&
-                        (_evas_render_can_render(obj) ||
-                         (evas_object_was_visible(obj) && (!obj->prev.have_clipees))))
-                      {
-                         if (!(obj->render_pre || obj->rect_del)) ok = 1;
-                      }
-                    else
-                      if (is_active && (!obj->clip.clipees) &&
-                          (_evas_render_can_render(obj) ||
-                           (evas_object_was_visible(obj) && (!obj->prev.have_clipees))))
-                        {
-                           if (obj->render_pre || obj->rect_del) ok = 1;
-                        }
-               }
-             else
-               {
-                  if ((!obj->clip.clipees) && (obj->delete_me == 0) &&
-                      (!obj->cur.have_clipees || (evas_object_was_visible(obj) && (!obj->prev.have_clipees)))
-                      && evas_object_is_opaque(obj) && evas_object_is_visible(obj))
-                    {
-                       if (obj->rect_del || obj->smart.smart) ok = 1;
-                    }
-               }
-          }
-
-clean_stuff:
-        if (!ok)
-          {
-             eina_array_clean(&e->active_objects);
-             eina_array_clean(&e->render_objects);
-             eina_array_clean(&e->restack_objects);
-             eina_array_clean(&e->delete_objects);
-             e->invalidate = 1;
-             return ;
-          }
-     }
-}
-
-Eina_Bool
-pending_change(void *data, void *gdata __UNUSED__)
-{
-   Evas_Object *obj;
-
-   obj = data;
-   if (obj->delete_me) return EINA_FALSE;
-   if (obj->pre_render_done)
-     {
-        RD("  OBJ [%p] pending change %i -> 0, pre %i\n", obj, obj->changed, obj->pre_render_done);
-        obj->pre_render_done = 0;
-        //// FIXME: this wipes out changes
-        obj->changed = 0;
-        obj->changed_move_only = 0;
-        obj->changed_nomove = 0;
-        obj->changed_move = 0;
-        obj->changed_map = 0;
-        obj->changed_pchange = 0;
-     }
-   return obj->changed ? EINA_TRUE : EINA_FALSE;
-}
-/*
-   static void
-   unchange(Evas_Object *obj)
-   {
-   Evas_Object *obj2;
-
-   if (!obj->changed) return;
-   obj->changed = 0;
-   obj->changed_move_only = 0;
-   obj->changed_nomove = 0;
-   obj->changed_move = 0;
-   EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(obj), obj2)
-   {
-   unchange(obj2);
-   }
-   }
-
-   static int
-   chlist(Evas_Object *obj, int i)
-   {
-   Evas_Object *obj2;
-   int j;
-   int ret = 0;
-
-   if (!obj->changed) return 0;
-   for (j = 0; j < i; j++) printf(" ");
-   printf("ch2 %p %s %i [%i %i %ix%i] v %i/%i [r%i] %p\n", obj,
-   obj->type,
-   obj->changed_move_only,
-   obj->cur.geometry.x,
-   obj->cur.geometry.y,
-   obj->cur.geometry.w,
-   obj->cur.geometry.h,
-   obj->cur.visible,
-   obj->prev.visible,
-   obj->restack,
-   obj->clip.clipees);
-   EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(obj), obj2)
-   {
-   if (obj2->changed)
-   ret |= chlist(obj2, i + 1);
-   }
-   }
- */
-static Eina_Bool
-_evas_render_can_use_overlay(Evas *e, Evas_Object *obj)
-{
-   Eina_Rectangle *r;
-   Evas_Object *tmp;
-   Eina_List *alphas = NULL;
-   Eina_List *opaques = NULL;
-   Evas_Object *video_parent = NULL;
-   Eina_Rectangle zone;
-   Evas_Coord xc1, yc1, xc2, yc2;
-   unsigned int i;
-   Eina_Bool nooverlay;
-
-   video_parent = _evas_object_image_video_parent_get(obj);
-
-   /* Check if any one is the stack make this object mapped */
-   tmp = obj;
-   while (tmp && !_evas_render_has_map(tmp))
-     tmp = tmp->smart.parent;
-
-   if (tmp && _evas_render_has_map(tmp)) return EINA_FALSE; /* we are mapped, we can't be an overlay */
-
-   if (!evas_object_is_visible(obj)) return EINA_FALSE; /* no need to update the overlay if it's not visible */
-
-   /* If any recoloring of the surface is needed, n overlay to */
-   if ((obj->cur.cache.clip.r != 255) ||
-       (obj->cur.cache.clip.g != 255) ||
-       (obj->cur.cache.clip.b != 255) ||
-       (obj->cur.cache.clip.a != 255))
-     return EINA_FALSE;
-
-   /* Check presence of transparent object on top of the video object */
-   EINA_RECTANGLE_SET(&zone,
-                      obj->cur.cache.clip.x,
-                      obj->cur.cache.clip.y,
-                      obj->cur.cache.clip.w,
-                      obj->cur.cache.clip.h);
-
-   for (i = e->active_objects.count - 1; i > 0; i--)
-     {
-        Eina_Rectangle self;
-        Eina_Rectangle *match;
-        Evas_Object *current;
-        Eina_List *l;
-        int xm1, ym1, xm2, ym2;
-
-        current = eina_array_data_get(&e->active_objects, i);
-
-        /* Did we find the video object in the stack ? */
-        if (current == video_parent || current == obj)
-          break;
-
-        EINA_RECTANGLE_SET(&self,
-                           current->cur.cache.clip.x,
-                           current->cur.cache.clip.y,
-                           current->cur.cache.clip.w,
-                           current->cur.cache.clip.h);
-
-        /* This doesn't cover the area of the video object, so don't bother with that object */
-        if (!eina_rectangles_intersect(&zone, &self))
-          continue ;
-
-        xc1 = current->cur.cache.clip.x;
-        yc1 = current->cur.cache.clip.y;
-        xc2 = current->cur.cache.clip.x + current->cur.cache.clip.w;
-        yc2 = current->cur.cache.clip.y + current->cur.cache.clip.h;
-
-        if (evas_object_is_visible(current) &&
-            (!current->clip.clipees) &&
-            (current->cur.visible) &&
-            (!current->delete_me) &&
-            (current->cur.cache.clip.visible) &&
-            (!current->smart.smart))
-          {
-             Eina_Bool included = EINA_FALSE;
-
-             if (evas_object_is_opaque(current) ||
-                 ((current->func->has_opaque_rect) &&
-                  (current->func->has_opaque_rect(current))))
-               {
-                  /* The object is opaque */
-
-                  /* Check if the opaque object is inside another opaque object */
-                  EINA_LIST_FOREACH(opaques, l, match)
-                    {
-                       xm1 = match->x;
-                       ym1 = match->y;
-                       xm2 = match->x + match->w;
-                       ym2 = match->y + match->h;
-
-                       /* Both object are included */
-                       if (xc1 >= xm1 && yc1 >= ym1 && xc2 <= xm2 && yc2 <= ym2)
-                         {
-                            included = EINA_TRUE;
-                            break;
-                         }
-                    }
-
-                  /* Not included yet */
-                  if (!included)
-                    {
-                       Eina_List *ln;
-                       Evas_Coord xn2, yn2;
-
-                       r = eina_rectangle_new(current->cur.cache.clip.x, current->cur.cache.clip.y,
-                                              current->cur.cache.clip.w, current->cur.cache.clip.h);
-
-                       opaques = eina_list_append(opaques, r);
-
-                       xn2 = r->x + r->w;
-                       yn2 = r->y + r->h;
-
-                       /* Remove all the transparent object that are covered by the new opaque object */
-                       EINA_LIST_FOREACH_SAFE(alphas, l, ln, match)
-                         {
-                            xm1 = match->x;
-                            ym1 = match->y;
-                            xm2 = match->x + match->w;
-                            ym2 = match->y + match->h;
-
-                            if (xm1 >= r->x && ym1 >= r->y && xm2 <= xn2 && ym2 <= yn2)
-                              {
-                                 /* The new rectangle is over some transparent object,
-                                    so remove the transparent object */
-                                 alphas = eina_list_remove_list(alphas, l);
-                              }
-                         }
-                    }
-               }
-             else
-               {
-                  /* The object has some transparency */
-
-                  /* Check if the transparent object is inside any other transparent object */
-                  EINA_LIST_FOREACH(alphas, l, match)
-                    {
-                       xm1 = match->x;
-                       ym1 = match->y;
-                       xm2 = match->x + match->w;
-                       ym2 = match->y + match->h;
-
-                       /* Both object are included */
-                       if (xc1 >= xm1 && yc1 >= ym1 && xc2 <= xm2 && yc2 <= ym2)
-                         {
-                            included = EINA_TRUE;
-                            break;
-                         }
-                    }
-
-                  /* If not check if it is inside any opaque one */
-                  if (!included)
-                    {
-                       EINA_LIST_FOREACH(opaques, l, match)
-                         {
-                            xm1 = match->x;
-                            ym1 = match->y;
-                            xm2 = match->x + match->w;
-                            ym2 = match->y + match->h;
-
-                            /* Both object are included */
-                            if (xc1 >= xm1 && yc1 >= ym1 && xc2 <= xm2 && yc2 <= ym2)
-                              {
-                                 included = EINA_TRUE;
-                                 break;
-                              }
-                         }
-                    }
-
-                  /* No inclusion at all, so add it */
-                  if (!included)
-                    {
-                       r = eina_rectangle_new(current->cur.cache.clip.x, current->cur.cache.clip.y,
-                                              current->cur.cache.clip.w, current->cur.cache.clip.h);
-
-                       alphas = eina_list_append(alphas, r);
-                    }
-               }
-          }
-     }
-
-   /* If there is any pending transparent object, then no overlay */
-   nooverlay = !!eina_list_count(alphas);
-
-   EINA_LIST_FREE(alphas, r)
-     eina_rectangle_free(r);
-   EINA_LIST_FREE(opaques, r)
-     eina_rectangle_free(r);
-
-   if (nooverlay)
-     return EINA_FALSE;
-
-   return EINA_TRUE;
-}
-
-Eina_Bool
-evas_render_mapped(Evas *e, Evas_Object *obj, void *context, void *surface,
-                   int off_x, int off_y, int mapped,
-                   int ecx, int ecy, int ecw, int ech
-#ifdef REND_DGB
-                   , int level
-#endif
-                  )
-{
-   void *ctx;
-   Evas_Object *obj2;
-   Eina_Bool clean_them = EINA_FALSE;
-
-   evas_object_clip_recalc(obj);
-   RDI(level);
-   RD("      { evas_render_mapped(%p, %p,   %p, %p,   %i, %i,   %i,   %i)\n", e, obj, context, surface, off_x, off_y, mapped, level);
-   if (mapped)
-     {
-        if ((!evas_object_is_visible(obj)) || (obj->clip.clipees) ||
-            (obj->cur.have_clipees))
-          {
-             RDI(level);
-             RD("      }\n");
-             return clean_them;
-          }
-     }
-   else if (!(((evas_object_is_active(obj) && (!obj->clip.clipees) &&
-                (_evas_render_can_render(obj))))
-             ))
-     {
-        RDI(level);
-        RD("      }\n");
-        return clean_them;
-     }
-
-   // set render_pre - for child objs that may not have gotten it.
-   obj->pre_render_done = 1;
-   RD("          Hasmap: %p (%d) %p %d -> %d\n",obj->func->can_map,
-      obj->func->can_map ? obj->func->can_map(obj): -1,
-      obj->cur.map, obj->cur.usemap,
-      _evas_render_has_map(obj));
-   if (_evas_render_has_map(obj))
-     {
-        const Evas_Map_Point *p, *p_end;
-        RGBA_Map_Point pts[4], *pt;
-        int sw, sh;
-        int changed = 0, rendered = 0;
-
-        clean_them = EINA_TRUE;
-
-        sw = obj->cur.geometry.w;
-        sh = obj->cur.geometry.h;
-        RDI(level);
-        RD("        mapped obj: %ix%i\n", sw, sh);
-        if ((sw <= 0) || (sh <= 0))
-          {
-             RDI(level);
-             RD("      }\n");
-             return clean_them;
-          }
-
-        pts[0].px = obj->cur.map->persp.px << FP;
-        pts[0].py = obj->cur.map->persp.py << FP;
-        pts[0].foc = obj->cur.map->persp.foc << FP;
-        pts[0].z0 = obj->cur.map->persp.z0 << FP;
-
-        p = obj->cur.map->points;
-        p_end = p + obj->cur.map->count;
-        pt = pts;
-        for (; p < p_end; p++, pt++)
-          {
-             pt->x = (lround(p->x) + off_x) * FP1;
-             pt->y = (lround(p->y) + off_y) * FP1;
-             pt->z = (lround(p->z)        ) * FP1;
-             pt->fx = p->px;
-             pt->fy = p->py;
-             pt->fz = p->z;
-             pt->u = lround(p->u) * FP1;
-             pt->v = lround(p->v) * FP1;
-             if      (pt->u < 0) pt->u = 0;
-             else if (pt->u > (sw * FP1)) pt->u = (sw * FP1);
-             if      (pt->v < 0) pt->v = 0;
-             else if (pt->v > (sh * FP1)) pt->v = (sh * FP1);
-             pt->col = ARGB_JOIN(p->a, p->r, p->g, p->b);
-          }
-        /* Copy last for software engine */
-        if (obj->cur.map->count & 0x1)
-          {
-             pts[obj->cur.map->count] = pts[obj->cur.map->count - 1];
-          }
-
-
-        if (obj->cur.map->surface)
-          {
-             if ((obj->cur.map->surface_w != sw) ||
-                 (obj->cur.map->surface_h != sh))
-               {
-                  RDI(level);
-                  RD("        new surf: %ix%i\n", sw, sh);
-                  obj->layer->evas->engine.func->image_map_surface_free
-                     (e->engine.data.output, obj->cur.map->surface);
-                  obj->cur.map->surface = NULL;
-               }
-          }
-        if (!obj->cur.map->surface)
-          {
-             obj->cur.map->surface_w = sw;
-             obj->cur.map->surface_h = sh;
-
-             obj->cur.map->surface =
-                obj->layer->evas->engine.func->image_map_surface_new
-                (e->engine.data.output, obj->cur.map->surface_w,
-                 obj->cur.map->surface_h,
-                 obj->cur.map->alpha);
-             RDI(level);
-             RD("        fisrt surf: %ix%i\n", sw, sh);
-             changed = 1;
-          }
-        if (obj->smart.smart)
-          {
-             Evas_Object *o2;
-
-             EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(obj), o2)
-               {
-                  if (!evas_object_is_visible(o2) &&
-                      !evas_object_was_visible(o2))
-                    {
-                       o2->changed = 0;
-                       o2->changed_move_only = 0;
-                       o2->changed_nomove = 0;
-                       o2->changed_move = 0;
-                       o2->changed_map = 0;
-                       o2->changed_pchange = 0;
-                       continue;
-                    }
-                  if (o2->changed)
-                    {
-                       //                       chlist(o2, 0);
-                       changed = 1;
-                       o2->changed = 0;
-                       o2->changed_move_only = 0;
-                       o2->changed_nomove = 0;
-                       o2->changed_move = 0;
-                       o2->changed_map = 0;
-                       o2->changed_pchange = 0;
-                       break;
-                    }
-               }
-             //             unchange(obj);
-             obj->changed = 0;
-             obj->changed_move_only = 0;
-             obj->changed_nomove = 0;
-             obj->changed_move = 0;
-             obj->changed_map = 0;
-             obj->changed_pchange = 0;
-          }
-        else
-          {
-             if (obj->changed)
-               {
-                  if ((obj->changed_pchange) && (obj->changed_map))
-                    changed = 1;
-                  obj->changed = 0;
-                  obj->changed_move_only = 0;
-                  obj->changed_nomove = 0;
-                  obj->changed_move = 0;
-                  obj->changed_map = 0;
-                  obj->changed_pchange = 0;
-               }
-          }
-
-        // clear surface before re-render
-        if ((changed) && (obj->cur.map->surface))
-          {
-             int off_x2, off_y2;
-
-             RDI(level);
-             RD("        children redraw\n");
-             // FIXME: calculate "changes" within map surface and only clear
-             // and re-render those
-             if (obj->cur.map->alpha)
-               {
-                  ctx = e->engine.func->context_new(e->engine.data.output);
-                  e->engine.func->context_color_set
-                     (e->engine.data.output, ctx, 0, 0, 0, 0);
-                  e->engine.func->context_render_op_set
-                     (e->engine.data.output, ctx, EVAS_RENDER_COPY);
-                  e->engine.func->rectangle_draw(e->engine.data.output,
-                                                 ctx,
-                                                 obj->cur.map->surface,
-                                                 0, 0,
-                                                 obj->cur.map->surface_w,
-                                                 obj->cur.map->surface_h);
-                  e->engine.func->context_free(e->engine.data.output, ctx);
-               }
-             ctx = e->engine.func->context_new(e->engine.data.output);
-             off_x2 = -obj->cur.geometry.x;
-             off_y2 = -obj->cur.geometry.y;
-             if (obj->smart.smart)
-               {
-                  EINA_INLIST_FOREACH
-                     (evas_object_smart_members_get_direct(obj), obj2)
-                       {
-                          clean_them |= evas_render_mapped(e, obj2, ctx,
-                                                           obj->cur.map->surface,
-                                                           off_x2, off_y2, 1,
-                                                           ecx, ecy, ecw, ech
-#ifdef REND_DGB
-                                                           , level + 1
-#endif
-                                                          );
-                       }
-               }
-             else
-               {
-                  int x = 0, y = 0, w = 0, h = 0;
-
-                  w = obj->cur.map->surface_w;
-                  h = obj->cur.map->surface_h;
-                  RECTS_CLIP_TO_RECT(x, y, w, h,
-                                     obj->cur.geometry.x + off_x2,
-                                     obj->cur.geometry.y + off_y2,
-                                     obj->cur.geometry.w,
-                                     obj->cur.geometry.h);
-
-                  e->engine.func->context_clip_set(e->engine.data.output,
-                                                   ctx, x, y, w, h);
-                  obj->func->render(obj, e->engine.data.output, ctx,
-                                    obj->cur.map->surface, off_x2, off_y2);
-               }
-             e->engine.func->context_free(e->engine.data.output, ctx);
-             rendered = 1;
-          }
-
-        RDI(level);
-        RD("        draw map\n");
-
-        if (rendered)
-          {
-             obj->cur.map->surface = e->engine.func->image_dirty_region
-                (e->engine.data.output, obj->cur.map->surface,
-                 0, 0, obj->cur.map->surface_w, obj->cur.map->surface_h);
-          }
-        e->engine.func->context_clip_unset(e->engine.data.output,
-                                           e->engine.data.context);
-        if (obj->cur.map->surface)
-          {
-             if (obj->smart.smart)
-               {
-                  if (obj->cur.clipper)
-                    {
-                       int x, y, w, h;
-                       Evas_Object *tobj;
-
-                       obj->cur.cache.clip.dirty = 1;
-                       tobj = obj->cur.map_parent;
-                       obj->cur.map_parent = obj->cur.clipper->cur.map_parent;
-                       evas_object_clip_recalc(obj);
-                       obj->cur.map_parent = tobj;
-                       x = obj->cur.cache.clip.x;
-                       y = obj->cur.cache.clip.y;
-                       w = obj->cur.cache.clip.w;
-                       h = obj->cur.cache.clip.h;
-                       RECTS_CLIP_TO_RECT(x, y, w, h,
-                                          obj->cur.clipper->cur.cache.clip.x,
-                                          obj->cur.clipper->cur.cache.clip.y,
-                                          obj->cur.clipper->cur.cache.clip.w,
-                                          obj->cur.clipper->cur.cache.clip.h);
-                       e->engine.func->context_clip_set(e->engine.data.output,
-                                                        e->engine.data.context,
-                                                        x + off_x, y + off_y, w, h);
-                    }
-               }
-             else
-               {
-                  if (obj->cur.clipper)
-                    {
-                       int x, y, w, h;
-
-                       evas_object_clip_recalc(obj);
-                       x = obj->cur.cache.clip.x;
-                       y = obj->cur.cache.clip.y;
-                       w = obj->cur.cache.clip.w;
-                       h = obj->cur.cache.clip.h;
-                       RECTS_CLIP_TO_RECT(x, y, w, h,
-                                          obj->cur.clipper->cur.cache.clip.x,
-                                          obj->cur.clipper->cur.cache.clip.y,
-                                          obj->cur.clipper->cur.cache.clip.w,
-                                          obj->cur.clipper->cur.cache.clip.h);
-                       e->engine.func->context_clip_set(e->engine.data.output,
-                                                        e->engine.data.context,
-                                                        x + off_x, y + off_y, w, h);
-                    }
-               }
-          }
-//        if (surface == e->engine.data.output)
-          e->engine.func->context_clip_clip(e->engine.data.output,
-                                            e->engine.data.context,
-                                            ecx, ecy, ecw, ech);
-        if (obj->cur.cache.clip.visible)
-          {
-             obj->layer->evas->engine.func->image_map_draw
-               (e->engine.data.output, e->engine.data.context, surface,
-                   obj->cur.map->surface, obj->cur.map->count, pts,
-                   obj->cur.map->smooth, 0);
-          }
-        // FIXME: needs to cache these maps and
-        // keep them only rendering updates
-        //        obj->layer->evas->engine.func->image_map_surface_free
-        //          (e->engine.data.output, obj->cur.map->surface);
-        //        obj->cur.map->surface = NULL;
-     }
-   else
-     {
-        if (mapped)
-          {
-             RDI(level);
-             RD("        draw child of mapped obj\n");
-             ctx = e->engine.func->context_new(e->engine.data.output);
-             if (obj->smart.smart)
-               {
-                  EINA_INLIST_FOREACH
-                     (evas_object_smart_members_get_direct(obj), obj2)
-                       {
-                          clean_them |= evas_render_mapped(e, obj2, ctx,
-                                                           surface,
-                                                           off_x, off_y, 1,
-                                                           ecx, ecy, ecw, ech
-#ifdef REND_DGB
-                                                           , level + 1
-#endif
-                                                          );
-                       }
-               }
-             else
-               {
-                  if (!obj->cur.map)
-                    {
-                       int x, y, w, h;
-
-                       RDI(level);
-
-                       x = obj->cur.cache.clip.x + off_x;
-                       y = obj->cur.cache.clip.y + off_y;
-                       w = obj->cur.cache.clip.w;
-                       h = obj->cur.cache.clip.h;
-
-                       if (obj->cur.clipper)
-                         {
-                            if (_evas_render_has_map(obj))
-                              evas_object_clip_recalc(obj);
-
-                            RD("        clipper: %i %i %ix%i\n",
-                               obj->cur.clipper->cur.cache.clip.x + off_x,
-                               obj->cur.clipper->cur.cache.clip.y + off_y,
-                               obj->cur.clipper->cur.cache.clip.w,
-                               obj->cur.clipper->cur.cache.clip.h);
-
-                            RECTS_CLIP_TO_RECT(x, y, w, h,
-                                               obj->cur.clipper->cur.cache.clip.x + off_x,
-                                               obj->cur.clipper->cur.cache.clip.y + off_y,
-                                               obj->cur.clipper->cur.cache.clip.w,
-                                               obj->cur.clipper->cur.cache.clip.h);
-                         }
-
-                       RD("        clip: %i %i %ix%i [%i %i %ix%i]\n",
-                          obj->cur.cache.clip.x + off_x,
-                          obj->cur.cache.clip.y + off_y,
-                          obj->cur.cache.clip.w,
-                          obj->cur.cache.clip.h,
-                          obj->cur.geometry.x + off_x,
-                          obj->cur.geometry.y + off_y,
-                          obj->cur.geometry.w,
-                          obj->cur.geometry.h);
-                       e->engine.func->context_clip_set(e->engine.data.output,
-                                                        ctx, x, y, w, h);
-                    }
-                  else
-                    {
-                       RDI(level);
-                       RD("        noclip\n");
-                    }
-                  obj->func->render(obj, e->engine.data.output, ctx,
-                                    surface, off_x, off_y);
-                  /*
-                                      obj->layer->evas->engine.func->context_color_set(e->engine.data.output,
-                                      ctx,
-                                      0, 30, 0, 30);
-                                      obj->layer->evas->engine.func->rectangle_draw(e->engine.data.output,
-                                      ctx,
-                                      surface,
-                                      0, 0, 9999, 9999);
-                   */
-               }
-             e->engine.func->context_free(e->engine.data.output, ctx);
-          }
-        else
-          {
-             if (obj->cur.clipper)
-               {
-                  int x, y, w, h;
-
-                  if (_evas_render_has_map(obj))
-                    evas_object_clip_recalc(obj);
-                  x = obj->cur.cache.clip.x;
-                  y = obj->cur.cache.clip.y;
-                  w = obj->cur.cache.clip.w;
-                  h = obj->cur.cache.clip.h;
-                  RECTS_CLIP_TO_RECT(x, y, w, h,
-                                     obj->cur.clipper->cur.cache.clip.x,
-                                     obj->cur.clipper->cur.cache.clip.y,
-                                     obj->cur.clipper->cur.cache.clip.w,
-                                     obj->cur.clipper->cur.cache.clip.h);
-                  e->engine.func->context_clip_set(e->engine.data.output,
-                                                   e->engine.data.context,
-                                                   x + off_x, y + off_y, w, h);
-                  e->engine.func->context_clip_clip(e->engine.data.output,
-                                                    e->engine.data.context,
-                                                    ecx, ecy, ecw, ech);
-               }
-
-             RDI(level);
-             RD("        draw normal obj\n");
-             obj->func->render(obj, e->engine.data.output, context, surface,
-                               off_x, off_y);
-          }
-     }
-   RDI(level);
-   RD("      }\n");
-
-   return clean_them;
-}
-
-static void
-_evas_render_cutout_add(Evas *e, Evas_Object *obj, int off_x, int off_y)
-{
-   if (evas_object_is_opaque(obj))
-     {
-        Evas_Coord cox, coy, cow, coh;
-        
-        cox = obj->cur.cache.clip.x;
-        coy = obj->cur.cache.clip.y;
-        cow = obj->cur.cache.clip.w;
-        coh = obj->cur.cache.clip.h;
-        if ((obj->cur.map) && (obj->cur.usemap))
-          {
-             Evas_Object *oo;
-             
-             oo = obj;
-             while (oo->cur.clipper)
-               {
-                  if ((oo->cur.clipper->cur.map_parent 
-                       != oo->cur.map_parent) &&
-                      (!((oo->cur.map) && (oo->cur.usemap))))
-                    break;
-                  RECTS_CLIP_TO_RECT(cox, coy, cow, coh,
-                                     oo->cur.geometry.x,
-                                     oo->cur.geometry.y,
-                                     oo->cur.geometry.w,
-                                     oo->cur.geometry.h);
-                  oo = oo->cur.clipper;
-               }
-          }
-        e->engine.func->context_cutout_add
-          (e->engine.data.output, e->engine.data.context,
-              cox + off_x, coy + off_y, cow, coh);
-     }
-   else
-     {
-        if (obj->func->get_opaque_rect)
-          {
-             Evas_Coord obx, oby, obw, obh;
-             
-             obj->func->get_opaque_rect(obj, &obx, &oby, &obw, &obh);
-             if ((obw > 0) && (obh > 0))
-               {
-                  obx += off_x;
-                  oby += off_y;
-                  RECTS_CLIP_TO_RECT(obx, oby, obw, obh,
-                                     obj->cur.cache.clip.x + off_x,
-                                     obj->cur.cache.clip.y + off_y,
-                                     obj->cur.cache.clip.w,
-                                     obj->cur.cache.clip.h);
-                  e->engine.func->context_cutout_add
-                    (e->engine.data.output, e->engine.data.context,
-                        obx, oby, obw, obh);
-               }
-          }
-     }
-}
-
-static Eina_List *
-evas_render_updates_internal(Evas *e,
-                             unsigned char make_updates,
-                             unsigned char do_draw)
-{
-   Evas_Object *obj;
-   Eina_List *updates = NULL;
-   Eina_List *ll;
-   void *surface;
-   Eina_Bool clean_them = EINA_FALSE;
-   Eina_Bool alpha;
-   Eina_Rectangle *r;
-   int ux, uy, uw, uh;
-   int cx, cy, cw, ch;
-   unsigned int i, j;
-   int haveup = 0;
-   int redraw_all = 0;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return NULL;
-   MAGIC_CHECK_END();
-   if (!e->changed) return NULL;
-
-   evas_call_smarts_calculate(e);
-
-   RD("[--- RENDER EVAS (size: %ix%i)\n", e->viewport.w, e->viewport.h);
-
-   evas_event_callback_call(e, EVAS_CALLBACK_RENDER_PRE, NULL);
-   
-   /* Check if the modified object mean recalculating every thing */
-   if (!e->invalidate)
-     _evas_render_check_pending_objects(&e->pending_objects, e);
-
-   /* phase 1. add extra updates for changed objects */
-   if (e->invalidate || e->render_objects.count <= 0)
-     clean_them = _evas_render_phase1_process(e,
-                                              &e->active_objects,
-                                              &e->restack_objects,
-                                              &e->delete_objects,
-                                              &e->render_objects,
-                                              &redraw_all);
-
-   /* phase 1.5. check if the video should be inlined or stay in their overlay */
-   alpha = e->engine.func->canvas_alpha_get(e->engine.data.output,
-                                            e->engine.data.context);
-
-   EINA_LIST_FOREACH(e->video_objects, ll, obj)
-     {
-        /* we need the surface to be transparent to display the underlying overlay */
-        if (alpha && _evas_render_can_use_overlay(e, obj))
-          _evas_object_image_video_overlay_show(obj);
-        else
-          _evas_object_image_video_overlay_hide(obj);
-     }
-
-
-   /* phase 1.8. pre render for proxy */
-   _evas_render_phase1_direct(e, &e->active_objects, &e->restack_objects,
-                              &e->delete_objects, &e->render_objects);
-
-   /* phase 2. force updates for restacks */
-   for (i = 0; i < e->restack_objects.count; ++i)
-     {
-        obj = eina_array_data_get(&e->restack_objects, i);
-        obj->func->render_pre(obj);
-        _evas_render_prev_cur_clip_cache_add(e, obj);
-     }
-   eina_array_clean(&e->restack_objects);
-
-   /* phase 3. add exposes */
-   EINA_LIST_FREE(e->damages, r)
-     {
-        e->engine.func->output_redraws_rect_add(e->engine.data.output,
-                                                r->x, r->y, r->w, r->h);
-        eina_rectangle_free(r);
-     }
-
-   /* phase 4. framespace, output & viewport changes */
-   if (e->framespace.changed) 
-     {
-        int fx, fy, fw, fh;
-
-        fx = e->viewport.x - e->framespace.x;
-        fy = e->viewport.y - e->framespace.y;
-        fw = e->viewport.w + e->framespace.w;
-        fh = e->viewport.h + e->framespace.h;
-        e->engine.func->output_redraws_rect_add(e->engine.data.output, 
-                                                fx, fy, fw, fh);
-     }
-
-   if (e->viewport.changed)
-     {
-        e->engine.func->output_redraws_rect_add(e->engine.data.output,
-                                                0, 0,
-                                                e->output.w, e->output.h);
-     }
-   if (e->output.changed)
-     {
-        e->engine.func->output_resize(e->engine.data.output,
-                                      e->output.w, e->output.h);
-        e->engine.func->output_redraws_rect_add(e->engine.data.output,
-                                                0, 0,
-                                                e->output.w, e->output.h);
-     }
-   if ((e->output.w != e->viewport.w) || (e->output.h != e->viewport.h))
-     {
-        ERR("viewport size != output size!");
-     }
-   if (redraw_all)
-     {
-        e->engine.func->output_redraws_rect_add(e->engine.data.output,
-                                                0, 0,
-                                                e->output.w, e->output.h);
-     }
-
-   /* phase 5. add obscures */
-   EINA_LIST_FOREACH(e->obscures, ll, r)
-     {
-        e->engine.func->output_redraws_rect_del(e->engine.data.output,
-                                                r->x, r->y, r->w, r->h);
-     }
-   /* build obscure objects list of active objects that obscure */
-   for (i = 0; i < e->active_objects.count; ++i)
-     {
-        obj = eina_array_data_get(&e->active_objects, i);
-        if (UNLIKELY((evas_object_is_opaque(obj) ||
-                      ((obj->func->has_opaque_rect) &&
-                       (obj->func->has_opaque_rect(obj)))) &&
-                     evas_object_is_visible(obj) &&
-                     (!obj->clip.clipees) &&
-                     (obj->cur.visible) &&
-                     (!obj->delete_me) &&
-                     (obj->cur.cache.clip.visible) &&
-                     (!obj->smart.smart)))
-          /*      obscuring_objects = eina_list_append(obscuring_objects, obj); */
-          eina_array_push(&e->obscuring_objects, obj);
-     }
-
-   /* save this list */
-   /*    obscuring_objects_orig = obscuring_objects; */
-   /*    obscuring_objects = NULL; */
-   /* phase 6. go thru each update rect and render objects in it*/
-   if (do_draw)
-     {
-        unsigned int offset = 0;
-
-        while ((surface =
-                e->engine.func->output_redraws_next_update_get
-                (e->engine.data.output,
-                 &ux, &uy, &uw, &uh,
-                 &cx, &cy, &cw, &ch)))
-          {
-             int off_x, off_y;
-
-             RD("  [--- UPDATE %i %i %ix%i\n", ux, uy, uw, uh);
-             if (make_updates)
-               {
-                  Eina_Rectangle *rect;
-
-                  NEW_RECT(rect, ux, uy, uw, uh);
-                  if (rect)
-                    updates = eina_list_append(updates, rect);
-               }
-             haveup = 1;
-             off_x = cx - ux;
-             off_y = cy - uy;
-             /* build obscuring objects list (in order from bottom to top) */
-             if (alpha)
-               {
-                  e->engine.func->context_clip_set(e->engine.data.output,
-                                                   e->engine.data.context,
-                                                   ux + off_x, uy + off_y, uw, uh);
-               }
-             for (i = 0; i < e->obscuring_objects.count; ++i)
-               {
-                  obj = (Evas_Object *)eina_array_data_get
-                     (&e->obscuring_objects, i);
-                  if (evas_object_is_in_output_rect(obj, ux, uy, uw, uh))
-                    {
-                       eina_array_push(&e->temporary_objects, obj);
-
-                       /* reset the background of the area if needed (using cutout and engine alpha flag to help) */
-                       if (alpha)
-                         _evas_render_cutout_add(e, obj, off_x, off_y);
-                    }
-               }
-             if (alpha)
-               {
-                  e->engine.func->context_color_set(e->engine.data.output,
-                                                    e->engine.data.context,
-                                                    0, 0, 0, 0);
-                  e->engine.func->context_multiplier_unset
-                     (e->engine.data.output, e->engine.data.context);
-                  e->engine.func->context_render_op_set(e->engine.data.output,
-                                                        e->engine.data.context,
-                                                        EVAS_RENDER_COPY);
-                  e->engine.func->rectangle_draw(e->engine.data.output,
-                                                 e->engine.data.context,
-                                                 surface,
-                                                 cx, cy, cw, ch);
-                  e->engine.func->context_cutout_clear(e->engine.data.output,
-                                                       e->engine.data.context);
-                  e->engine.func->context_clip_unset(e->engine.data.output,
-                                                     e->engine.data.context);
-               }
-             /* render all object that intersect with rect */
-             for (i = 0; i < e->active_objects.count; ++i)
-               {
-                  obj = eina_array_data_get(&e->active_objects, i);
-
-                  /* if it's in our outpout rect and it doesn't clip anything */
-                  RD("    OBJ: [%p] '%s' %i %i %ix%i\n", obj, obj->type, obj->cur.geometry.x, obj->cur.geometry.y, obj->cur.geometry.w, obj->cur.geometry.h);
-                  if ((evas_object_is_in_output_rect(obj, ux, uy, uw, uh) ||
-                       (obj->smart.smart)) &&
-                      (!obj->clip.clipees) &&
-                      (obj->cur.visible) &&
-                      (!obj->delete_me) &&
-                      (obj->cur.cache.clip.visible) &&
-//                    (!obj->smart.smart) &&
-                      ((obj->cur.color.a > 0 || obj->cur.render_op != EVAS_RENDER_BLEND)))
-                    {
-                       int x, y, w, h;
-
-                       RD("      DRAW (vis: %i, a: %i, clipees: %p\n", obj->cur.visible, obj->cur.color.a, obj->clip.clipees);
-                       if ((e->temporary_objects.count > offset) &&
-                           (eina_array_data_get(&e->temporary_objects, offset) == obj))
-                         offset++;
-                       x = cx; y = cy; w = cw; h = ch;
-                       if (((w > 0) && (h > 0)) || (obj->smart.smart))
-                         {
-                            if (!obj->smart.smart)
-                              {
-                                 RECTS_CLIP_TO_RECT(x, y, w, h,
-                                                    obj->cur.cache.clip.x + off_x,
-                                                    obj->cur.cache.clip.y + off_y,
-                                                    obj->cur.cache.clip.w,
-                                                    obj->cur.cache.clip.h);
-                              }
-                            if (obj->cur.mask)
-                              e->engine.func->context_mask_set(e->engine.data.output,
-                                                               e->engine.data.context,
-                                                               obj->cur.mask->func->engine_data_get(obj->cur.mask),
-                                                               obj->cur.mask->cur.geometry.x + off_x,
-                                                               obj->cur.mask->cur.geometry.y + off_y,
-                                                               obj->cur.mask->cur.geometry.w,
-                                                               obj->cur.mask->cur.geometry.h);
-                            else
-                              e->engine.func->context_mask_unset(e->engine.data.output,
-                                                                 e->engine.data.context);
-                            e->engine.func->context_clip_set(e->engine.data.output,
-                                                             e->engine.data.context,
-                                                             x, y, w, h);
-#if 1 /* FIXME: this can slow things down... figure out optimum... coverage */
-                            for (j = offset; j < e->temporary_objects.count; ++j)
-                              {
-                                 Evas_Object *obj2;
-
-                                 obj2 = (Evas_Object *)eina_array_data_get
-                                   (&e->temporary_objects, j);
-                                 _evas_render_cutout_add(e, obj2, off_x, off_y);
-                              }
-#endif
-                            clean_them |= evas_render_mapped(e, obj, e->engine.data.context,
-                                                             surface, off_x, off_y, 0,
-                                                             cx, cy, cw, ch
-#ifdef REND_DGB
-                                                             , 1
-#endif
-                                                            );
-                            e->engine.func->context_cutout_clear(e->engine.data.output,
-                                                                 e->engine.data.context);
-                         }
-                    }
-               }
-             /* punch rect out */
-             e->engine.func->output_redraws_next_update_push(e->engine.data.output,
-                                                             surface,
-                                                             ux, uy, uw, uh);
-             /* free obscuring objects list */
-             eina_array_clean(&e->temporary_objects);
-             RD("  ---]\n");
-          }
-        /* flush redraws */
-        if (haveup)
-          {
-             evas_event_callback_call(e, EVAS_CALLBACK_RENDER_FLUSH_PRE, NULL);
-             e->engine.func->output_flush(e->engine.data.output);
-             evas_event_callback_call(e, EVAS_CALLBACK_RENDER_FLUSH_POST, NULL);
-          }
-     }
-   /* clear redraws */
-   e->engine.func->output_redraws_clear(e->engine.data.output);
-   /* and do a post render pass */
-   for (i = 0; i < e->active_objects.count; ++i)
-     {
-        obj = eina_array_data_get(&e->active_objects, i);
-        obj->pre_render_done = 0;
-        RD("    OBJ [%p] post... %i %i\n", obj, obj->changed, do_draw);
-        if ((obj->changed) && (do_draw))
-          {
-             RD("    OBJ [%p] post... func1\n", obj);
-             obj->func->render_post(obj);
-             obj->restack = 0;
-             obj->changed = 0;
-             obj->changed_move_only = 0;
-             obj->changed_nomove = 0;
-             obj->changed_move = 0;
-             obj->changed_map = 0;
-             obj->changed_pchange = 0;
-          }
-        else if ((obj->cur.map != obj->prev.map) ||
-                 (obj->cur.usemap != obj->prev.usemap))
-          {
-             RD("    OBJ [%p] post... func2\n", obj);
-             obj->func->render_post(obj);
-             obj->restack = 0;
-             obj->changed = 0;
-             obj->changed_move_only = 0;
-             obj->changed_nomove = 0;
-             obj->changed_move = 0;
-             obj->changed_map = 0;
-             obj->changed_pchange = 0;
-          }
-        /* moved to other pre-process phase 1
-           if (obj->delete_me == 2)
-           {
-           delete_objects = eina_list_append(delete_objects, obj);
-           }
-           else if (obj->delete_me != 0) obj->delete_me++;
-         */
-     }
-   /* free our obscuring object list */
-   eina_array_clean(&e->obscuring_objects);
-
-   /* If some object are still marked as changed, do not remove
-      them from the pending list. */
-   eina_array_remove(&e->pending_objects, pending_change, NULL);
-
-   for (i = 0; i < e->render_objects.count; ++i)
-     {
-        obj = eina_array_data_get(&e->render_objects, i);
-        obj->pre_render_done = 0;
-     }
-
-   /* delete all objects flagged for deletion now */
-   for (i = 0; i < e->delete_objects.count; ++i)
-     {
-        obj = eina_array_data_get(&e->delete_objects, i);
-        evas_object_free(obj, 1);
-     }
-   eina_array_clean(&e->delete_objects);
-
-   e->changed = 0;
-   e->viewport.changed = 0;
-   e->output.changed = 0;
-   e->framespace.changed = 0;
-   e->invalidate = 0;
-
-   // always clean... lots of mem waste!
-   /* If their are some object to restack or some object to delete,
-    * it's useless to keep the render object list around. */
-   if (clean_them)
-     {
-        eina_array_clean(&e->active_objects);
-        eina_array_clean(&e->render_objects);
-        eina_array_clean(&e->restack_objects);
-        eina_array_clean(&e->delete_objects);
-        eina_array_clean(&e->obscuring_objects);
-        eina_array_clean(&e->temporary_objects);
-        eina_array_clean(&e->clip_changes);
-/* we should flush here and have a mempool system for this        
-        eina_array_flush(&e->active_objects);
-        eina_array_flush(&e->render_objects);
-        eina_array_flush(&e->restack_objects);
-        eina_array_flush(&e->delete_objects);
-        eina_array_flush(&e->obscuring_objects);
-        eina_array_flush(&e->temporary_objects);
-        eina_array_flush(&e->clip_changes);
- */
-        e->invalidate = 1;
-     }
-
-   evas_module_clean();
-   
-   evas_event_callback_call(e, EVAS_CALLBACK_RENDER_POST, NULL);
-
-   RD("---]\n");
-
-   return updates;
-}
-
-EAPI void
-evas_render_updates_free(Eina_List *updates)
-{
-   Eina_Rectangle *r;
-
-   EINA_LIST_FREE(updates, r)
-      eina_rectangle_free(r);
-}
-
-EAPI Eina_List *
-evas_render_updates(Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return NULL;
-   MAGIC_CHECK_END();
-
-#ifdef EVAS_FRAME_QUEUING
-   evas_common_frameq_flush_ready ();
-#endif
-
-   if (!e->changed) return NULL;
-   return evas_render_updates_internal(e, 1, 1);
-}
-
-EAPI void
-evas_render(Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-#ifdef EVAS_FRAME_QUEUING
-   evas_common_frameq_flush_ready ();
-#endif
-
-   if (!e->changed) return;
-   evas_render_updates_internal(e, 0, 1);
-}
-
-EAPI void
-evas_norender(Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   //   if (!e->changed) return;
-   evas_render_updates_internal(e, 0, 0);
-}
-
-EAPI void
-evas_render_idle_flush(Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   evas_fonts_zero_presure(e);
-
-   if ((e->engine.func) && (e->engine.func->output_idle_flush) &&
-       (e->engine.data.output))
-     e->engine.func->output_idle_flush(e->engine.data.output);
-
-   eina_array_flush(&e->active_objects);
-   eina_array_flush(&e->render_objects);
-   eina_array_flush(&e->restack_objects);
-   eina_array_flush(&e->delete_objects);
-   eina_array_flush(&e->obscuring_objects);
-   eina_array_flush(&e->temporary_objects);
-   eina_array_flush(&e->clip_changes);
-   eina_array_flush(&e->temporary_objects);
-
-   e->invalidate = 1;
-}
-
-EAPI void
-evas_sync(Evas *e)
-{
-#ifdef EVAS_FRAME_QUEUING
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   evas_common_frameq_flush();
-#else
-   (void) e;
-#endif
-}
-
-static void
-_evas_render_dump_map_surfaces(Evas_Object *obj)
-{
-   if ((obj->cur.map) && obj->cur.map->surface)
-     {
-        obj->layer->evas->engine.func->image_map_surface_free
-           (obj->layer->evas->engine.data.output, obj->cur.map->surface);
-        obj->cur.map->surface = NULL;
-     }
-
-   if (obj->smart.smart)
-     {
-        Evas_Object *obj2;
-
-        EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(obj), obj2)
-           _evas_render_dump_map_surfaces(obj2);
-     }
-}
-
-EAPI void
-evas_render_dump(Evas *e)
-{
-   Evas_Layer *lay;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   EINA_INLIST_FOREACH(e->layers, lay)
-     {
-        Evas_Object *obj;
-
-        EINA_INLIST_FOREACH(lay->objects, obj)
-          {
-             if ((obj->type) && (!strcmp(obj->type, "image")))
-               evas_object_inform_call_image_unloaded(obj);
-             _evas_render_dump_map_surfaces(obj);
-          }
-     }
-   if ((e->engine.func) && (e->engine.func->output_dump) &&
-       (e->engine.data.output))
-     e->engine.func->output_dump(e->engine.data.output);
-}
-
-void
-evas_render_invalidate(Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return;
-   MAGIC_CHECK_END();
-
-   eina_array_clean(&e->active_objects);
-   eina_array_clean(&e->render_objects);
-
-   eina_array_flush(&e->restack_objects);
-   eina_array_flush(&e->delete_objects);
-
-   e->invalidate = 1;
-}
-
-void
-evas_render_object_recalc(Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-
-#ifndef EVAS_FRAME_QUEUING
-   if ((!obj->changed) && (obj->delete_me < 2))
-#else
-     if ((!obj->changed))
-#endif
-       {
-          Evas *e;
-
-          e = obj->layer->evas;
-          if ((!e) || (e->cleanup)) return;
-#ifdef EVAS_FRAME_QUEUING
-          if (obj->delete_me >= evas_common_frameq_get_frameq_sz() + 2) return;
-#endif
-          eina_array_push(&e->pending_objects, obj);
-          obj->changed = 1;
-       }
-}
-
-/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/
diff --git a/libraries/evas/src/lib/canvas/evas_smart.c b/libraries/evas/src/lib/canvas/evas_smart.c
deleted file mode 100644
index 0cfba05..0000000
--- a/libraries/evas/src/lib/canvas/evas_smart.c
+++ /dev/null
@@ -1,266 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-
-
-static void _evas_smart_class_callbacks_create(Evas_Smart *s);
-
-/* all public */
-
-EAPI void
-evas_smart_free(Evas_Smart *s)
-{
-   MAGIC_CHECK(s, Evas_Smart, MAGIC_SMART);
-   return;
-   MAGIC_CHECK_END();
-   s->delete_me = 1;
-   if (s->usage > 0) return;
-   if (s->class_allocated) free((void *)s->smart_class);
-   free(s->callbacks.array);
-   free(s);
-}
-
-EAPI Evas_Smart *
-evas_smart_class_new(const Evas_Smart_Class *sc)
-{
-   Evas_Smart *s;
-
-   if (!sc) return NULL;
-
-   /* api does not match abi! for now refuse as we only have 1 version */
-   if (sc->version != EVAS_SMART_CLASS_VERSION) return NULL;
-
-   s = evas_mem_calloc(sizeof(Evas_Smart));
-   if (!s) return NULL;
-
-   s->magic = MAGIC_SMART;
-
-   s->smart_class = sc;
-   _evas_smart_class_callbacks_create(s);
-
-   return s;
-}
-
-EAPI const Evas_Smart_Class *
-evas_smart_class_get(const Evas_Smart *s)
-{
-   MAGIC_CHECK(s, Evas_Smart, MAGIC_SMART);
-   return NULL;
-   MAGIC_CHECK_END();
-   return s->smart_class;
-}
-
-EAPI void *
-evas_smart_data_get(const Evas_Smart *s)
-{
-   MAGIC_CHECK(s, Evas_Smart, MAGIC_SMART);
-   return NULL;
-   MAGIC_CHECK_END();
-   return (void *)s->smart_class->data;
-}
-
-EAPI const Evas_Smart_Cb_Description **
-evas_smart_callbacks_descriptions_get(const Evas_Smart *s, unsigned int *count)
-{
-   MAGIC_CHECK(s, Evas_Smart, MAGIC_SMART);
-   if (count) *count = 0;
-   return NULL;
-   MAGIC_CHECK_END();
-
-   if (count) *count = s->callbacks.size;
-   return s->callbacks.array;
-}
-
-EAPI const Evas_Smart_Cb_Description *
-evas_smart_callback_description_find(const Evas_Smart *s, const char *name)
-{
-   if (!name) return NULL;
-   MAGIC_CHECK(s, Evas_Smart, MAGIC_SMART);
-   return NULL;
-   MAGIC_CHECK_END();
-   return evas_smart_cb_description_find(&s->callbacks, name);
-}
-
-EAPI Eina_Bool
-evas_smart_class_inherit_full(Evas_Smart_Class *sc, const Evas_Smart_Class *parent_sc, unsigned int parent_sc_size)
-{
-   unsigned int off;
-
-   /* api does not match abi! for now refuse as we only have 1 version */
-   if (parent_sc->version != EVAS_SMART_CLASS_VERSION) return EINA_FALSE;
-
-#define _CP(m) sc->m = parent_sc->m
-   _CP(add);
-   _CP(del);
-   _CP(move);
-   _CP(resize);
-   _CP(show);
-   _CP(hide);
-   _CP(color_set);
-   _CP(clip_set);
-   _CP(clip_unset);
-   _CP(calculate);
-   _CP(member_add);
-   _CP(member_del);
-#undef _CP
-
-   sc->parent = parent_sc;
-
-   off = sizeof(Evas_Smart_Class);
-   if (parent_sc_size == off) return EINA_TRUE;
-
-   memcpy(((char *)sc) + off, ((char *)parent_sc) + off, parent_sc_size - off);
-   return EINA_TRUE;
-}
-
-EAPI int
-evas_smart_usage_get(const Evas_Smart *s)
-{
-   MAGIC_CHECK(s, Evas_Smart, MAGIC_SMART);
-   return 0;
-   MAGIC_CHECK_END();
-   return s->usage;
-}
-
-
-/* internal funcs */
-void
-evas_object_smart_use(Evas_Smart *s)
-{
-   s->usage++;
-}
-
-void
-evas_object_smart_unuse(Evas_Smart *s)
-{
-   s->usage--;
-   if ((s->usage <= 0) && (s->delete_me)) evas_smart_free(s);
-}
-
-Eina_Bool
-evas_smart_cb_descriptions_resize(Evas_Smart_Cb_Description_Array *a, unsigned int size)
-{
-   void *tmp;
-
-   if (size == a->size)
-     return EINA_TRUE;
-
-   if (size == EINA_FALSE)
-     {
-        free(a->array);
-        a->array = NULL;
-        a->size = 0;
-        return EINA_TRUE;
-     }
-
-   tmp = realloc(a->array, (size + 1) * sizeof(Evas_Smart_Cb_Description *));
-   if (tmp)
-     {
-        a->array = tmp;
-        a->size = size;
-        a->array[size] = NULL;
-        return EINA_TRUE;
-     }
-   else
-     {
-        ERR("realloc failed!");
-        return EINA_FALSE;
-     }
-}
-
-static int
-_evas_smart_cb_description_cmp_sort(const void *p1, const void *p2)
-{
-   const Evas_Smart_Cb_Description **a = (const Evas_Smart_Cb_Description **)p1;
-   const Evas_Smart_Cb_Description **b = (const Evas_Smart_Cb_Description **)p2;
-   return strcmp((*a)->name, (*b)->name);
-}
-
-void
-evas_smart_cb_descriptions_fix(Evas_Smart_Cb_Description_Array *a)
-{
-   unsigned int i, j;
-
-   if (!a)
-     {
-        ERR("no array to fix!");
-        return;
-     }
-
-   qsort(a->array, a->size, sizeof(Evas_Smart_Cb_Description *),
-         _evas_smart_cb_description_cmp_sort);
-
-   DBG("%u callbacks", a->size);
-   if (a->size)
-     DBG("%s [type=%s]", a->array[0]->name, a->array[0]->type);
-
-   for (i = 0, j = 1; j < a->size; j++)
-     {
-        const Evas_Smart_Cb_Description *cur, *prev;
-
-        cur = a->array[j];
-        prev = a->array[i];
-
-        DBG("%s [type=%s]", cur->name, cur->type);
-
-        if (strcmp(cur->name, prev->name) != 0)
-          {
-             i++;
-             if (i != j)
-               a->array[i] = a->array[j];
-          }
-        else
-          {
-             if (strcmp(cur->type, prev->type) == 0)
-               WRN("duplicated smart callback description"
-                   " with name '%s' and type '%s'", cur->name, cur->type);
-             else
-               ERR("callback descriptions named '%s' differ"
-                   " in type, keeping '%s', ignoring '%s'",
-                   cur->name, prev->type, cur->type);
-          }
-     }
-
-   evas_smart_cb_descriptions_resize(a, i + 1);
-}
-
-static void
-_evas_smart_class_callbacks_create(Evas_Smart *s)
-{
-   const Evas_Smart_Class *sc;
-   unsigned int n = 0;
-
-   for (sc = s->smart_class; sc; sc = sc->parent)
-     {
-        const Evas_Smart_Cb_Description *d;
-        for (d = sc->callbacks; d && d->name; d++)
-          n++;
-     }
-
-   if (n == 0) return;
-   if (!evas_smart_cb_descriptions_resize(&s->callbacks, n)) return;
-   for (n = 0, sc = s->smart_class; sc; sc = sc->parent)
-     {
-        const Evas_Smart_Cb_Description *d;
-        for (d = sc->callbacks; d && d->name; d++)
-          s->callbacks.array[n++] = d;
-     }
-   evas_smart_cb_descriptions_fix(&s->callbacks);
-}
-
-static int
-_evas_smart_cb_description_cmp_search(const void *p1, const void *p2)
-{
-   const char *name = p1;
-   const Evas_Smart_Cb_Description **v = (const Evas_Smart_Cb_Description **)p2;
-   /* speed up string shares searches (same pointers) */
-   if (name == (*v)->name) return 0;
-   return strcmp(name, (*v)->name);
-}
-
-const Evas_Smart_Cb_Description *
-evas_smart_cb_description_find(const Evas_Smart_Cb_Description_Array *a, const char *name)
-{
-   if (!a->array) return NULL;
-   return bsearch(name, a->array, a->size, sizeof(Evas_Smart_Cb_Description *),
-                  _evas_smart_cb_description_cmp_search);
-}
diff --git a/libraries/evas/src/lib/canvas/evas_stack.c b/libraries/evas/src/lib/canvas/evas_stack.c
deleted file mode 100644
index a8dec0d..0000000
--- a/libraries/evas/src/lib/canvas/evas_stack.c
+++ /dev/null
@@ -1,391 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-
-static Evas_Object *
-evas_object_above_get_internal(const Evas_Object *obj)
-{
-   if ((EINA_INLIST_GET(obj))->next)
-     return (Evas_Object *)((EINA_INLIST_GET(obj))->next);
-   else
-     {
-        if ((EINA_INLIST_GET(((Evas_Object*)(obj))->layer))->next)
-          {
-             Evas_Layer *l;
-
-             l = (Evas_Layer *)((EINA_INLIST_GET((((Evas_Object *)obj)->layer)))->next);
-             return l->objects;
-          }
-     }
-   return NULL;
-}
-
-static Evas_Object *
-evas_object_below_get_internal(const Evas_Object *obj)
-{
-   if ((EINA_INLIST_GET(obj))->prev)
-     return (Evas_Object *)((EINA_INLIST_GET(obj))->prev);
-   else
-     {
-        if ((EINA_INLIST_GET((((Evas_Object *)obj)->layer)))->prev)
-          {
-             Evas_Layer *l;
-
-             l = (Evas_Layer *)((EINA_INLIST_GET((((Evas_Object *)obj)->layer)))->prev);
-             return (Evas_Object *)((EINA_INLIST_GET((l->objects)))->last);
-          }
-     }
-   return NULL;
-}
-
-EAPI void
-evas_object_raise(Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (evas_object_intercept_call_raise(obj)) return;
-   if (!((EINA_INLIST_GET(obj))->next))
-     {
-        evas_object_inform_call_restack(obj);
-        return;
-     }
-   if (obj->smart.parent)
-     evas_object_smart_member_raise(obj);
-   else
-     {
-        if (obj->in_layer)
-          obj->layer->objects = (Evas_Object *)eina_inlist_demote(EINA_INLIST_GET(obj->layer->objects), EINA_INLIST_GET(obj));
-     }
-   if (obj->clip.clipees)
-     {
-        evas_object_inform_call_restack(obj);
-        return;
-     }
-   if (obj->layer) evas_render_invalidate(obj->layer->evas);
-   obj->restack = EINA_TRUE;
-   evas_object_change(obj);
-   evas_object_inform_call_restack(obj);
-   if (obj->layer->evas->events_frozen > 0) return;
-   if ((!evas_event_passes_through(obj)) && (!evas_event_freezes_through(obj)))
-     {
-        if (!obj->smart.smart)
-          {
-             if (evas_object_is_in_output_rect(obj,
-                                               obj->layer->evas->pointer.x,
-                                               obj->layer->evas->pointer.y,
-                                               1, 1) && obj->cur.visible)
-               evas_event_feed_mouse_move(obj->layer->evas,
-                                          obj->layer->evas->pointer.x,
-                                          obj->layer->evas->pointer.y,
-                                          obj->layer->evas->last_timestamp,
-                                          NULL);
-          }
-     }
-}
-
-EAPI void
-evas_object_lower(Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (evas_object_intercept_call_lower(obj)) return;
-   if (!((EINA_INLIST_GET(obj))->prev))
-     {
-        evas_object_inform_call_restack(obj);
-        return;
-     }
-   if (obj->smart.parent)
-     evas_object_smart_member_lower(obj);
-   else
-     {
-        if (obj->in_layer)
-          obj->layer->objects = (Evas_Object *)eina_inlist_promote(EINA_INLIST_GET(obj->layer->objects),
-                                                                   EINA_INLIST_GET(obj));
-     }
-   if (obj->clip.clipees)
-     {
-        evas_object_inform_call_restack(obj);
-        return;
-     }
-   if (obj->layer) evas_render_invalidate(obj->layer->evas);
-   obj->restack = EINA_TRUE;
-   evas_object_change(obj);
-   evas_object_inform_call_restack(obj);
-   if (obj->layer->evas->events_frozen > 0) return;
-   if ((!evas_event_passes_through(obj)) && (!evas_event_freezes_through(obj)))
-     {
-        if (!obj->smart.smart)
-          {
-             if (evas_object_is_in_output_rect(obj,
-                                               obj->layer->evas->pointer.x,
-                                               obj->layer->evas->pointer.y,
-                                               1, 1) && obj->cur.visible)
-               evas_event_feed_mouse_move(obj->layer->evas,
-                                          obj->layer->evas->pointer.x,
-                                          obj->layer->evas->pointer.y,
-                                          obj->layer->evas->last_timestamp,
-                                          NULL);
-          }
-     }
-}
-
-EAPI void
-evas_object_stack_above(Evas_Object *obj, Evas_Object *above)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   MAGIC_CHECK(above, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (obj == above) return;
-   if (evas_object_intercept_call_stack_above(obj, above)) return;
-   if (!above)
-     {
-        evas_object_raise(obj);
-        return;
-     }
-   if ((EINA_INLIST_GET(obj))->prev == EINA_INLIST_GET(above))
-     {
-        evas_object_inform_call_restack(obj);
-        return;
-     }
-   if (obj->smart.parent)
-     {
-        if (obj->smart.parent != above->smart.parent)
-          {
-             ERR("BITCH! evas_object_stack_above(), %p not inside same smart as %p!", obj, above);
-             return;
-          }
-        evas_object_smart_member_stack_above(obj, above);
-     }
-   else
-     {
-        if (above->smart.parent)
-          {
-             ERR("BITCH! evas_object_stack_above(), %p stack above %p, but above has smart parent, obj does not", obj, above);
-             return;
-          }
-        if (obj->layer != above->layer)
-          {
-             ERR("BITCH! evas_object_stack_above(), %p stack above %p, not matching layers", obj, above);
-             return;
-          }
-        if (obj->in_layer)
-          {
-             obj->layer->objects = (Evas_Object *)eina_inlist_remove(EINA_INLIST_GET(obj->layer->objects),
-                                                                     EINA_INLIST_GET(obj));
-             obj->layer->objects = (Evas_Object *)eina_inlist_append_relative(EINA_INLIST_GET(obj->layer->objects),
-                                                                              EINA_INLIST_GET(obj),
-                                                                              EINA_INLIST_GET(above));
-          }
-     }
-   if (obj->clip.clipees)
-     {
-        evas_object_inform_call_restack(obj);
-        return;
-     }
-   if (obj->layer) evas_render_invalidate(obj->layer->evas);
-   obj->restack = EINA_TRUE;
-   evas_object_change(obj);
-   evas_object_inform_call_restack(obj);
-   if (obj->layer->evas->events_frozen > 0) return;
-   if ((!evas_event_passes_through(obj)) && (!evas_event_freezes_through(obj)))
-     {
-        if (!obj->smart.smart)
-          {
-             if (evas_object_is_in_output_rect(obj,
-                                               obj->layer->evas->pointer.x,
-                                               obj->layer->evas->pointer.y,
-                                               1, 1) && obj->cur.visible)
-               evas_event_feed_mouse_move(obj->layer->evas,
-                                          obj->layer->evas->pointer.x,
-                                          obj->layer->evas->pointer.y,
-                                          obj->layer->evas->last_timestamp,
-                                          NULL);
-          }
-     }
-}
-
-EAPI void
-evas_object_stack_below(Evas_Object *obj, Evas_Object *below)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   MAGIC_CHECK(below, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   if (obj == below) return;
-   if (evas_object_intercept_call_stack_below(obj, below)) return;
-   if (!below)
-     {
-        evas_object_lower(obj);
-        return;
-     }
-   if ((EINA_INLIST_GET(obj))->next == EINA_INLIST_GET(below))
-     {
-        evas_object_inform_call_restack(obj);
-        return;
-     }
-   if (obj->smart.parent)
-     {
-        if (obj->smart.parent != below->smart.parent)
-          {
-             ERR("BITCH! evas_object_stack_below(), %p not inside same smart as %p!", obj, below);
-             return;
-          }
-        evas_object_smart_member_stack_below(obj, below);
-     }
-   else
-     {
-        if (below->smart.parent)
-          {
-             ERR("BITCH! evas_object_stack_below(), %p stack below %p, but below has smart parent, obj does not", obj, below);
-             return;
-          }
-        if (obj->layer != below->layer)
-          {
-             ERR("BITCH! evas_object_stack_below(), %p stack below %p, not matching layers", obj, below);
-             return;
-          }
-        if (obj->in_layer)
-          {
-             obj->layer->objects = (Evas_Object *)eina_inlist_remove(EINA_INLIST_GET(obj->layer->objects),
-                                                                     EINA_INLIST_GET(obj));
-             obj->layer->objects = (Evas_Object *)eina_inlist_prepend_relative(EINA_INLIST_GET(obj->layer->objects),
-                                                                               EINA_INLIST_GET(obj),
-                                                                               EINA_INLIST_GET(below));
-          }
-     }
-   if (obj->clip.clipees)
-     {
-        evas_object_inform_call_restack(obj);
-        return;
-     }
-   if (obj->layer) evas_render_invalidate(obj->layer->evas);
-   obj->restack = EINA_TRUE;
-   evas_object_change(obj);
-   evas_object_inform_call_restack(obj);
-   if (obj->layer->evas->events_frozen > 0) return;
-   if ((!evas_event_passes_through(obj)) && (!evas_event_freezes_through(obj)))
-     {
-        if (!obj->smart.smart)
-          {
-             if (evas_object_is_in_output_rect(obj,
-                                               obj->layer->evas->pointer.x,
-                                               obj->layer->evas->pointer.y,
-                                               1, 1) && obj->cur.visible)
-               evas_event_feed_mouse_move(obj->layer->evas,
-                                          obj->layer->evas->pointer.x,
-                                          obj->layer->evas->pointer.y,
-                                          obj->layer->evas->last_timestamp,
-                                          NULL);
-          }
-     }
-}
-
-EAPI Evas_Object *
-evas_object_above_get(const Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   if (obj->smart.parent)
-     {
-        do
-          {
-             obj = (Evas_Object *)((EINA_INLIST_GET(obj))->next);
-             if ((obj) && (!obj->delete_me)) return (Evas_Object *)obj;
-          }
-        while (obj);
-        return NULL;
-     }
-   obj = evas_object_above_get_internal(obj);
-   while (obj)
-     {
-        if (!obj->delete_me) return (Evas_Object *)obj;
-        obj = evas_object_above_get_internal(obj);
-     }
-   return NULL;
-}
-
-EAPI Evas_Object *
-evas_object_below_get(const Evas_Object *obj)
-{
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   if (obj->smart.parent)
-     {
-        do
-          {
-             obj = (Evas_Object *)((EINA_INLIST_GET(obj))->prev);
-             if ((obj) && (!obj->delete_me)) return (Evas_Object *)obj;
-          }
-        while (obj);
-        return NULL;
-     }
-   obj = evas_object_below_get_internal(obj);
-   while (obj)
-     {
-        if (!obj->delete_me) return (Evas_Object *)obj;
-        obj = evas_object_below_get_internal(obj);
-     }
-   return NULL;
-}
-
-
-
-EAPI Evas_Object *
-evas_object_bottom_get(const Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return NULL;
-   MAGIC_CHECK_END();
-   if (e->layers)
-     {
-        Evas_Object *obj;
-
-        obj = e->layers->objects;
-        while (obj)
-          {
-             if (!obj->delete_me) return obj;
-             obj = evas_object_above_get_internal(obj);
-          }
-     }
-   return NULL;
-}
-
-EAPI Evas_Object *
-evas_object_top_get(const Evas *e)
-{
-   Evas_Object *obj = NULL;
-   Eina_Inlist *list;
-   Evas_Layer *layer;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return NULL;
-   MAGIC_CHECK_END();
-
-   list = EINA_INLIST_GET(e->layers);
-   if (!list) return NULL;
-
-   layer = (Evas_Layer *) list->last;
-   if (!layer) return NULL;
-
-   list = EINA_INLIST_GET(layer->objects);
-   if (!list) return NULL;
-
-   obj = (Evas_Object *) list->last;
-   if (!obj) return NULL;
-
-   while (obj)
-     {
-        if (!obj->delete_me) return obj;
-        obj = evas_object_below_get_internal(obj);
-     }
-
-   return obj;
-}
diff --git a/libraries/evas/src/lib/canvas/evas_stats.c b/libraries/evas/src/lib/canvas/evas_stats.c
deleted file mode 100644
index cfb1a84..0000000
--- a/libraries/evas/src/lib/canvas/evas_stats.c
+++ /dev/null
@@ -1,185 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-#include "evas_cs.h"
-
-EAPI Eina_Bool
-evas_cserve_want_get(void)
-{
-#ifdef EVAS_CSERVE
-   return evas_cserve_use_get();
-#endif
-   return 0;
-}
-
-EAPI Eina_Bool
-evas_cserve_connected_get(void)
-{
-#ifdef EVAS_CSERVE
-   return evas_cserve_have_get();
-#endif
-   return 0;
-}
-
-EAPI Eina_Bool
-evas_cserve_stats_get(Evas_Cserve_Stats *stats)
-{
-#ifdef EVAS_CSERVE
-   Op_Getstats_Reply st;
-
-   if (!evas_cserve_raw_stats_get(&st)) return 0;
-   if (!stats) return 1;
-   stats->saved_memory = st.saved_memory;
-   stats->wasted_memory = st.wasted_memory;
-   stats->saved_memory_peak = st.saved_memory_peak;
-   stats->wasted_memory_peak = st.wasted_memory_peak;
-   stats->saved_time_image_header_load = st.saved_time_image_header_load;
-   stats->saved_time_image_data_load = st.saved_time_image_data_load;
-   // may expand this in future
-   return 1;
-#else
-   (void) stats;
-   return 0;
-#endif
-}
-
-EAPI Eina_Bool
-evas_cserve_image_cache_contents_get(Evas_Cserve_Image_Cache *cache)
-{
-#ifdef EVAS_CSERVE
-   Op_Getinfo_Reply *info;
-   unsigned char *p;
-   int i, j;
-
-   if (!(info = evas_cserve_raw_info_get())) return 0;
-   if (!cache)
-     {
-        free(info);
-        return 1;
-     }
-   cache->active.mem_total = info->active.mem_total;
-   cache->active.count = info->active.count;
-   cache->cached.mem_total = info->cached.mem_total;
-   cache->cached.count = info->cached.count;
-   cache->images = NULL;
-   j = info->active.count + info->cached.count;
-   p = (unsigned char *)info;
-   p += sizeof(Op_Getinfo_Reply);
-   for (i = 0; i < j; i++)
-     {
-        Evas_Cserve_Image *im;
-        Op_Getinfo_Item it;
-        char *file, *key;
-
-        memcpy(&it, p, sizeof(Op_Getinfo_Item));
-        file = (char*) (p + sizeof(Op_Getinfo_Item));
-        key = file + strlen(file) + 1;
-        im = calloc(1, sizeof(Evas_Cserve_Image));
-        if (!im) continue;
-        if (file[0] != 0)
-          {
-             file = (char *)eina_stringshare_add(file);
-             if (!file)
-               {
-                  free(im);
-                  continue;
-               }
-          }
-        else
-          file = NULL;
-        if (key[0] != 0)
-          {
-             key = (char *)eina_stringshare_add(key);
-             if (!key)
-               {
-                  if (file) eina_stringshare_del(file);
-                  free(im);
-                  continue;
-               }
-          }
-        else key = NULL;
-        cache->images = eina_list_append(cache->images, im);
-        im->file = file;
-        im->key = key;
-        im->w = it.w;
-        im->h = it.h;
-        im->cached_time = it.cached_time;
-        im->file_mod_time = it.file_mod_time;
-        im->file_checked_time = it.file_checked_time;
-        im->refcount = it.refcount;
-        im->data_refcount = it.data_refcount;
-        im->memory_footprint = it.memory_footprint;
-        im->head_load_time = it.head_load_time;
-        im->data_load_time = it.data_load_time;
-        im->active = it.active;
-        im->alpha = it.alpha;
-        im->data_loaded = it.data_loaded;
-        im->dead = it.dead;
-        im->useless = it.useless;
-     }
-   free(info);
-   return 1;
-#else
-   (void) cache;
-   return 0;
-#endif
-}
-
-EAPI void
-evas_cserve_image_cache_contents_clean(Evas_Cserve_Image_Cache *cache)
-{
-#ifdef EVAS_CSERVE
-   Evas_Cserve_Image *im;
-
-   EINA_LIST_FREE(cache->images, im)
-     {
-        if (im->file) eina_stringshare_del(im->file);
-        if (im->key) eina_stringshare_del(im->key);
-        free(im);
-     }
-#else
-   (void) cache;
-#endif
-}
-
-EAPI Eina_Bool
-evas_cserve_config_get(Evas_Cserve_Config *config)
-{
-#ifdef EVAS_CSERVE
-   Op_Getconfig_Reply conf;
-
-   if (!evas_cserve_raw_config_get(&conf)) return 0;
-   if (!config) return 1;
-   config->cache_max_usage = conf.cache_max_usage;
-   config->cache_item_timeout = conf.cache_item_timeout;
-   config->cache_item_timeout_check = conf.cache_item_timeout_check;
-   return 1;
-#else
-   (void) config;
-   return 0;
-#endif
-}
-
-EAPI Eina_Bool
-evas_cserve_config_set(const Evas_Cserve_Config *config)
-{
-#ifdef EVAS_CSERVE
-   Op_Setconfig conf;
-
-   if (!config) return 1;
-   conf.cache_max_usage = config->cache_max_usage;
-   conf.cache_item_timeout = config->cache_item_timeout;
-   conf.cache_item_timeout_check = config->cache_item_timeout_check;
-   return evas_cserve_raw_config_set(&conf);
-#else
-   (void) config;
-   return 0;
-#endif
-}
-
-EAPI void
-evas_cserve_disconnect(void)
-{
-#ifdef EVAS_CSERVE
-   evas_cserve_discon();
-#endif
-}
diff --git a/libraries/evas/src/lib/canvas/evas_touch_point.c b/libraries/evas/src/lib/canvas/evas_touch_point.c
deleted file mode 100644
index bdea73f..0000000
--- a/libraries/evas/src/lib/canvas/evas_touch_point.c
+++ /dev/null
@@ -1,110 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-
-void
-_evas_touch_point_append(Evas *e, int id, Evas_Coord x, Evas_Coord y)
-{
-   Evas_Coord_Touch_Point *point;
-
-   /* create new Evas_Coord_Touch_Point */
-   point = (Evas_Coord_Touch_Point *)calloc(1, sizeof(Evas_Coord_Touch_Point));
-   point->x = x;
-   point->y = y;
-   point->id = id;
-   point->state = EVAS_TOUCH_POINT_DOWN;
-   e->touch_points = eina_list_append(e->touch_points, point);
-}
-
-void
-_evas_touch_point_update(Evas *e, int id, Evas_Coord x, Evas_Coord y, Evas_Touch_Point_State state)
-{
-   Eina_List *l;
-   Evas_Coord_Touch_Point *point = NULL;
-
-   EINA_LIST_FOREACH(e->touch_points, l, point)
-     {
-        if (point->id == id)
-          {
-             point->x = x;
-             point->y = y;
-             point->state = state;
-             break;
-          }
-     }
-}
-
-void
-_evas_touch_point_remove(Evas *e, int id)
-{
-   Eina_List *l;
-   Evas_Coord_Touch_Point *point = NULL;
-
-   EINA_LIST_FOREACH(e->touch_points, l, point)
-     {
-        if (point->id == id)
-          {
-             e->touch_points = eina_list_remove(e->touch_points, point);
-             free(point);
-             break;
-          }
-     }
-}
-
-EAPI unsigned int
-evas_touch_point_list_count(Evas *e)
-{
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return 0;
-   MAGIC_CHECK_END();
-   return eina_list_count(e->touch_points);
-}
-
-EAPI void
-evas_touch_point_list_nth_xy_get(Evas *e, unsigned int n, Evas_Coord *x, Evas_Coord *y)
-{
-   Evas_Coord_Touch_Point *point = NULL;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   if (x) *x = 0;
-   if (y) *y = 0;
-   return;
-   MAGIC_CHECK_END();
-
-   point = (Evas_Coord_Touch_Point *)eina_list_nth(e->touch_points, n);
-   if (!point)
-     {
-        if (x) *x = 0;
-        if (y) *y = 0;
-        return;
-     }
-   if (x) *x = point->x;
-   if (y) *y = point->y;
-}
-
-EAPI int
-evas_touch_point_list_nth_id_get(Evas *e, unsigned int n)
-{
-   Evas_Coord_Touch_Point *point = NULL;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return -1;
-   MAGIC_CHECK_END();
-
-   point = (Evas_Coord_Touch_Point *)eina_list_nth(e->touch_points, n);
-   if (!point) return -1;
-   return point->id;
-}
-
-EAPI Evas_Touch_Point_State
-evas_touch_point_list_nth_state_get(Evas *e, unsigned int n)
-{
-   Evas_Coord_Touch_Point *point = NULL;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return EVAS_TOUCH_POINT_CANCEL;
-   MAGIC_CHECK_END();
-
-   point = (Evas_Coord_Touch_Point *)eina_list_nth(e->touch_points, n);
-   if (!point) return EVAS_TOUCH_POINT_CANCEL;
-   return point->state;
-}