Skip ill formed lines

Summary:
Some lines reported by expedite are just informative, like the window
size. We skip lines that don't have the formatting we expect.

Fixes T8852

Reviewers: vtorri, raster

Reviewed By: raster

Maniphest Tasks: T8852

Differential Revision: https://phab.enlightenment.org/D12186

.arcconfig

@@ -1,4 +1,6 @@
 {
   "project_id" : "expedite",
-  "conduit_uri" : "https://phab.enlightenment.org/"
+  "projects" : "expedite",
+  "conduit_uri" : "https://phab.enlightenment.org/",
+  "phabricator.uri" : "https://phab.enlightenment.org/"
 }

AUTHORS

@@ -3,6 +3,6 @@ Tim Horton <hortont424@gmail.com>
 Saumsung Electronics <tbd>
 Samsung SAIT <tbd>
 Bruno Tarquini <btarquini@gmail.com>
-ChunEon Park (Hermet) <hermet@hermet.pe.kr>
+Hermet Park <hermetpark@gmail.com>
 Eduardo Lima (Etrunko) <eblima@gmail.com>
 JaEun Choi <jaeun12.choi@samsung.com>

INSTALL

@@ -1,14 +1,368 @@
-COMPILING and INSTALLING:
+Installation Instructions
+*************************
 
-If you got a official release tar archive do:
-    ./configure
-    
-( otherwise if you got this from enlightenment cvs do: ./autogen.sh )
-    
-Then to compile:
-    make
+   Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software
+Foundation, Inc.
 
-To install (run this as root, or the user who handles installs):
-    make install
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
-NOTE: You MUST make install Expedite for it to run properly.
+Basic Installation
+==================
+
+   Briefly, the shell command './configure && make && make install'
+should configure, build, and install this package.  The following
+more-detailed instructions are generic; see the 'README' file for
+instructions specific to this package.  Some packages provide this
+'INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
+
+   The 'configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a 'Makefile' in each directory of the package.
+It may also create one or more '.h' files containing system-dependent
+definitions.  Finally, it creates a shell script 'config.status' that
+you can run in the future to recreate the current configuration, and a
+file 'config.log' containing compiler output (useful mainly for
+debugging 'configure').
+
+   It can also use an optional file (typically called 'config.cache' and
+enabled with '--cache-file=config.cache' or simply '-C') that saves the
+results of its tests to speed up reconfiguring.  Caching is disabled by
+default to prevent problems with accidental use of stale cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how 'configure' could check whether to do them, and mail
+diffs or instructions to the address given in the 'README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point 'config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file 'configure.ac' (or 'configure.in') is used to create
+'configure' by a program called 'autoconf'.  You need 'configure.ac' if
+you want to change it or regenerate 'configure' using a newer version of
+'autoconf'.
+
+   The simplest way to compile this package is:
+
+  1. 'cd' to the directory containing the package's source code and type
+     './configure' to configure the package for your system.
+
+     Running 'configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type 'make' to compile the package.
+
+  3. Optionally, type 'make check' to run any self-tests that come with
+     the package, generally using the just-built uninstalled binaries.
+
+  4. Type 'make install' to install the programs and any data files and
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the 'make install' phase executed with root
+     privileges.
+
+  5. Optionally, type 'make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior 'make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
+     source code directory by typing 'make clean'.  To also remove the
+     files that 'configure' created (so you can compile the package for
+     a different kind of computer), type 'make distclean'.  There is
+     also a 'make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+  7. Often, you can also type 'make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide 'make
+     distcheck', which can by used by developers to test that all other
+     targets like 'make install' and 'make uninstall' work correctly.
+     This target is generally not run by end users.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the 'configure' script does not know about.  Run './configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give 'configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here is
+an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you can use GNU 'make'.  'cd' to the
+directory where you want the object files and executables to go and run
+the 'configure' script.  'configure' automatically checks for the source
+code in the directory that 'configure' is in and in '..'.  This is known
+as a "VPATH" build.
+
+   With a non-GNU 'make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use 'make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple '-arch' options to the
+compiler but only a single '-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the 'lipo' tool if you have problems.
+
+Installation Names
+==================
+
+   By default, 'make install' installs the package's commands under
+'/usr/local/bin', include files under '/usr/local/include', etc.  You
+can specify an installation prefix other than '/usr/local' by giving
+'configure' the option '--prefix=PREFIX', where PREFIX must be an
+absolute file name.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option '--exec-prefix=PREFIX' to 'configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like '--bindir=DIR' to specify different values for particular
+kinds of files.  Run 'configure --help' for a list of the directories
+you can set and what kinds of files go in them.  In general, the default
+for these options is expressed in terms of '${prefix}', so that
+specifying just '--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to 'configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+'make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, 'make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+'${prefix}'.  Any directories that were specified during 'configure',
+but not in terms of '${prefix}', must each be overridden at install time
+for the entire installation to be relocated.  The approach of makefile
+variable overrides for each directory variable is required by the GNU
+Coding Standards, and ideally causes no recompilation.  However, some
+platforms have known limitations with the semantics of shared libraries
+that end up requiring recompilation when using this method, particularly
+noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the 'DESTDIR' variable.  For
+example, 'make install DESTDIR=/alternate/directory' will prepend
+'/alternate/directory' before all installation names.  The approach of
+'DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of '${prefix}'
+at 'configure' time.
+
+Optional Features
+=================
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving 'configure' the
+option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'.
+
+   Some packages pay attention to '--enable-FEATURE' options to
+'configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to '--with-PACKAGE' options, where PACKAGE
+is something like 'gnu-as' or 'x' (for the X Window System).  The
+'README' should mention any '--enable-' and '--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, 'configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the 'configure' options '--x-includes=DIR' and
+'--x-libraries=DIR' to specify their locations.
+
+   Some packages offer the ability to configure how verbose the
+execution of 'make' will be.  For these packages, running './configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with 'make V=1'; while running './configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with 'make V=0'.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU CC
+is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   HP-UX 'make' updates targets which have the same time stamps as their
+prerequisites, which makes it generally unusable when shipped generated
+files such as 'configure' are involved.  Use GNU 'make' instead.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its '<wchar.h>' header file.  The option '-nodtk' can be used as a
+workaround.  If GNU CC is not installed, it is therefore recommended to
+try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+   On Solaris, don't put '/usr/ucb' early in your 'PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in '/usr/bin'.  So, if you need '/usr/ucb'
+in your 'PATH', put it _after_ '/usr/bin'.
+
+   On Haiku, software installed for all users goes in '/boot/common',
+not '/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
+Specifying the System Type
+==========================
+
+   There may be some features 'configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, 'configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+'--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as 'sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS
+     KERNEL-OS
+
+   See the file 'config.sub' for the possible values of each field.  If
+'config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option '--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with '--host=TYPE'.
+
+Sharing Defaults
+================
+
+   If you want to set default values for 'configure' scripts to share,
+you can create a site shell script called 'config.site' that gives
+default values for variables like 'CC', 'cache_file', and 'prefix'.
+'configure' looks for 'PREFIX/share/config.site' if it exists, then
+'PREFIX/etc/config.site' if it exists.  Or, you can set the
+'CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all 'configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+   Variables not defined in a site shell script can be set in the
+environment passed to 'configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the 'configure' command line, using 'VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified 'gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an
+Autoconf limitation.  Until the limitation is lifted, you can use this
+workaround:
+
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+'configure' Invocation
+======================
+
+   'configure' recognizes the following options to control how it
+operates.
+
+'--help'
+'-h'
+     Print a summary of all of the options to 'configure', and exit.
+
+'--help=short'
+'--help=recursive'
+     Print a summary of the options unique to this package's
+     'configure', and exit.  The 'short' variant lists options used only
+     in the top level, while the 'recursive' variant lists options also
+     present in any nested packages.
+
+'--version'
+'-V'
+     Print the version of Autoconf used to generate the 'configure'
+     script, and exit.
+
+'--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally 'config.cache'.  FILE defaults to '/dev/null' to
+     disable caching.
+
+'--config-cache'
+'-C'
+     Alias for '--cache-file=config.cache'.
+
+'--quiet'
+'--silent'
+'-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to '/dev/null' (any error
+     messages will still be shown).
+
+'--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     'configure' can determine that directory automatically.
+
+'--prefix=DIR'
+     Use DIR as the installation prefix.  *note Installation Names:: for
+     more details, including other options available for fine-tuning the
+     installation locations.
+
+'--no-create'
+'-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
+'configure' also accepts some other, not widely useful, options.  Run
+'configure --help' for more details.

configure.ac

@@ -3,14 +3,14 @@ dnl Process this file with autoconf to produce a configure script.
 # get rid of that stupid cache mechanism
 rm -f config.cache
 
-AC_INIT([expedite], [1.11.99], [enlightenment-devel@lists.sourceforge.net])
+AC_INIT([expedite], [1.23.0], [enlightenment-devel@lists.sourceforge.net])
 AC_PREREQ([2.52])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_HEADERS([config.h])
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE([1.6 dist-bzip2])
+AM_INIT_AUTOMAKE([1.6 dist-xz])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 PKG_PROG_PKG_CONFIG
@@ -18,97 +18,46 @@ PKG_PROG_PKG_CONFIG
 
 ### Checks for programs
 
-AC_ISC_POSIX
-m4_ifdef([AC_PROG_OBJC],
-   [
-    AC_PROG_OBJC
-    _AM_DEPENDENCIES(OBJC)
-   ],
-   [
-    AC_CHECK_TOOL([OBJC], [gcc])
-    AC_SUBST([OBJC])
-    AC_SUBST([OBJCFLAGS])
-   ]
-)
-AC_PROG_CXX
 AC_PROG_CC
 
-LT_PROG_RC
-
-
-
 ### Checks for libraries
 
-# Evil library for compilation on Windows
-
-case "$host_os" in
-   mingw32*)
-      PKG_CHECK_MODULES([EVIL], [evil >= 1.7.99])
-      AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if Evil library is installed])
-      ;;
-esac
-
 # EFL dependencies
+efl_version="1.23.0"
+requirement_expedite=" \
+eo >= ${efl_version} \
+efl >= ${efl_version} \
+eina >= ${efl_version} \
+evas >= ${efl_version} \
+eet >= ${efl_version} \
+ecore-evas >= ${efl_version} \
+ecore >= ${efl_version}"
+
+AC_SUBST(requirement_expedite)
 
-PKG_CHECK_MODULES([EFL], eina >= 1.7.99 efl >= 1.13.0 eo >= 1.7.99 evas >= 1.7.99 eet >= 1.7.99 ecore-evas >= 1.7.99 ecore >= 1.7.99)
+PKG_CHECK_MODULES([EFL], [${requirement_expedite}])
 
 EFL_ENABLE_EO_API_SUPPORT
 EFL_ENABLE_BETA_API_SUPPORT
 
-
 ### Checks for header files
 
-
 ### Checks for types
 
-
 ### Checks for structures
 
-
 ### Checks for compiler characteristics
 
-AC_HEADER_STDC
-AC_C_CONST
+AC_PROG_CC_C99
 AM_PROG_CC_C_O
 AC_C___ATTRIBUTE__
 
-WIN32_CFLAGS=""
-case "$host_os" in
-   cegcc*)
-      WIN32_CFLAGS="-mwin32"
-      ;;
-esac
-AC_SUBST(WIN32_CFLAGS)
-
-EXPEDITE_CXXFLAGS=""
-AC_LANG_PUSH([C++])
-CXXFLAGS_save="${CXXFLAGS}"
-CXXFLAGS="${CXXFLAGS} -fno-rtti -fno-exceptions"
-AC_LINK_IFELSE(
-   [AC_LANG_PROGRAM([[]])],
-   [have_cxx_flags="yes"],
-   [have_cxx_flags="no"])
-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"
+if test "x${ac_cv_prog_cc_c99}" = "xno" ; then
+   AC_MSG_ERROR([expedite requires a c99-capable compiler])
 fi
-AC_LANG_POP([C++])
-AC_SUBST(EXPEDITE_CXXFLAGS)
-
 
 ### Checks for linker characteristics
 
-lt_enable_auto_import=""
-case "$host_os" in
-   mingw* | cegcc*)
-      lt_enable_auto_import="-Wl,--enable-auto-import"
-      ;;
-esac
-AC_SUBST(lt_enable_auto_import)
-
-
 ### Checks for library functions
 
 AC_CHECK_FUNCS([sync])

data/meson.build

@@ -0,0 +1,61 @@
+files = [ 'Kochi.ttf',
+	'Vera.ttf',
+	'VeraBI.ttf',
+	'VeraBd.ttf',
+	'VeraIt.ttf',
+	'VeraMoBI.ttf',
+	'VeraMoBd.ttf',
+	'VeraMoIt.ttf',
+	'VeraMono.ttf',
+	'VeraSe.ttf',
+	'VeraSeBd.ttf',
+	'fonts.alias',
+	'fonts.dir',
+	'logo.png',
+	'e-logo.png',
+	'e.png',
+	'image.png',
+	'bar.png',
+	'frame.png',
+	'stretch.png',
+	'9patch_test.9.png',
+	'pan.png',
+	'tp.png',
+	'tp.yuv',
+	'icon_sel.png',
+	'text_sel.png',
+	'exit.png',
+	'watch.png',
+	'bug.png',
+	'bulb.png',
+	'camera.png',
+	'colorbox.png',
+	'error.png',
+	'flower.png',
+	'house.png',
+	'mushroom.png',
+	'pulse.png',
+	'typewriter.png',
+	'warning.png',
+	'im1.png',
+	'im2.png',
+	'cube1.png',
+	'cube2.png',
+	'cube3.png',
+	'cube4.png',
+	'cube5.png',
+	'cube6.png',
+	'text.png',
+	'rect.png',
+	'blend.png',
+	'map.png',
+	'3d.png',
+	'data.png',
+	'widgets.png',
+	'e-logo-2.png',
+	'e-logo-mask.png',
+	'texture.png',
+	'vector.png' ]
+
+install_data(files, install_dir: join_paths(get_option('datadir'),
+					meson.project_name(), 'data'))

meson.build

@@ -0,0 +1,63 @@
+project('expedite', 'c',
+        version: '1.23.0',
+	default_options: ['c_std=gnu99'],
+	license: 'BSD')
+
+
+cc = meson.get_compiler('c')
+
+prefix = get_option('prefix')
+add_global_arguments('-DHAVE_CONFIG_H=1', language: 'c')
+config_data = configuration_data()
+config_data.set('EFL_BETA_API_SUPPORT', 1)
+config_data.set_quoted('PACKAGE_VERSION', meson.project_version())
+config_data.set_quoted('PACKAGE', meson.project_name())
+config_data.set_quoted('PACKAGE_BUGREPORT',
+                       'enlightenment-devel@lists.sourceforge.net')
+config_data.set_quoted('PACKAGE_NAME', meson.project_name())
+config_data.set_quoted('PACKAGE_TARNAME', meson.project_name())
+config_data.set_quoted('PACKAGE_URL',
+                       'https://www.enlightenment.org/')
+config_data.set_quoted('PACKAGE_BIN_DIR',
+                       join_paths(prefix, get_option('bindir')))
+config_data.set_quoted('PACKAGE_DATA_DIR',
+                       join_paths(prefix, get_option('datadir'),
+                                  meson.project_name()))
+config_data.set_quoted('PACKAGE_LIB_DIR',
+                       join_paths(prefix, get_option('libdir')))
+config_data.set_quoted('LOCALEDIR', join_paths(prefix, get_option('localedir')))
+
+host_os = host_machine.system()
+
+if host_os == 'linux'
+   config_data.set('_GNU_SOURCE', 1)
+   config_data.set('__EXTENSIONS__', 1)
+   config_data.set('_POSIX_PTHREAD_SEMANTICS', 1)
+   config_data.set('_TANDEM_SOURCE', 1)
+   config_data.set('_ALL_SOURCE', 1)
+   config_data.set('_POSIX_SOURCE', 1)
+   config_data.set('_POSIX_1_SOURCE', 1)
+endif
+
+efl_version = '1.23.0'
+efl_deps = ['eina',
+            'eet',
+            'eo',
+            'efl',
+            'evas',
+            'ecore',
+            'ecore-evas',
+	    'elementary']
+expedite_dependencies = []
+
+foreach efl_dep: efl_deps
+  dep = dependency(efl_dep, version: '>=' + efl_version)
+  expedite_dependencies += [dep]
+endforeach
+
+configure_file(output: 'config.h',
+               configuration: config_data)
+
+config_dir = include_directories('.')
+subdir('src/bin')
+subdir('data')

src/bin/Makefile.am

@@ -6,8 +6,7 @@ AM_CPPFLAGS = \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-@EFL_CFLAGS@ \
-@EVIL_CFLAGS@
+@EFL_CFLAGS@
 
 bin_PROGRAMS = expedite
 bin_SCRIPTS = expedite-cmp
@@ -50,6 +49,8 @@ image_blend_smooth_solid_same_scaled.c \
 image_blend_border.c \
 image_blend_solid_middle_border.c \
 image_blend_solid_border.c \
+image_blend_solid_stretch.c \
+image_blend_solid_9patch.c \
 image_blend_border_recolor.c \
 image_map_rotate.c \
 image_map_solid_rotate.c \
@@ -86,6 +87,7 @@ textblock_basic.c \
 textblock_intl.c \
 textblock_auto_align.c \
 textblock_text_append.c \
+textblock_text_fill_format.c \
 rect_blend.c \
 rect_blend_pow2.c \
 rect_solid.c \
@@ -108,6 +110,8 @@ poly_blend.c \
 proxy_image.c \
 proxy_text_fixed.c \
 proxy_text_random.c \
+proxy_textblock.c \
+proxy_image_clipped.c \
 line_blend.c \
 image_blend_many_smooth_same_scaled.c \
 font_effect_blur_alpha.c \
@@ -125,20 +129,16 @@ image_mask_10.c \
 image_mask_11.c \
 image_mask_12.c \
 image_mask_13.c \
+image_mask_clipped.c \
 vg_basic_rect.c \
 vg_basic_circle.c \
 vg_basic_gradient.c \
-vg_scaled.c
+vg_scaled.c \
+snapshot_widgets_file_icons.c
 # \
 # image_mask_14.c \
 # image_mask_15.c
 
-expedite_CFLAGS = @WIN32_CFLAGS@
-expedite_CXXFLAGS = @EXPEDITE_CXXFLAGS@
-expedite_LDADD = @EFL_LIBS@ @EVIL_LIBS@ -lm
-expedite_LDFLAGS = @lt_enable_auto_import@
-
-.rc.lo:
-	$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --tag=RC --mode=compile $(RC) $(RCFLAGS) $< -o $@
+expedite_LDADD = @EFL_LIBS@ -lm
 
 EXTRA_DIST = $(bin_SCRIPTS)

src/bin/about.c

@@ -6,32 +6,28 @@ static void
 _setup(void)
 {
    Evas_Object *o;
-   Evas_Textblock_Style *st;
 
-   o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
-   eo_do(o, efl_gfx_position_set(10, 40),
-         efl_gfx_size_set(win_w - 20, win_h - 50),
-         efl_gfx_visible_set(EINA_TRUE));
-   st = evas_textblock_style_new();
-   evas_textblock_style_set
-     (st,
-      "DEFAULT='font=Vera font_size=8 align=left color=#000 wrap=word'"
-      "center='+ font=Vera font_size=10 align=center'"
-      "/center='- \n \n'"
-      "p='+ font=Vera font_size=10 align=left'"
-      "/p='- \n \n'"
-      );
-   eo_do(o, evas_obj_textblock_style_set(st),
-         evas_obj_textblock_clear(),
-         evas_obj_textblock_text_markup_set
-     ("<center>"
+   o = efl_add(EFL_CANVAS_TEXTBLOCK_CLASS, evas);
+   efl_gfx_entity_position_set(o, EINA_POSITION2D(10, 40));
+   efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w - 20, win_h - 50));
+   efl_gfx_entity_visible_set(o, EINA_TRUE);
+
+   efl_text_font_family_set(o, "Vera");
+   efl_text_font_size_set(o, 10);
+   efl_text_color_set(o, 0, 0, 0, 255);
+   efl_text_multiline_set(o, EINA_TRUE);
+   efl_text_horizontal_align_set(o, 0.5);
+   efl_text_wrap_set(o, EFL_TEXT_FORMAT_WRAP_WORD);
+
+   efl_text_markup_set
+     (o,
       "Enlightenment used to be a window manager project, but "
       "since has changed a lot to become a miniature desktop and mobile "
       "device environment all of its own. It is now made up of many "
       "components (libraries and applications) that have specific uses. "
       "It is very large, and so requires more testing and demonstration."
       "</center>"
-
+      "</br>"
       "<center>"
       "Expedite is a full test suite for Evas, which is one of the "
       "core components of the Enlightenment Foundation Libraries. Evas "
@@ -39,10 +35,8 @@ _setup(void)
       "render to many targets, including framebuffer, X11, OpenGL, memory, "
       "DirectFB and other targets to boot. It handles high level graphic "
       "layout descriptions that applications set up, dealing with the hard "
-      "work of doing the drawing for them."
-      "</center>"
-      ));
-   evas_textblock_style_free(st);
+      "work of doing the drawing for them.");
+
    o_text = o;
    ui_fps(0.0);
 }
@@ -50,7 +44,7 @@ _setup(void)
 static void
 _cleanup(void)
 {
-   eo_del(o_text);
+   efl_del(o_text);
    o_text = NULL;
 }
 
@@ -61,7 +55,7 @@ _loop(double t EINA_UNUSED,
 }
 
 static void
-_key(char *key)
+_key(const char *key)
 {
    if ((!strcmp(key, "Escape")) || (!strcmp(key, "q")) || (!strcmp(key, "Q")))
      {
@@ -73,6 +67,5 @@ _key(char *key)
 void
 about_start(void)
 {
-   ui_func_set(_key, _loop);
-   _setup();
+   ui_func_set(_key, _loop, _setup);
 }

src/bin/engine_direct3d.cpp

@@ -1,288 +0,0 @@
-#include "main.h"
-
-#include <windowsx.h>
-#include <Evas_Engine_Direct3D.h>
-
-
-static HWND window;
-static HINSTANCE instance;
-
-
-static LRESULT CALLBACK
-MainWndProc(HWND   hwnd,
-            UINT   uMsg,
-            WPARAM wParam,
-            LPARAM lParam)
-{
-   switch (uMsg)
-     {
-     case WM_CREATE:
-       return 0;
-     case WM_DESTROY:
-       PostQuitMessage(0);
-       return 0;
-     case WM_CLOSE:
-       PostQuitMessage(0);
-       return 0;
-     case WM_PAINT: {
-       PAINTSTRUCT ps;
-       HDC hdc;
-
-       hdc = BeginPaint (window, &ps);
-       evas_damage_rectangle_add(evas,
-                                 ps.rcPaint.left, ps.rcPaint.top,
-                                 ps.rcPaint.right - ps.rcPaint.left,
-                                 ps.rcPaint.bottom - ps.rcPaint.top);
-       EndPaint(window, &ps);
-       return 0;
-     }
-     case WM_SIZING:
-       {
-          PRECT rect = (PRECT)lParam;
-
-          evas_output_viewport_set(evas, 0, 0,
-                                   rect->right - rect->left,
-                                   rect->bottom - rect->top);
-          evas_output_size_set(evas,
-                               rect->right - rect->left,
-                               rect->bottom - rect->top);
-          win_w = rect->right - rect->left;
-          win_h = rect->bottom - rect->top;
-          return 0;
-       }
-     case WM_RBUTTONDOWN:
-       evas_event_feed_mouse_move(evas, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), 0, NULL);
-       evas_event_feed_mouse_down(evas, 3, EVAS_BUTTON_NONE, 0, NULL);
-       return 0;
-     case WM_LBUTTONDOWN:
-       evas_event_feed_mouse_move(evas, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), 0, NULL);
-       evas_event_feed_mouse_down(evas, 1, EVAS_BUTTON_NONE, 0, NULL);
-       return 0;
-     case WM_LBUTTONUP:
-       evas_event_feed_mouse_move(evas, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), 0, NULL);
-       evas_event_feed_mouse_up(evas, 1, EVAS_BUTTON_NONE, 0, NULL);
-       return 0;
-     case WM_RBUTTONUP:
-       evas_event_feed_mouse_move(evas, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), 0, NULL);
-       evas_event_feed_mouse_up(evas, 3, EVAS_BUTTON_NONE, 0, NULL);
-       return 0;
-     case WM_MOUSEMOVE:
-       if (!evas_pointer_inside_get(evas)) evas_event_feed_mouse_in(evas, 0, NULL);
-       evas_event_feed_mouse_move(evas, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), 0, NULL);
-       return 0;
-     case WM_MOUSELEAVE:
-       evas_event_feed_mouse_out(evas, 0, NULL);
-       return 0;
-       /* FIXME : can't find an event when the mouse is entering */
-     case WM_KEYDOWN:
-     case WM_SYSKEYDOWN: {
-        int key;
-
-        key = LOWORD(wParam);
-
-        if ((key == VK_SHIFT) ||
-            (key == VK_LSHIFT) ||
-            (key == VK_RSHIFT))
-          evas_key_modifier_on(evas, "Shift");
-        if ((key == VK_CONTROL) ||
-            (key == VK_LCONTROL) ||
-            (key == VK_RCONTROL))
-          evas_key_modifier_on(evas, "Control");
-        if ((key == VK_MENU) ||
-            (key == VK_LMENU) ||
-            (key == VK_RMENU))
-          evas_key_modifier_on(evas, "Alt");
-        if ((key == VK_LWIN) ||
-            (key == VK_RWIN))
-          evas_key_modifier_on(evas, "Super");
-
-        if (key == VK_CAPITAL)
-          {
-             if (evas_key_lock_is_set(evas_key_lock_get(evas), "Caps_Lock"))
-               evas_key_lock_off(evas, "Caps_Lock");
-             else
-               evas_key_lock_on(evas, "Caps_Lock");
-          }
-        if (key == VK_NUMLOCK)
-          {
-             if (evas_key_lock_is_set(evas_key_lock_get(evas), "Num_Lock"))
-               evas_key_lock_off(evas, "Num_Lock");
-             else
-               evas_key_lock_on(evas, "Num_Lock");
-          }
-        if (key == VK_SCROLL)
-          {
-             if (evas_key_lock_is_set(evas_key_lock_get(evas), "Scroll_Lock"))
-               evas_key_lock_off(evas, "Scroll_Lock");
-             else
-               evas_key_lock_on(evas, "Scroll_Lock");
-          }
-        if (key == VK_ESCAPE)
-          evas_event_feed_key_down(evas, "Escape", "Escape", NULL, NULL, 0, NULL);
-        if (key == VK_RETURN)
-          evas_event_feed_key_down(evas, "Return", "Return", NULL, NULL, 0, NULL);
-        if (key == VK_LEFT)
-          evas_event_feed_key_down(evas, "Left", "Left", NULL, NULL, 0, NULL);
-        if (key == VK_RIGHT)
-          evas_event_feed_key_down(evas, "Right", "Right", NULL, NULL, 0, NULL);
-        if (key == 81)
-          evas_event_feed_key_down(evas, "Q", "Q", NULL, NULL, 0, NULL);
-        if (key == 113)
-          evas_event_feed_key_down(evas, "q", "q", NULL, NULL, 0, NULL);
-        return 0;
-     }
-     case WM_KEYUP:
-     case WM_SYSKEYUP: {
-        int key;
-
-        key = LOWORD(wParam);
-
-        if ((key == VK_SHIFT) ||
-            (key == VK_LSHIFT) ||
-            (key == VK_RSHIFT))
-          evas_key_modifier_off(evas, "Shift");
-        if ((key == VK_CONTROL) ||
-            (key == VK_LCONTROL) ||
-            (key == VK_RCONTROL))
-          evas_key_modifier_off(evas, "Control");
-        if ((key == VK_MENU) ||
-            (key == VK_LMENU) ||
-            (key == VK_RMENU))
-          evas_key_modifier_off(evas, "Alt");
-        if ((key == VK_LWIN) ||
-            (key == VK_RWIN))
-          evas_key_modifier_off(evas, "Super");
-        if (key == VK_ESCAPE)
-          evas_event_feed_key_up(evas, "Escape", "Escape", NULL, NULL, 0, NULL);
-        if (key == VK_RETURN)
-          evas_event_feed_key_up(evas, "Return", "Return", NULL, NULL, 0, NULL);
-        if (key == VK_LEFT)
-          evas_event_feed_key_up(evas, "Left", "Left", NULL, NULL, 0, NULL);
-        if (key == VK_RIGHT)
-          evas_event_feed_key_up(evas, "Right", "Right", NULL, NULL, 0, NULL);
-        if (key == 81)
-          evas_event_feed_key_up(evas, "Q", "Q", NULL, NULL, 0, NULL);
-        if (key == 113)
-          evas_event_feed_key_up(evas, "q", "q", NULL, NULL, 0, NULL);
-        return 0;
-     }
-     default:
-       return DefWindowProc(hwnd, uMsg, wParam, lParam);
-     }
-}
-
-Eina_Bool
-engine_direct3d_args(const char *engine, int width, int height)
-{
-   WNDCLASS                   wc;
-   RECT                       rect;
-   HDC                        dc;
-   MSG                        msg;
-   Evas_Engine_Info_Direct3D *einfo;
-   DWORD                      style;
-   int                        depth;
-   int                        i;
-
-   instance = GetModuleHandle(NULL);
-   if (!instance) return EINA_FALSE;
-
-   wc.style = 0;
-   wc.lpfnWndProc = MainWndProc;
-   wc.cbClsExtra = 0;
-   wc.cbWndExtra = 0;
-   wc.hInstance = instance;
-   wc.hIcon = LoadIcon (NULL, IDI_APPLICATION);
-   wc.hCursor = LoadCursor (NULL, IDC_ARROW);
-   wc.hbrBackground = GetSysColorBrush(COLOR_BTNFACE);
-   wc.lpszMenuName =  NULL;
-   wc.lpszClassName = "Evas_Direct3D_Test";
-
-   if(!RegisterClass(&wc))
-     goto free_library;
-
-   rect.left = 0;
-   rect.top = 0;
-   rect.right = width;
-   rect.bottom = height;
-   AdjustWindowRect (&rect, WS_OVERLAPPEDWINDOW | WS_SIZEBOX, FALSE);
-
-   window = CreateWindowEx(0,
-                           "Evas_Direct3D_Test",
-                           "Evas_Direct3D_Test",
-                           WS_OVERLAPPEDWINDOW | WS_SIZEBOX,
-                           CW_USEDEFAULT, CW_USEDEFAULT,
-                           rect.right - rect.left, rect.bottom - rect.top,
-                           NULL, NULL, instance, NULL);
-   if (!window)
-     goto unregister_class;
-
-   /* make the window non resizable */
-   style = GetWindowLong(window, GWL_STYLE);
-   style &= ~WS_THICKFRAME;
-   if (!SetWindowLong(window, GWL_STYLE, style))
-     goto unregister_class;
-
-   dc = GetDC(NULL);
-   if (!dc)
-     goto destroy_window;
-
-   depth = GetDeviceCaps(dc, BITSPIXEL);
-   ReleaseDC(NULL, dc);
-
-   evas_output_method_set(evas, evas_render_method_lookup("direct3d"));
-   einfo = (Evas_Engine_Info_Direct3D *)evas_engine_info_get(evas);
-   if (!einfo)
-     {
-        fprintf(stderr, "Evas does not support the Direct3D Engine\n");
-        goto destroy_window;
-     }
-
-   einfo->info.window = window;
-   einfo->info.depth = depth;
-   einfo->info.rotation = 0;
-   if (!evas_engine_info_set(evas, (Evas_Engine_Info *)einfo))
-     {
-	printf("Evas can not setup the informations of the Direct3D Engine\n");
-        goto destroy_window;
-     }
-
-   /* the second parameter is ignored, as it's the first call of ShowWindow */
-   ShowWindow(window, SW_SHOWDEFAULT);
-   UpdateWindow(window);
-
-   return EINA_TRUE;
-
- destroy_window:
-   DestroyWindow(window);
- unregister_class:
-   UnregisterClass("Evas_Direct3D_Test", instance);
- free_library:
-   FreeLibrary(instance);
-
-   return EINA_FALSE;
-}
-
-void
-engine_direct3d_loop(void)
-{
-   MSG msg;
-   int res;
-
- again:
-   if (!PeekMessage (&msg, window, 0, 0, PM_NOREMOVE))
-     return;
-
-   res = GetMessage (&msg, NULL, 0, 0);
-   TranslateMessage (&msg);
-   DispatchMessage (&msg);
-
-   goto again;
-}
-
-void
-engine_direct3d_shutdown(void)
-{
-   DestroyWindow(window);
-   UnregisterClass("Evas_Direct3D_Test", instance);
-   FreeLibrary(instance);
-}

src/bin/engine_software_16_wince.rc

@@ -1 +0,0 @@
-HI_RES_AWARE   CEUX   {1}

src/bin/engine_software_ddraw.cpp

@@ -1,291 +0,0 @@
-#include "main.h"
-