expedite-cxx: Fix deadlock.

This one passed for some reason, it was still in C.

configure.ac

@@ -10,7 +10,7 @@ AC_CONFIG_HEADERS([config.h])
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE([1.6 dist-bzip2])
+AM_INIT_AUTOMAKE([1.6 dist-bzip2 subdir-objects])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 PKG_PROG_PKG_CONFIG
@@ -35,7 +35,9 @@ AC_PROG_CC
 
 LT_PROG_RC
 
+### Check for C++11
 
+EFL_CXX_COMPILE_STDCXX_11([ext], [mandatory])
 
 ### Checks for libraries
 
@@ -55,6 +57,9 @@ PKG_CHECK_MODULES([EFL], eina >= 1.7.99 efl >= 1.11.99 eo >= 1.7.99 evas >= 1.7.
 EFL_ENABLE_EO_API_SUPPORT
 EFL_ENABLE_BETA_API_SUPPORT
 
+# EFL++ dependencies
+
+PKG_CHECK_MODULES([EFL_CXX], efl-cxx >= 1.11.99 eina-cxx >= 1.11.99 eo-cxx >= 1.11.99 evas-cxx >= 1.11.99 eet-cxx >= 1.11.99)
 
 ### Checks for header files
 
@@ -92,8 +97,10 @@ AC_MSG_CHECKING([whether the compiler supports -fno-rtti -fno-exceptions])
 AC_MSG_RESULT([${have_cxx_flags}])
 CXXFLAGS="${CXXFLAGS_save}"
 if test "x${have_cxx_flags}" = "xyes" ; then
-   EXPEDITE_CXXFLAGS="-fno-rtti -fno-exceptions"
+   EXPEDITE_CXXFLAGS="-fno-rtti -fno-exceptions -DEFL_CXX_NO_EXCEPTIONS"
 fi
+CXXFLAGS="${CXXFLAGS} -std=c++11"
+
 AC_LANG_POP([C++])
 AC_SUBST(EXPEDITE_CXXFLAGS)
 

m4/efl_stdcxx_11.m4

@@ -0,0 +1,136 @@
+# ============================================================================
+#  http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
+# ============================================================================
+#
+# SYNOPSIS
+#
+#   AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional])
+#
+# DESCRIPTION
+#
+#   Check for baseline language coverage in the compiler for the C++11
+#   standard; if necessary, add switches to CXXFLAGS to enable support.
+#
+#   The first argument, if specified, indicates whether you insist on an
+#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
+#   -std=c++11).  If neither is specified, you get whatever works, with
+#   preference for an extended mode.
+#
+#   The second argument, if specified 'mandatory' or if left unspecified,
+#   indicates that baseline C++11 support is required and that the macro
+#   should error out if no mode with that support is found.  If specified
+#   'optional', then configuration proceeds regardless, after defining
+#   HAVE_CXX11 if and only if a supporting mode is found.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
+#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
+#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 3
+
+m4_define([_EFL_CXX_COMPILE_STDCXX_11_testbody], [
+  template <typename T>
+    struct check
+    {
+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
+    };
+
+    typedef check<check<bool>> right_angle_brackets;
+
+    int a;
+    decltype(a) b;
+
+    typedef check<int> check_type;
+    check_type c;
+    check_type&& cr = static_cast<check_type&&>(c);
+
+    struct A { A(int); };
+    struct B : A { using A::A; };  // inheriting constructors
+
+    auto d = a;
+])
+
+AC_DEFUN([EFL_CXX_COMPILE_STDCXX_11], [dnl
+  m4_if([$1], [], [],
+        [$1], [ext], [],
+        [$1], [noext], [],
+        [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl
+  m4_if([$2], [], [ax_cxx_compile_cxx11_required=true],
+        [$2], [mandatory], [ax_cxx_compile_cxx11_required=true],
+        [$2], [optional], [ax_cxx_compile_cxx11_required=false],
+        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])])dnl
+  AC_LANG_PUSH([C++])dnl
+  ac_success=no
+  AC_CACHE_CHECK(whether $CXX supports C++11 features by default,
+  ax_cv_cxx_compile_cxx11,
+  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_EFL_CXX_COMPILE_STDCXX_11_testbody])],
+    [ax_cv_cxx_compile_cxx11=yes],
+    [ax_cv_cxx_compile_cxx11=no])])
+  if test x$ax_cv_cxx_compile_cxx11 = xyes; then
+    ac_success=yes
+  fi
+
+  m4_if([$1], [noext], [], [dnl
+  if test x$ac_success = xno; then
+    for switch in -std=gnu++11; do
+      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
+      AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
+                     $cachevar,
+        [ac_save_CXXFLAGS="$CXXFLAGS"
+         CXXFLAGS="$CXXFLAGS $switch"
+         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_EFL_CXX_COMPILE_STDCXX_11_testbody])],
+          [eval $cachevar=yes],
+          [eval $cachevar=no])
+         CXXFLAGS="$ac_save_CXXFLAGS"])
+      if eval test x\$$cachevar = xyes; then
+        CXXFLAGS="$CXXFLAGS $switch"
+        ac_success=yes
+        break
+      fi
+    done
+  fi])
+
+  m4_if([$1], [ext], [], [dnl
+  if test x$ac_success = xno; then
+    for switch in -std=c++11; do
+      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
+      AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
+                     $cachevar,
+        [ac_save_CXXFLAGS="$CXXFLAGS"
+         CXXFLAGS="$CXXFLAGS $switch"
+         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_EFL_CXX_COMPILE_STDCXX_11_testbody])],
+          [eval $cachevar=yes],
+          [eval $cachevar=no])
+         CXXFLAGS="$ac_save_CXXFLAGS"])
+      if eval test x\$$cachevar = xyes; then
+        CXXFLAGS="$CXXFLAGS $switch"
+        ac_success=yes
+        break
+      fi
+    done
+  fi])
+  AC_LANG_POP([C++])
+  if test x$ax_cxx_compile_cxx11_required = xtrue; then
+    if test x$ac_success = xno; then
+      AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.])
+    fi
+  else
+    if test x$ac_success = xno; then
+      HAVE_CXX11=0
+      AC_MSG_NOTICE([No compiler with C++11 support was found])
+    else
+      HAVE_CXX11=1
+      AC_DEFINE(HAVE_CXX11,1,
+                [define if the compiler supports basic C++11 syntax])
+    fi
+
+    AC_SUBST(HAVE_CXX11)
+  fi
+])

src/bin/Makefile.am

@@ -7,11 +7,208 @@ AM_CPPFLAGS = \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
 @EFL_CFLAGS@ \
+@EFL_CXX_CFLAGS@ \
 @EVIL_CFLAGS@
 
 bin_PROGRAMS = expedite
 bin_SCRIPTS = expedite-cmp
 
+# XXX
+cxx_sources = \
+cxx/image_blend_border.cc \
+cxx/image_blend_border_capi.h \
+cxx/image_blend_border_recolor.cc \
+cxx/image_blend_border_recolor_capi.h \
+cxx/image_blend_fade_pow2_unscaled.cc \
+cxx/image_blend_fade_pow2_unscaled_capi.h \
+cxx/image_blend_fade_unscaled.cc \
+cxx/image_blend_fade_unscaled_capi.h \
+cxx/image_blend_many_smooth_same_scaled.cc \
+cxx/image_blend_many_smooth_same_scaled_capi.h \
+cxx/image_blend_nearest_same_scaled.cc \
+cxx/image_blend_nearest_same_scaled_capi.h \
+cxx/image_blend_nearest_scaled.cc \
+cxx/image_blend_nearest_scaled_capi.h \
+cxx/image_blend_nearest_solid_same_scaled.cc \
+cxx/image_blend_nearest_solid_same_scaled_capi.h \
+cxx/image_blend_nearest_solid_scaled.cc \
+cxx/image_blend_nearest_solid_scaled_capi.h \
+cxx/image_blend_occlude1.cc \
+cxx/image_blend_occlude1_capi.h \
+cxx/image_blend_occlude1_few.cc \
+cxx/image_blend_occlude1_few_capi.h \
+cxx/image_blend_occlude1_many.cc \
+cxx/image_blend_occlude1_many_capi.h \
+cxx/image_blend_occlude1_very_many.cc \
+cxx/image_blend_occlude1_very_many_capi.h \
+cxx/image_blend_occlude2.cc \
+cxx/image_blend_occlude2_capi.h \
+cxx/image_blend_occlude2_few.cc \
+cxx/image_blend_occlude2_few_capi.h \
+cxx/image_blend_occlude2_many.cc \
+cxx/image_blend_occlude2_many_capi.h \
+cxx/image_blend_occlude2_very_many.cc \
+cxx/image_blend_occlude2_very_many_capi.h \
+cxx/image_blend_occlude3.cc \
+cxx/image_blend_occlude3_capi.h \
+cxx/image_blend_occlude3_few.cc \
+cxx/image_blend_occlude3_few_capi.h \
+cxx/image_blend_occlude3_many.cc \
+cxx/image_blend_occlude3_many_capi.h \
+cxx/image_blend_occlude3_very_many.cc \
+cxx/image_blend_occlude3_very_many_capi.h \
+cxx/image_blend_occlude_capi.h \
+cxx/image_blend_smooth_same_scaled.cc \
+cxx/image_blend_smooth_same_scaled_capi.h \
+cxx/image_blend_smooth_scaled.cc \
+cxx/image_blend_smooth_scaled_capi.h \
+cxx/image_blend_smooth_solid_same_scaled.cc \
+cxx/image_blend_smooth_solid_same_scaled_capi.h \
+cxx/image_blend_smooth_solid_scaled.cc \
+cxx/image_blend_smooth_solid_scaled_capi.h \
+cxx/image_blend_solid_border.cc \
+cxx/image_blend_solid_border_capi.h \
+cxx/image_blend_solid_fade_pow2_unscaled.cc \
+cxx/image_blend_solid_fade_pow2_unscaled_capi.h \
+cxx/image_blend_solid_fade_unscaled.cc \
+cxx/image_blend_solid_fade_unscaled_capi.h \
+cxx/image_blend_solid_middle_border.cc \
+cxx/image_blend_solid_middle_border_capi.h \
+cxx/image_blend_solid_middle_unscaled.cc \
+cxx/image_blend_solid_middle_unscaled_capi.h \
+cxx/image_blend_solid_unscaled.cc \
+cxx/image_blend_solid_unscaled_capi.h \
+cxx/image_blend_unscaled.cc \
+cxx/image_blend_unscaled_capi.h \
+cxx/image_crossfade.cc \
+cxx/image_crossfade_capi.h \
+cxx/image_data_argb.cc \
+cxx/image_data_argb_alpha.cc \
+cxx/image_data_argb_alpha_capi.h \
+cxx/image_data_argb_capi.h \
+cxx/image_data_ycbcr601pl.cc \
+cxx/image_data_ycbcr601pl_capi.h \
+cxx/image_data_ycbcr601pl_map_nearest_solid_rotate.cc \
+cxx/image_data_ycbcr601pl_map_nearest_solid_rotate_capi.h \
+cxx/image_data_ycbcr601pl_map_solid_rotate.cc \
+cxx/image_data_ycbcr601pl_map_solid_rotate_capi.h \
+cxx/image_data_ycbcr601pl_wide_stride.cc \
+cxx/image_data_ycbcr601pl_wide_stride_capi.h \
+cxx/image_map_3d_1.cc \
+cxx/image_map_3d_1_capi.h \
+cxx/image_map_3d_2.cc \
+cxx/image_map_3d_2_capi.h \
+cxx/image_map_3d_3.cc \
+cxx/image_map_3d_3_capi.h \
+cxx/image_map_3d_4.cc \
+cxx/image_map_3d_4_capi.h \
+cxx/image_map_3d_5.cc \
+cxx/image_map_3d_5_capi.h \
+cxx/image_map_3d_6.cc \
+cxx/image_map_3d_6_capi.h \
+cxx/image_map_3d_flow.cc \
+cxx/image_map_3d_flow_capi.h \
+cxx/image_map_color_alpha_nearest_rotate.cc \
+cxx/image_map_color_alpha_nearest_rotate_capi.h \
+cxx/image_map_color_alpha_nearest_solid_rotate.cc \
+cxx/image_map_color_alpha_nearest_solid_rotate_capi.h \
+cxx/image_map_color_alpha_rotate.cc \
+cxx/image_map_color_alpha_rotate_capi.h \
+cxx/image_map_color_alpha_solid_rotate.cc \
+cxx/image_map_color_alpha_solid_rotate_capi.h \
+cxx/image_map_color_nearest_rotate.cc \
+cxx/image_map_color_nearest_rotate_capi.h \
+cxx/image_map_color_nearest_solid_rotate.cc \
+cxx/image_map_color_nearest_solid_rotate_capi.h \
+cxx/image_map_color_rotate.cc \
+cxx/image_map_color_rotate_capi.h \
+cxx/image_map_color_solid_rotate.cc \
+cxx/image_map_color_solid_rotate_capi.h \
+cxx/image_map_nearest_rotate.cc \
+cxx/image_map_nearest_rotate_capi.h \
+cxx/image_map_nearest_solid_rotate.cc \
+cxx/image_map_nearest_solid_rotate_capi.h \
+cxx/image_map_rotate.cc \
+cxx/image_map_rotate_capi.h \
+cxx/image_map_solid_rotate.cc \
+cxx/image_map_solid_rotate_capi.h \
+cxx/image_quality_scale.cc \
+cxx/image_quality_scale_capi.h \
+cxx/poly_blend.cc \
+cxx/poly_blend_capi.h \
+cxx/line_blend.cc \
+cxx/line_blend_capi.h \
+cxx/proxy_image.cc \
+cxx/proxy_image_capi.h \
+cxx/proxy_image_offscreen.cc \
+cxx/proxy_image_offscreen_capi.h \
+cxx/proxy_text_fixed.cc \
+cxx/proxy_text_fixed_capi.h \
+cxx/proxy_text_random.cc \
+cxx/proxy_text_random_capi.h \
+cxx/rect_blend.cc \
+cxx/rect_blend_capi.h \
+cxx/rect_blend_few.cc \
+cxx/rect_blend_few_capi.h \
+cxx/rect_blend_pow2.cc \
+cxx/rect_blend_pow2_capi.h \
+cxx/rect_blend_pow2_few.cc \
+cxx/rect_blend_pow2_few_capi.h \
+cxx/rect_solid.cc \
+cxx/rect_solid_capi.h \
+cxx/rect_solid_few.cc \
+cxx/rect_solid_few_capi.h \
+cxx/text_basic.cc \
+cxx/text_basic_capi.h \
+cxx/text_change.cc \
+cxx/text_change_capi.h \
+cxx/text_styles.cc \
+cxx/text_styles_capi.h \
+cxx/text_styles_different_strings.cc \
+cxx/text_styles_different_strings_capi.h \
+cxx/textblock_auto_align.cc \
+cxx/textblock_auto_align_capi.h \
+cxx/textblock_basic.cc \
+cxx/textblock_basic_capi.h \
+cxx/textblock_intl.cc \
+cxx/textblock_intl_capi.h \
+cxx/textblock_text_append.cc \
+cxx/textblock_text_append_capi.h \
+cxx/widgets_file_icons.cc \
+cxx/widgets_file_icons_2.cc \
+cxx/widgets_file_icons_2_capi.h \
+cxx/widgets_file_icons_2_grouped.cc \
+cxx/widgets_file_icons_2_grouped_capi.h \
+cxx/widgets_file_icons_2_same.cc \
+cxx/widgets_file_icons_2_same_capi.h \
+cxx/widgets_file_icons_2_same_grouped.cc \
+cxx/widgets_file_icons_2_same_grouped_capi.h \
+cxx/widgets_file_icons_3.cc \
+cxx/widgets_file_icons_3_capi.h \
+cxx/widgets_file_icons_4.cc \
+cxx/widgets_file_icons_4_capi.h \
+cxx/widgets_file_icons_capi.h \
+cxx/widgets_list_1.cc \
+cxx/widgets_list_1_capi.h \
+cxx/widgets_list_1_grouped.cc \
+cxx/widgets_list_1_grouped_capi.h \
+cxx/widgets_list_2.cc \
+cxx/widgets_list_2_capi.h \
+cxx/widgets_list_2_grouped.cc \
+cxx/widgets_list_2_grouped_capi.h \
+cxx/widgets_list_3.cc \
+cxx/widgets_list_3_capi.h \
+cxx/widgets_list_3_grouped.cc \
+cxx/widgets_list_3_grouped_capi.h \
+cxx/widgets_list_4.cc \
+cxx/widgets_list_4_capi.h \
+cxx/widgets_list_4_grouped.cc \
+cxx/widgets_list_4_grouped_capi.h \
+cxx/font_effect_blur_alpha.cc \
+cxx/font_effect_blur_alpha_capi.h \
+cxx/font_effect_blur_color.cc \
+cxx/font_effect_blur_color_capi.h
+
 expedite_SOURCES = \
 main.c main.h \
 ui.c ui.h \
@@ -48,9 +245,9 @@ image_blend_nearest_solid_same_scaled.c \
 image_blend_smooth_same_scaled.c \
 image_blend_smooth_solid_same_scaled.c \
 image_blend_border.c \
+image_blend_border_recolor.c \
 image_blend_solid_middle_border.c \
 image_blend_solid_border.c \
-image_blend_border_recolor.c \
 image_map_rotate.c \
 image_map_solid_rotate.c \
 image_map_nearest_rotate.c \
@@ -111,7 +308,9 @@ proxy_text_random.c \
 line_blend.c \
 image_blend_many_smooth_same_scaled.c \
 font_effect_blur_alpha.c \
-font_effect_blur_color.c
+font_effect_blur_color.c \
+${cxx_sources}
+
 #  \
 # image_mask.c \
 # image_mask_2.c \
@@ -131,7 +330,7 @@ font_effect_blur_color.c
 
 expedite_CFLAGS = @WIN32_CFLAGS@
 expedite_CXXFLAGS = @EXPEDITE_CXXFLAGS@
-expedite_LDADD = @EFL_LIBS@ @EVIL_LIBS@ -lm
+expedite_LDADD = @EFL_LIBS@ @EFL_CXX_LIBS@ @EVIL_LIBS@ -lm
 expedite_LDFLAGS = @lt_enable_auto_import@
 
 .rc.lo:

src/bin/about.c

@@ -8,7 +8,7 @@ _setup(void)
    Evas_Object *o;
    Evas_Textblock_Style *st;
 
-   o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
+   o = eo_add(EVAS_TEXTBLOCK_CLASS, G_evas);
    eo_do(o, evas_obj_position_set(10, 40),
          evas_obj_size_set(win_w - 20, win_h - 50),
          evas_obj_visibility_set(EINA_TRUE));

src/bin/about.h

@@ -1,6 +1,14 @@
 #ifndef ABOUT_H
 #define ABOUT_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void about_start(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

src/bin/cxx/font_effect_blur_alpha.cc

@@ -0,0 +1,72 @@
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "Eo.h"
+#include "Evas.h"
+
+#include "Eo.hh"
+#include "Eina.hh"
+#include "Evas.hh"
+
+#include "main.h"
+
+#define EXPEDITE_CXX_TEST_IMPL
+#include "font_effect_blur_alpha_capi.h"
+
+/* standard var */
+static int done = 0;
+extern int win_w, win_h;
+/* private data */
+static evas::text *text;
+static const int MAX_BLUR = 100;
+
+/* setup */
+static void _setup(void)
+{
+   int w,h;
+   evas::canvas canvas(::eo_ref(G_evas));
+   evas::text *o = new evas::text(efl::eo::parent = canvas);
+   o->evas::object::color_set(0, 0, 0, 255);
+   o->font_set("Vera-Bold", 80);
+   o->text_set("Font Effect");
+   o->visibility_set(true);
+   o->evas::object::size_get(&w, &h);
+   o->evas::object::position_set((win_w / 2) - (w / 2) - MAX_BLUR, (win_h / 2) - (h / 2) - MAX_BLUR);
+   text = o;
+
+   done = 0;
+}
+
+/* cleanup */
+static void _cleanup(void)
+{
+   text->visibility_set(false);
+   delete text;
+}
+
+/* loop - do things */
+static void _loop(double t, int f)
+{
+   if (text)
+     {
+        char buf[256];
+        char *str = "padding_set(%d);blur(%d,color=black);";
+        sprintf(buf, str, MAX_BLUR, ((f % MAX_BLUR) + 1));
+        text->filter_program_set(buf);
+     }
+   FPS_STD(NAME);
+}
+
+/* prepend special key handlers if interactive (before STD) */
+static void _key(char *key)
+{
+   KEY_STD;
+}
+
+extern "C" void FNAME(void)
+{
+   ui_func_set(_key, _loop);
+   _setup();
+}

src/bin/cxx/font_effect_blur_alpha_capi.h

@@ -0,0 +1,30 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#undef FNAME
+#undef NAME
+#undef ICON
+
+/* metadata */
+#define FNAME font_effect_blur_alpha_cxx_start
+#define NAME "(C++) Font Effect Blur (Alpha)"
+#define ICON "text.png"
+
+#ifdef UI
+_ui_menu_item_add(ICON, NAME, FNAME);
+#endif
+
+#ifdef PROTO
+void FNAME(void);
+#endif
+
+#ifndef EXPEDITE_CXX_TEST_IMPL
+#undef FNAME
+#undef NAME
+#undef ICON
+#endif
+
+#ifdef __cplusplus
+}
+#endif

src/bin/cxx/font_effect_blur_color.cc

@@ -0,0 +1,72 @@
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "Eo.h"
+#include "Evas.h"
+
+#include "Eo.hh"
+#include "Eina.hh"
+#include "Evas.hh"
+
+#include "main.h"
+
+#define EXPEDITE_CXX_TEST_IMPL
+#include "font_effect_blur_color_capi.h"
+
+/* standard var */
+static int done = 0;
+extern int win_w, win_h;
+/* private data */
+static evas::text *text;
+static const int MAX_BLUR = 100;
+
+/* setup */
+static void _setup(void)
+{
+   evas::canvas canvas(::eo_ref(G_evas));
+   int w, h;
+
+   evas::text *o = new evas::text(efl::eo::parent = canvas);
+   o->evas::object::color_set(0, 0, 0, 255);
+   o->font_set("Vera-Bold", 80);
+   o->text_set("Font Effect");
+   o->visibility_set(true);
+   o->evas::object::size_get(&w, &h);
+   o->evas::object::position_set((win_w / 2) - (w / 2) - MAX_BLUR, (win_h / 2) - (h / 2) - MAX_BLUR);
+   text = o;
+   done = 0;
+}
+
+/* cleanup */
+static void _cleanup(void)
+{
+   text->visibility_set(false);
+   delete text;
+}
+
+/* loop - do things */
+static void _loop(double t, int f)
+{
+   if (text)
+     {
+        char buf[256];
+        const char *str = "buffer:a(rgba);padding_set(%d);blend(dst=a,color=darkblue);blur(%d,src=a);";
+        sprintf(buf, str, MAX_BLUR, ((f % MAX_BLUR) + 1));
+        text->filter_program_set(buf);
+     }
+   FPS_STD(NAME);
+}
+
+/* prepend special key handlers if interactive (before STD) */
+static void _key(char *key)
+{
+   KEY_STD;
+}
+
+extern "C" void FNAME(void)
+{
+   ui_func_set(_key, _loop);
+   _setup();
+}

src/bin/cxx/font_effect_blur_color_capi.h

@@ -0,0 +1,31 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#undef FNAME
+#undef NAME
+#undef ICON
+
+/* metadata */
+#define FNAME font_effect_blur_color_cxx_start
+#define NAME "(C++) Font Effect Blur (Color)"
+#define ICON "text.png"
+
+#ifdef UI
+_ui_menu_item_add(ICON, NAME, FNAME);
+#endif
+
+#ifdef PROTO
+void FNAME(void);
+#endif
+
+#ifndef EXPEDITE_CXX_TEST_IMPL
+#undef FNAME
+#undef NAME
+#undef ICON
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+

src/bin/cxx/image_blend_border.cc

@@ -0,0 +1,80 @@
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "Eo.h"
+#include "Evas.h"
+
+#include "Eo.hh"
+#include "Eina.hh"
+#include "Evas.hh"
+
+#include "main.h"
+
+#define EXPEDITE_CXX_TEST_IMPL
+#include "image_blend_border_capi.h"
+
+static efl::eina::list<evas::image> images;
+
+/* standard var */
+static int done = 0;
+
+/* setup */
+static void _setup()
+{
+   evas::canvas canvas(::eo_ref(G_evas));
+   for (int i = 0; i < OBNUM; i++)
+     {
+        evas::image o(efl::eo::parent = canvas);
+        images.push_back(o);
+        eo_do(o._eo_ptr(), efl_file_set(build_path("bar.png"), NULL)); // XXX
+        o.border_set(6, 6, 6, 6);
+        o.visibility_set(true);
+     }
+   done = 0;
+}
+
+/* cleanup */
+static void _cleanup()
+{
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
+   images.clear();
+}
+
+/* loop - do things */
+static void _loop(double t, int f)
+{
+   Evas_Coord x, y, w, h, w0, h0;
+   int i = 0;
+   for (evas::image& img : images)
+     {
+        w0 = 80;
+        h0 = 80;
+        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
+        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        img.evas::object::position_set(x, y);
+        img.evas::object::size_set(w, h);
+        img.fill_set(0, 0, w, h);
+        ++i;
+     }
+   FPS_STD(NAME);
+}
+
+/* prepend special key handlers if interactive (before STD) */
+static void _key(char *key)
+{
+   KEY_STD;
+}
+
+extern "C" void FNAME(void)
+{
+   ui_func_set(_key, _loop);
+   _setup();
+}
+

src/bin/cxx/image_blend_border_capi.h

@@ -0,0 +1,32 @@
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#undef FNAME
+#undef NAME
+#undef ICON
+
+/* metadata */
+#define FNAME image_blend_border_cxx_start
+#define NAME "(C++) Image Blend Border (C++)"
+#define ICON "blend.png"
+
+#ifdef UI
+_ui_menu_item_add(ICON, NAME, FNAME);
+#endif
+
+#ifdef PROTO
+void FNAME(void);
+#endif
+
+#ifndef EXPEDITE_CXX_TEST_IMPL
+#undef FNAME
+#undef NAME
+#undef ICON
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+

src/bin/cxx/image_blend_border_recolor.cc

@@ -0,0 +1,81 @@
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "Eo.h"
+#include "Evas.h"
+
+#include "Eo.hh"
+#include "Eina.hh"
+#include "Evas.hh"
+
+#include "main.h"
+
+#define EXPEDITE_CXX_TEST_IMPL
+#include "image_blend_border_recolor_capi.h"
+
+efl::eina::list<evas::image> images;
+
+/* standard var */
+static int done = 0;
+
+/* setup */
+static void _setup(void)
+{
+   evas::canvas canvas(::eo_ref(G_evas));
+   for (int i = 0; i < OBNUM; i++)
+     {
+        evas::image o(efl::eo::parent = canvas);
+        images.push_back(o);
+        eo_do(o._eo_ptr(), efl_file_set(::build_path("pan.png"), NULL)); // XXX
+        o.color_set(64, 64, 64, 255);
+        o.border_set(3, 3, 3, 3);
+        o.visibility_set(true);
+     }
+   done = 0;
+}
+
+/* cleanup */
+static void _cleanup(void)
+{
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
+   images.clear();
+}
+
+/* loop - do things */
+static void _loop(double t, int f)
+{
+   int i = 0;
+   Evas_Coord x, y, w, h, w0, h0;
+   for (auto it = images.begin(), end = images.end(); it != end; it++, i++)
+     {
+        w0 = 80;
+        h0 = 80;
+        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
+        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+
+        (*it).position_set(x, y);
+        (*it).evas::object::size_set(w, h);
+        (*it).fill_set(0, 0, w, h);
+     }
+   FPS_STD(NAME);
+}
+
+/* prepend special key handlers if interactive (before STD) */
+static void _key(char *key)
+{
+   KEY_STD;
+}
+
+extern "C" void FNAME(void)
+{
+   ui_func_set(_key, _loop);
+   _setup();
+}
+

src/bin/cxx/image_blend_border_recolor_capi.h

@@ -0,0 +1,32 @@
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#undef FNAME
+#undef NAME
+#undef ICON
+
+/* metadata */
+#define FNAME image_blend_border_recolor_cxx_start
+#define NAME "(C++) Image Blend Border Recolor (C++)"
+#define ICON "blend.png"
+
+#ifdef UI
+_ui_menu_item_add(ICON, NAME, FNAME);
+#endif
+
+#ifdef PROTO
+void FNAME(void);
+#endif
+
+#ifndef EXPEDITE_CXX_TEST_IMPL
+#undef FNAME
+#undef NAME
+#undef ICON
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+

src/bin/cxx/image_blend_fade_pow2_unscaled.cc

@@ -0,0 +1,81 @@
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "Eo.h"
+#include "Evas.h"
+
+#include "Eo.hh"
+#include "Eina.hh"
+#include "Evas.hh"
+
+#include "main.h"
+
+#define EXPEDITE_CXX_TEST_IMPL
+#include "image_blend_fade_pow2_unscaled_capi.h"
+
+static efl::eina::list<evas::image> images;
+
+/* standard var */
+static int done = 0;
+
+/* setup */
+static void _setup(void)
+{
+   evas::canvas canvas(::eo_ref(G_evas));