Merge with EFL svn repo
authorjaehwan <jae.hwan.kim@samsung.com>
Fri, 10 Sep 2010 15:06:02 +0000 (00:06 +0900)
committerjaehwan <jae.hwan.kim@samsung.com>
Fri, 10 Sep 2010 15:06:02 +0000 (00:06 +0900)
Merge branch 'svn_merge'

Conflicts:
configure.ac
m4/expedite_check_engine.m4
src/bin/Makefile.am
src/bin/image_data_argb.c
src/bin/image_data_argb_alpha.c
src/bin/main.c
src/bin/tests.h
src/bin/ui.c

32 files changed:
config.sub [changed mode: 0755->0644]
configure
configure.ac
debian/SVN_REV [new file with mode: 0644]
debian/_original/changelog [new file with mode: 0644]
debian/_original/compat [new file with mode: 0644]
debian/_original/control [new file with mode: 0644]
debian/_original/copyright [new file with mode: 0644]
debian/_original/rules [new file with mode: 0755]
debian/changelog
debian/control
ltmain.sh [changed mode: 0755->0644]
m4/expedite_check_engine.m4
src/bin/Makefile.am
src/bin/Makefile.in
src/bin/image_data_argb.c
src/bin/image_data_argb_alpha.c
src/bin/main.c
src/bin/tests.h
src/bin/textblock_auto_align.c [new file with mode: 0644]
src/bin/ui.c
src/bin/widgets_file_icons_2_grouped.c [new file with mode: 0644]
src/bin/widgets_file_icons_2_same.c [new file with mode: 0644]
src/bin/widgets_file_icons_2_same_grouped.c [new file with mode: 0644]
src/bin/widgets_list_1.c [new file with mode: 0644]
src/bin/widgets_list_1_grouped.c [new file with mode: 0644]
src/bin/widgets_list_2.c [new file with mode: 0644]
src/bin/widgets_list_2_grouped.c [new file with mode: 0644]
src/bin/widgets_list_3.c [new file with mode: 0644]
src/bin/widgets_list_3_grouped.c [new file with mode: 0644]
src/bin/widgets_list_4.c [new file with mode: 0644]
src/bin/widgets_list_4_grouped.c [new file with mode: 0644]

old mode 100755 (executable)
new mode 100644 (file)
index 053e738..87a1ee4
@@ -1,10 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2008-09-08'
+timestamp='2005-04-22'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -22,15 +21,14 @@ timestamp='2008-09-08'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -72,8 +70,8 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -85,11 +83,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )        # Use stdin as input.
@@ -101,7 +99,7 @@ while test $# -gt 0 ; do
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit ;;
+       exit 0;;
 
     * )
        break ;;
@@ -120,9 +118,8 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -173,10 +170,6 @@ case $os in
        -hiux*)
                os=-hiuxwe2
                ;;
-       -sco6)
-               os=-sco5v6
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
        -sco5)
                os=-sco3.2v5
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -193,10 +186,6 @@ case $os in
                # Don't forget version if it is 3.2v4 or newer.
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
                ;;
-       -sco5v6*)
-               # Don't forget version if it is 3.2v4 or newer.
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
        -sco*)
                os=-sco3.2v2
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -241,27 +230,23 @@ case $basic_machine in
        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
        | am33_2.0 \
-       | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+       | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
        | bfin \
        | c4x | clipper \
        | d10v | d30v | dlx | dsp16xx \
-       | fido | fr30 | frv \
+       | fr30 | frv \
        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
        | i370 | i860 | i960 | ia64 \
        | ip2k | iq2000 \
-       | m32c | m32r | m32rle | m68000 | m68k | m88k \
-       | maxq | mb | microblaze | mcore | mep | metag \
+       | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
        | mips | mipsbe | mipseb | mipsel | mipsle \
        | mips16 \
        | mips64 | mips64el \
-       | mips64octeon | mips64octeonel \
-       | mips64orion | mips64orionel \
-       | mips64r5900 | mips64r5900el \
        | mips64vr | mips64vrel \
+       | mips64orion | mips64orionel \
        | mips64vr4100 | mips64vr4100el \
        | mips64vr4300 | mips64vr4300el \
        | mips64vr5000 | mips64vr5000el \
-       | mips64vr5900 | mips64vr5900el \
        | mipsisa32 | mipsisa32el \
        | mipsisa32r2 | mipsisa32r2el \
        | mipsisa64 | mipsisa64el \
@@ -270,25 +255,22 @@ case $basic_machine in
        | mipsisa64sr71k | mipsisa64sr71kel \
        | mipstx39 | mipstx39el \
        | mn10200 | mn10300 \
-       | mt \
        | msp430 \
-       | nios | nios2 \
        | ns16k | ns32k \
-       | or32 \
+       | openrisc | or32 \
        | pdp10 | pdp11 | pj | pjl \
        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
        | pyramid \
-       | score \
-       | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+       | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
        | sh64 | sh64le \
-       | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-       | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-       | spu | strongarm \
+       | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+       | sparcv8 | sparcv9 | sparcv9b \
+       | strongarm \
        | tahoe | thumb | tic4x | tic80 | tron \
        | v850 | v850e \
        | we32k \
-       | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-       | z8k | z80)
+       | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+       | z8k)
                basic_machine=$basic_machine-unknown
                ;;
        m6811 | m68hc11 | m6812 | m68hc12)
@@ -298,9 +280,6 @@ case $basic_machine in
                ;;
        m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
                ;;
-       ms1)
-               basic_machine=mt-unknown
-               ;;
 
        # We use `pc' rather than `unknown'
        # because (1) that's what they normally are, and
@@ -320,31 +299,28 @@ case $basic_machine in
        | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
        | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-       | avr-* | avr32-* \
+       | avr-* \
        | bfin-* | bs2000-* \
        | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
        | clipper-* | craynv-* | cydra-* \
        | d10v-* | d30v-* | dlx-* \
        | elxsi-* \
-       | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+       | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
        | h8300-* | h8500-* \
        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
        | i*86-* | i860-* | i960-* | ia64-* \
        | ip2k-* | iq2000-* \
-       | m32c-* | m32r-* | m32rle-* \
+       | m32r-* | m32rle-* \
        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-       | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+       | m88110-* | m88k-* | maxq-* | mcore-* \
        | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
        | mips16-* \
        | mips64-* | mips64el-* \
-       | mips64octeon-* | mips64octeonel-* \
-       | mips64orion-* | mips64orionel-* \
-       | mips64r5900-* | mips64r5900el-* \
        | mips64vr-* | mips64vrel-* \
+       | mips64orion-* | mips64orionel-* \
        | mips64vr4100-* | mips64vr4100el-* \
        | mips64vr4300-* | mips64vr4300el-* \
        | mips64vr5000-* | mips64vr5000el-* \
-       | mips64vr5900-* | mips64vr5900el-* \
        | mipsisa32-* | mipsisa32el-* \
        | mipsisa32r2-* | mipsisa32r2el-* \
        | mipsisa64-* | mipsisa64el-* \
@@ -353,33 +329,27 @@ case $basic_machine in
        | mipsisa64sr71k-* | mipsisa64sr71kel-* \
        | mipstx39-* | mipstx39el-* \
        | mmix-* \
-       | mt-* \
        | msp430-* \
-       | nios-* | nios2-* \
        | none-* | np1-* | ns16k-* | ns32k-* \
        | orion-* \
        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
        | pyramid-* \
        | romp-* | rs6000-* \
-       | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+       | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-       | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+       | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
        | sparclite-* \
-       | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+       | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
        | tahoe-* | thumb-* \
-       | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+       | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
        | tron-* \
        | v850-* | v850e-* | vax-* \
        | we32k-* \
-       | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-       | xstormy16-* | xtensa*-* \
+       | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+       | xstormy16-* | xtensa-* \
        | ymp-* \
-       | z8k-* | z80-*)
-               ;;
-       # Recognize the basic CPU types without company name, with glob match.
-       xtensa*)
-               basic_machine=$basic_machine-unknown
+       | z8k-*)
                ;;
        # Recognize the various machine names and aliases which stand
        # for a CPU type and a company and sometimes even an OS.
@@ -451,22 +421,10 @@ case $basic_machine in
                basic_machine=ns32k-sequent
                os=-dynix
                ;;
-       blackfin)
-               basic_machine=bfin-unknown
-               os=-linux
-               ;;
-       blackfin-*)
-               basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-               os=-linux
-               ;;
        c90)
                basic_machine=c90-cray
                os=-unicos
                ;;
-        cegcc)
-               basic_machine=arm-unknown
-               os=-cegcc
-               ;;
        convex-c1)
                basic_machine=c1-convex
                os=-bsd
@@ -495,8 +453,8 @@ case $basic_machine in
                basic_machine=craynv-cray
                os=-unicosmp
                ;;
-       cr16)
-               basic_machine=cr16-unknown
+       cr16c)
+               basic_machine=cr16c-unknown
                os=-elf
                ;;
        crds | unos)
@@ -534,10 +492,6 @@ case $basic_machine in
                basic_machine=m88k-motorola
                os=-sysv3
                ;;
-       dicos)
-               basic_machine=i686-pc
-               os=-dicos
-               ;;
        djgpp)
                basic_machine=i586-pc
                os=-msdosdjgpp
@@ -692,14 +646,6 @@ case $basic_machine in
                basic_machine=m68k-isi
                os=-sysv
                ;;
-       m68knommu)
-               basic_machine=m68k-unknown
-               os=-linux
-               ;;
-       m68knommu-*)
-               basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-               os=-linux
-               ;;
        m88k-omron*)
                basic_machine=m88k-omron
                ;;
@@ -715,10 +661,6 @@ case $basic_machine in
                basic_machine=i386-pc
                os=-mingw32
                ;;
-       mingw32ce)
-               basic_machine=arm-unknown
-               os=-mingw32ce
-               ;;
        miniframe)
                basic_machine=m68000-convergent
                ;;
@@ -744,9 +686,6 @@ case $basic_machine in
                basic_machine=i386-pc
                os=-msdos
                ;;
-       ms1-*)
-               basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-               ;;
        mvs)
                basic_machine=i370-ibm
                os=-mvs
@@ -822,8 +761,9 @@ case $basic_machine in
                basic_machine=hppa1.1-oki
                os=-proelf
                ;;
-       openrisc | openrisc-*)
+       or32 | or32-*)
                basic_machine=or32-unknown
+               os=-coff
                ;;
        os400)
                basic_machine=powerpc-ibm
@@ -845,14 +785,6 @@ case $basic_machine in
                basic_machine=i860-intel
                os=-osf
                ;;
-       parisc)
-               basic_machine=hppa-unknown
-               os=-linux
-               ;;
-       parisc-*)
-               basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-               os=-linux
-               ;;
        pbd)
                basic_machine=sparc-tti
                ;;
@@ -862,12 +794,6 @@ case $basic_machine in
        pc532 | pc532-*)
                basic_machine=ns32k-pc532
                ;;
-       pc98)
-               basic_machine=i386-pc
-               ;;
-       pc98-*)
-               basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
        pentium | p5 | k5 | k6 | nexgen | viac3)
                basic_machine=i586-pc
                ;;
@@ -924,10 +850,6 @@ case $basic_machine in
                basic_machine=i586-unknown
                os=-pw32
                ;;
-       rdos)
-               basic_machine=i386-pc
-               os=-rdos
-               ;;
        rom68k)
                basic_machine=m68k-rom68k
                os=-coff
@@ -954,10 +876,6 @@ case $basic_machine in
        sb1el)
                basic_machine=mipsisa64sb1el-unknown
                ;;
-       sde)
-               basic_machine=mipsisa32-sde
-               os=-elf
-               ;;
        sei)
                basic_machine=mips-sei
                os=-seiux
@@ -969,9 +887,6 @@ case $basic_machine in
                basic_machine=sh-hitachi
                os=-hms
                ;;
-       sh5el)
-               basic_machine=sh5le-unknown
-               ;;
        sh64)
                basic_machine=sh64-unknown
                ;;
@@ -1061,10 +976,6 @@ case $basic_machine in
                basic_machine=tic6x-unknown
                os=-coff
                ;;
-       tile*)
-               basic_machine=tile-unknown
-               os=-linux-gnu
-               ;;
        tx39)
                basic_machine=mipstx39-unknown
                ;;
@@ -1140,10 +1051,6 @@ case $basic_machine in
                basic_machine=z8k-unknown
                os=-sim
                ;;
-       z80-*-coff)
-               basic_machine=z80-unknown
-               os=-sim
-               ;;
        none)
                basic_machine=none-none
                os=-none
@@ -1182,10 +1089,13 @@ case $basic_machine in
        we32k)
                basic_machine=we32k-att
                ;;
-       sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+       sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
                basic_machine=sh-unknown
                ;;
-       sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+       sh64)
+               basic_machine=sh64-unknown
+               ;;
+       sparc | sparcv8 | sparcv9 | sparcv9b)
                basic_machine=sparc-sun
                ;;
        cydra)
@@ -1258,23 +1168,20 @@ case $os in
              | -aos* \
              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
              | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-             | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-             | -openbsd* | -solidbsd* \
+             | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
              | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
              | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-             | -chorusos* | -chorusrdb* | -cegcc* \
+             | -chorusos* | -chorusrdb* \
              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-             | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-             | -uxpv* | -beos* | -mpeix* | -udk* \
+             | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-             | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-             | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+             | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        -qnx*)
@@ -1292,7 +1199,7 @@ case $os in
                os=`echo $os | sed -e 's|nto|nto-qnx|'`
                ;;
        -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-             | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+             | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
              | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
                ;;
        -mac*)
@@ -1404,9 +1311,6 @@ case $os in
        -zvmoe)
                os=-zvmoe
                ;;
-       -dicos*)
-               os=-dicos
-               ;;
        -none)
                ;;
        *)
@@ -1429,12 +1333,6 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
-        score-*)
-               os=-elf
-               ;;
-        spu-*)
-               os=-elf
-               ;;
        *-acorn)
                os=-riscix1.2
                ;;
@@ -1444,9 +1342,9 @@ case $basic_machine in
        arm*-semi)
                os=-aout
                ;;
-        c4x-* | tic4x-*)
-               os=-coff
-               ;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
        # This must come before the *-dec entry.
        pdp10-*)
                os=-tops20
@@ -1472,9 +1370,6 @@ case $basic_machine in
        m68*-cisco)
                os=-aout
                ;;
-        mep-*)
-               os=-elf
-               ;;
        mips*-cisco)
                os=-elf
                ;;
@@ -1493,9 +1388,6 @@ case $basic_machine in
        *-be)
                os=-beos
                ;;
-       *-haiku)
-               os=-haiku
-               ;;
        *-ibm)
                os=-aix
                ;;
@@ -1667,7 +1559,7 @@ case $basic_machine in
 esac
 
 echo $basic_machine$os
-exit
+exit 0
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
index 0613fa7..537df0f 100755 (executable)
--- a/configure
+++ b/configure
@@ -2619,8 +2619,8 @@ echo "${ECHO_T}$want_software_x11" >&6; }
 
 if test "x$want_software_x11" = "xyes"; then
   if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-software-x11\"") >&5
-  ($PKG_CONFIG --exists --print-errors "evas-software-x11") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-software-x11 >= 1.0.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "evas-software-x11 >= 1.0.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
@@ -2718,8 +2718,8 @@ echo "${ECHO_T}$want_xrender_x11" >&6; }
 
 if test "x$want_xrender_x11" = "xyes"; then
   if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-xrender-x11\"") >&5
-  ($PKG_CONFIG --exists --print-errors "evas-xrender-x11") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-xrender-x11 >= 1.0.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "evas-xrender-x11 >= 1.0.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
@@ -2781,8 +2781,8 @@ echo "${ECHO_T}$want_opengl_x11" >&6; }
 
 if test "x$want_opengl_x11" = "xyes"; then
   if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-opengl-x11\"") >&5
-  ($PKG_CONFIG --exists --print-errors "evas-opengl-x11") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-opengl-x11 >= 1.0.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "evas-opengl-x11 >= 1.0.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
@@ -2844,8 +2844,8 @@ echo "${ECHO_T}$want_xrender_xcb" >&6; }
 
 if test "x$want_xrender_xcb" = "xyes"; then
   if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-xrender-xcb\"") >&5
-  ($PKG_CONFIG --exists --print-errors "evas-xrender-xcb") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-xrender-xcb >= 1.0.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "evas-xrender-xcb >= 1.0.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
@@ -2907,8 +2907,8 @@ echo "${ECHO_T}$want_software_gdi" >&6; }
 
 if test "x$want_software_gdi" = "xyes"; then
   if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-software-gdi\"") >&5
-  ($PKG_CONFIG --exists --print-errors "evas-software-gdi") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-software-gdi >= 1.0.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "evas-software-gdi >= 1.0.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
@@ -2971,8 +2971,8 @@ echo "${ECHO_T}$want_software_ddraw" >&6; }
 
 if test "x$want_software_ddraw" = "xyes"; then
   if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-software-ddraw\"") >&5
-  ($PKG_CONFIG --exists --print-errors "evas-software-ddraw") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-software-ddraw >= 1.0.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "evas-software-ddraw >= 1.0.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
@@ -3035,8 +3035,8 @@ echo "${ECHO_T}$want_direct3d" >&6; }
 
 if test "x$want_direct3d" = "xyes"; then
   if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-direct3d\"") >&5
-  ($PKG_CONFIG --exists --print-errors "evas-direct3d") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-direct3d >= 1.0.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "evas-direct3d >= 1.0.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
@@ -3099,8 +3099,8 @@ echo "${ECHO_T}$want_opengl_glew" >&6; }
 
 if test "x$want_opengl_glew" = "xyes"; then
   if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-opengl-glew\"") >&5
-  ($PKG_CONFIG --exists --print-errors "evas-opengl-glew") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-opengl-glew >= 1.0.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "evas-opengl-glew >= 1.0.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
@@ -3163,8 +3163,8 @@ echo "${ECHO_T}$want_software_sdl" >&6; }
 
 if test "x$want_software_sdl" = "xyes"; then
   if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-software-sdl\"") >&5
-  ($PKG_CONFIG --exists --print-errors "evas-software-sdl") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-software-sdl >= 1.0.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "evas-software-sdl >= 1.0.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
@@ -3226,8 +3226,8 @@ echo "${ECHO_T}$want_opengl_sdl" >&6; }
 
 if test "x$want_opengl_sdl" = "xyes"; then
   if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-opengl-sdl\"") >&5
-  ($PKG_CONFIG --exists --print-errors "evas-opengl-sdl") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-opengl-sdl >= 1.0.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "evas-opengl-sdl >= 1.0.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
@@ -3289,8 +3289,8 @@ echo "${ECHO_T}$want_fb" >&6; }
 
 if test "x$want_fb" = "xyes"; then
   if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-fb\"") >&5
-  ($PKG_CONFIG --exists --print-errors "evas-fb") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-fb >= 1.0.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "evas-fb >= 1.0.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
@@ -3352,8 +3352,8 @@ echo "${ECHO_T}$want_directfb" >&6; }
 
 if test "x$want_directfb" = "xyes"; then
   if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-directfb\"") >&5
-  ($PKG_CONFIG --exists --print-errors "evas-directfb") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-directfb >= 1.0.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "evas-directfb >= 1.0.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
@@ -3415,8 +3415,8 @@ echo "${ECHO_T}$want_quartz" >&6; }
 
 if test "x$want_quartz" = "xyes"; then
   if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-quartz\"") >&5
-  ($PKG_CONFIG --exists --print-errors "evas-quartz") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-quartz >= 1.0.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "evas-quartz >= 1.0.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
@@ -3479,8 +3479,8 @@ echo "${ECHO_T}$want_software_16_x11" >&6; }
 
 if test "x$want_software_16_x11" = "xyes"; then
   if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-software-16-x11\"") >&5
-  ($PKG_CONFIG --exists --print-errors "evas-software-16-x11") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-software-16-x11 >= 1.0.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "evas-software-16-x11 >= 1.0.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
@@ -3542,8 +3542,8 @@ echo "${ECHO_T}$want_software_16_ddraw" >&6; }
 
 if test "x$want_software_16_ddraw" = "xyes"; then
   if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-software-16-ddraw\"") >&5
-  ($PKG_CONFIG --exists --print-errors "evas-software-16-ddraw") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-software-16-ddraw >= 1.0.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "evas-software-16-ddraw >= 1.0.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
@@ -3606,8 +3606,8 @@ echo "${ECHO_T}$want_software_16_wince" >&6; }
 
 if test "x$want_software_16_wince" = "xyes"; then
   if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-software-16-wince\"") >&5
-  ($PKG_CONFIG --exists --print-errors "evas-software-16-wince") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas-software-16-wince >= 1.0.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "evas-software-16-wince >= 1.0.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
@@ -6895,12 +6895,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_EINA_CFLAGS="$EINA_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"eina-0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "eina-0") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"eina >= 1.0.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "eina >= 1.0.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_EINA_CFLAGS=`$PKG_CONFIG --cflags "eina-0" 2>/dev/null`
+  pkg_cv_EINA_CFLAGS=`$PKG_CONFIG --cflags "eina >= 1.0.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -6913,12 +6913,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_EINA_LIBS="$EINA_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"eina-0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "eina-0") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"eina >= 1.0.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "eina >= 1.0.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_EINA_LIBS=`$PKG_CONFIG --libs "eina-0" 2>/dev/null`
+  pkg_cv_EINA_LIBS=`$PKG_CONFIG --libs "eina >= 1.0.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -6937,14 +6937,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-               EINA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "eina-0"`
+               EINA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "eina >= 1.0.0"`
         else
-               EINA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "eina-0"`
+               EINA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "eina >= 1.0.0"`
         fi
        # Put the nasty error message in config.log where it belongs
        echo "$EINA_PKG_ERRORS" >&5
 
-       { { echo "$as_me:$LINENO: error: Package requirements (eina-0) were not met:
+       { { echo "$as_me:$LINENO: error: Package requirements (eina >= 1.0.0) were not met:
 
 $EINA_PKG_ERRORS
 
@@ -6955,7 +6955,7 @@ Alternatively, you may set the environment variables EINA_CFLAGS
 and EINA_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 " >&5
-echo "$as_me: error: Package requirements (eina-0) were not met:
+echo "$as_me: error: Package requirements (eina >= 1.0.0) were not met:
 
 $EINA_PKG_ERRORS
 
@@ -7009,12 +7009,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_EVAS_CFLAGS="$EVAS_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas eet\"") >&5
-  ($PKG_CONFIG --exists --print-errors "evas eet") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas >= 1.0.0 eet >= 1.4.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "evas >= 1.0.0 eet >= 1.4.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_EVAS_CFLAGS=`$PKG_CONFIG --cflags "evas eet" 2>/dev/null`
+  pkg_cv_EVAS_CFLAGS=`$PKG_CONFIG --cflags "evas >= 1.0.0 eet >= 1.4.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -7027,12 +7027,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_EVAS_LIBS="$EVAS_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas eet\"") >&5
-  ($PKG_CONFIG --exists --print-errors "evas eet") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evas >= 1.0.0 eet >= 1.4.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "evas >= 1.0.0 eet >= 1.4.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_EVAS_LIBS=`$PKG_CONFIG --libs "evas eet" 2>/dev/null`
+  pkg_cv_EVAS_LIBS=`$PKG_CONFIG --libs "evas >= 1.0.0 eet >= 1.4.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -7051,14 +7051,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-               EVAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "evas eet"`
+               EVAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "evas >= 1.0.0 eet >= 1.4.0"`
         else
-               EVAS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evas eet"`
+               EVAS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evas >= 1.0.0 eet >= 1.4.0"`
         fi
        # Put the nasty error message in config.log where it belongs
        echo "$EVAS_PKG_ERRORS" >&5
 
-       { { echo "$as_me:$LINENO: error: Package requirements (evas eet) were not met:
+       { { echo "$as_me:$LINENO: error: Package requirements (evas >= 1.0.0 eet >= 1.4.0) were not met:
 
 $EVAS_PKG_ERRORS
 
@@ -7069,7 +7069,7 @@ Alternatively, you may set the environment variables EVAS_CFLAGS
 and EVAS_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 " >&5
-echo "$as_me: error: Package requirements (evas eet) were not met:
+echo "$as_me: error: Package requirements (evas >= 1.0.0 eet >= 1.4.0) were not met:
 
 $EVAS_PKG_ERRORS
 
index 49c4499..39a254e 100644 (file)
@@ -131,11 +131,11 @@ esac
 
 # Eina
 
-PKG_CHECK_MODULES([EINA], eina-0)
+PKG_CHECK_MODULES([EINA], eina >= 1.0.0)
 
 # Evas
 
-PKG_CHECK_MODULES([EVAS], evas eet)
+PKG_CHECK_MODULES([EVAS], evas >= 1.0.0 eet >= 1.4.0)
 
 # Xlib
 
diff --git a/debian/SVN_REV b/debian/SVN_REV
new file mode 100644 (file)
index 0000000..f801233
--- /dev/null
@@ -0,0 +1,2 @@
+Revision 51480
+Last Changed Rev 51381
diff --git a/debian/_original/changelog b/debian/_original/changelog
new file mode 100644 (file)
index 0000000..27a0119
--- /dev/null
@@ -0,0 +1,5 @@
+expedite (0.6.0+svnYYYYMMDD-1) unstable; urgency=low
+
+  * a SVN release.
+
+ -- quaker <quaker66@gmail.com>  Sat, 27 Dec 2008 14:48:46 +0100
diff --git a/debian/_original/compat b/debian/_original/compat
new file mode 100644 (file)
index 0000000..1e8b314
--- /dev/null
@@ -0,0 +1 @@
+6
diff --git a/debian/_original/control b/debian/_original/control
new file mode 100644 (file)
index 0000000..f2e18ea
--- /dev/null
@@ -0,0 +1,14 @@
+Source: expedite
+Section: x11
+Priority: optional
+Maintainer: quaker <quaker66@gmail.com>
+Build-Depends: cdbs, debhelper (>= 6), libevas-dev, pkg-config, libtool, libxext-dev
+Standards-Version: 3.8.1
+Homepage: http://www.enlightenment.org
+
+Package: expedite
+Architecture: any
+Depends: ${shlibs:Depends}, libevas-svn-01, libevas-engines, libevas-engines-extras
+Description: Benchmarking suite for Evas
+ This is meant to be a detailed and comprehensive benchmark suite for Evas.
+
diff --git a/debian/_original/copyright b/debian/_original/copyright
new file mode 100644 (file)
index 0000000..3ca1156
--- /dev/null
@@ -0,0 +1,10 @@
+This package was debianized by quaker <quaker66@gmail.com> on
+Sat, 27 Dec 2008 14:48:46 +0100.
+
+Author(s): 
+ The Rasterman (Carsten Haitzler) <raster@rasterman.com>
+ Tim Horton <hortont424@gmail.com>
+
+License:
+ See the COPYING file
+
diff --git a/debian/_original/rules b/debian/_original/rules
new file mode 100755 (executable)
index 0000000..6acb8ff
--- /dev/null
@@ -0,0 +1,11 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
+DEB_CONFIGURE_SCRIPT := ./autogen.sh
+DEB_MAKE_CLEAN_TARGET := distclean
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-rpath
+
+clean::
+       [ ! -f Makefile ] || make distclean
index 001f397..3d983fb 100644 (file)
@@ -1,3 +1,11 @@
+expedite (1.0.0+svn.51480slp2+1) unstable; urgency=low
+
+  * EFL 1.0 alpha upgrade
+  * Git: 165.213.180.234:/git/slp/pkgs/expedite
+  * Tag: expedite_1.0.0+svn.51480slp2+1
+
+ -- Jaehwan Kim <jae.hwan.kim@samsung.com>  Thu, 02 Sep 2010 13:38:59 +0900
+
 expedite (0.6.0+svn.49170slp2+1) unstable; urgency=low
 
   * Git initialized.
index 9e5583e..c57f421 100644 (file)
@@ -10,7 +10,7 @@ Homepage: http://www.enlightenment.org
 
 Package: expedite
 Architecture: any
-Depends: ${shlibs:Depends}, libevas-svn-01, libevas-engines, libevas-engines-extras, libxrender1
+Depends: ${shlibs:Depends}, libevas, libevas-engines, libevas-engines-extras, libxrender1
 Description: Benchmarking suite for Evas
  This is meant to be a detailed and comprehensive benchmark suite for Evas.
 
old mode 100755 (executable)
new mode 100644 (file)
index 174e492..c8485ab
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -4189,6 +4189,16 @@ func_mode_link ()
        arg=$func_stripname_result
        ;;
 
+      -Wl,--as-needed)
+       deplibs="$deplibs $arg"
+       continue
+       ;;
+
+      -Wl,--as-needed)
+       deplibs="$deplibs $arg"
+       continue
+       ;;
+
       -Wl,*)
        func_stripname '-Wl,' '' "$arg"
        args=$func_stripname_result
@@ -4540,6 +4550,15 @@ func_mode_link ()
        lib=
        found=no
        case $deplib in
+       -Wl,--as-needed)
+         if test "$linkmode,$pass" = "prog,link"; then
+           compile_deplibs="$deplib $compile_deplibs"
+           finalize_deplibs="$deplib $finalize_deplibs"
+         else
+           deplibs="$deplib $deplibs"
+         fi
+         continue
+         ;;
        -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
          if test "$linkmode,$pass" = "prog,link"; then
            compile_deplibs="$deplib $compile_deplibs"
index 2909a0d..03ccdc4 100644 (file)
@@ -16,7 +16,7 @@ AC_MSG_CHECKING([whether $2 engine is to be built])
 AC_MSG_RESULT($want_[]DOWN)
 
 if test "x$want_[]DOWN" = "xyes"; then
-  PKG_CHECK_EXISTS([evas-$1],
+  PKG_CHECK_EXISTS([evas-$1 >= 1.0.0],
     [
       AC_DEFINE(HAVE_EVAS_[]UP, 1, [Evas $2 Engine Support])
       have_[]DOWN="yes"
index 8589917..4611b51 100644 (file)
@@ -24,8 +24,19 @@ about.c about.h \
 tests.h \
 widgets_file_icons.c \
 widgets_file_icons_2.c \
+widgets_file_icons_2_grouped.c \
+widgets_file_icons_2_same.c \
+widgets_file_icons_2_same_grouped.c \
 widgets_file_icons_3.c \
 widgets_file_icons_4.c \
+widgets_list_1.c \
+widgets_list_1_grouped.c \
+widgets_list_2.c \
+widgets_list_2_grouped.c \
+widgets_list_3.c \
+widgets_list_3_grouped.c \
+widgets_list_4.c \
+widgets_list_4_grouped.c \
 image_blend_unscaled.c \
 image_blend_solid_middle_unscaled.c \
 image_blend_fade_unscaled.c \
@@ -76,6 +87,7 @@ text_styles_different_strings.c \
 text_change.c \
 textblock_basic.c \
 textblock_intl.c \
+textblock_auto_align.c \
 rect_blend.c \
 rect_blend_pow2.c \
 rect_solid.c \
index 6712f54..041ef0c 100644 (file)
@@ -100,8 +100,14 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am__expedite_SOURCES_DIST = main.c main.h ui.c ui.h about.c about.h \
        tests.h widgets_file_icons.c widgets_file_icons_2.c \
-       widgets_file_icons_3.c widgets_file_icons_4.c \
-       image_blend_unscaled.c image_blend_solid_middle_unscaled.c \
+       widgets_file_icons_2_grouped.c widgets_file_icons_2_same.c \
+       widgets_file_icons_2_same_grouped.c widgets_file_icons_3.c \
+       widgets_file_icons_4.c widgets_list_1.c \
+       widgets_list_1_grouped.c widgets_list_2.c \
+       widgets_list_2_grouped.c widgets_list_3.c \
+       widgets_list_3_grouped.c widgets_list_4.c \
+       widgets_list_4_grouped.c image_blend_unscaled.c \
+       image_blend_solid_middle_unscaled.c \
        image_blend_fade_unscaled.c image_blend_fade_pow2_unscaled.c \
        image_blend_solid_unscaled.c image_blend_solid_fade_unscaled.c \
        image_blend_solid_fade_pow2_unscaled.c \
@@ -129,14 +135,15 @@ am__expedite_SOURCES_DIST = main.c main.h ui.c ui.h about.c about.h \
        image_data_argb_alpha.c image_data_ycbcr601pl.c \
        image_data_ycbcr601pl_wide_stride.c image_crossfade.c \
        text_basic.c text_styles.c text_styles_different_strings.c \
-       text_change.c textblock_basic.c textblock_intl.c rect_blend.c \
-       rect_blend_pow2.c rect_solid.c rect_blend_few.c \
-       rect_blend_pow2_few.c rect_solid_few.c \
-       image_blend_occlude1_few.c image_blend_occlude2_few.c \
-       image_blend_occlude3_few.c image_blend_occlude1.c \
-       image_blend_occlude2.c image_blend_occlude3.c \
-       image_blend_occlude1_many.c image_blend_occlude2_many.c \
-       image_blend_occlude3_many.c image_blend_occlude1_very_many.c \
+       text_change.c textblock_basic.c textblock_intl.c \
+       textblock_auto_align.c rect_blend.c rect_blend_pow2.c \
+       rect_solid.c rect_blend_few.c rect_blend_pow2_few.c \
+       rect_solid_few.c image_blend_occlude1_few.c \
+       image_blend_occlude2_few.c image_blend_occlude3_few.c \
+       image_blend_occlude1.c image_blend_occlude2.c \
+       image_blend_occlude3.c image_blend_occlude1_many.c \
+       image_blend_occlude2_many.c image_blend_occlude3_many.c \
+       image_blend_occlude1_very_many.c \
        image_blend_occlude2_very_many.c \
        image_blend_occlude3_very_many.c poly_blend.c \
        engine_software_xlib.c engine_software_xlib.h \
@@ -180,8 +187,19 @@ am__expedite_SOURCES_DIST = main.c main.h ui.c ui.h about.c about.h \
 am_expedite_OBJECTS = expedite-main.$(OBJEXT) expedite-ui.$(OBJEXT) \
        expedite-about.$(OBJEXT) expedite-widgets_file_icons.$(OBJEXT) \
        expedite-widgets_file_icons_2.$(OBJEXT) \
+       expedite-widgets_file_icons_2_grouped.$(OBJEXT) \
+       expedite-widgets_file_icons_2_same.$(OBJEXT) \
+       expedite-widgets_file_icons_2_same_grouped.$(OBJEXT) \
        expedite-widgets_file_icons_3.$(OBJEXT) \
        expedite-widgets_file_icons_4.$(OBJEXT) \
+       expedite-widgets_list_1.$(OBJEXT) \
+       expedite-widgets_list_1_grouped.$(OBJEXT) \
+       expedite-widgets_list_2.$(OBJEXT) \
+       expedite-widgets_list_2_grouped.$(OBJEXT) \
+       expedite-widgets_list_3.$(OBJEXT) \
+       expedite-widgets_list_3_grouped.$(OBJEXT) \
+       expedite-widgets_list_4.$(OBJEXT) \
+       expedite-widgets_list_4_grouped.$(OBJEXT) \
        expedite-image_blend_unscaled.$(OBJEXT) \
        expedite-image_blend_solid_middle_unscaled.$(OBJEXT) \
        expedite-image_blend_fade_unscaled.$(OBJEXT) \
@@ -231,6 +249,7 @@ am_expedite_OBJECTS = expedite-main.$(OBJEXT) expedite-ui.$(OBJEXT) \
        expedite-text_change.$(OBJEXT) \
        expedite-textblock_basic.$(OBJEXT) \
        expedite-textblock_intl.$(OBJEXT) \
+       expedite-textblock_auto_align.$(OBJEXT) \
        expedite-rect_blend.$(OBJEXT) \
        expedite-rect_blend_pow2.$(OBJEXT) \
        expedite-rect_solid.$(OBJEXT) \
@@ -433,8 +452,14 @@ AM_CPPFLAGS = \
 bin_SCRIPTS = expedite-cmp
 expedite_SOURCES = main.c main.h ui.c ui.h about.c about.h tests.h \
        widgets_file_icons.c widgets_file_icons_2.c \
-       widgets_file_icons_3.c widgets_file_icons_4.c \
-       image_blend_unscaled.c image_blend_solid_middle_unscaled.c \
+       widgets_file_icons_2_grouped.c widgets_file_icons_2_same.c \
+       widgets_file_icons_2_same_grouped.c widgets_file_icons_3.c \
+       widgets_file_icons_4.c widgets_list_1.c \
+       widgets_list_1_grouped.c widgets_list_2.c \
+       widgets_list_2_grouped.c widgets_list_3.c \
+       widgets_list_3_grouped.c widgets_list_4.c \
+       widgets_list_4_grouped.c image_blend_unscaled.c \
+       image_blend_solid_middle_unscaled.c \
        image_blend_fade_unscaled.c image_blend_fade_pow2_unscaled.c \
        image_blend_solid_unscaled.c image_blend_solid_fade_unscaled.c \
        image_blend_solid_fade_pow2_unscaled.c \
@@ -462,14 +487,15 @@ expedite_SOURCES = main.c main.h ui.c ui.h about.c about.h tests.h \
        image_data_argb_alpha.c image_data_ycbcr601pl.c \
        image_data_ycbcr601pl_wide_stride.c image_crossfade.c \
        text_basic.c text_styles.c text_styles_different_strings.c \
-       text_change.c textblock_basic.c textblock_intl.c rect_blend.c \
-       rect_blend_pow2.c rect_solid.c rect_blend_few.c \
-       rect_blend_pow2_few.c rect_solid_few.c \
-       image_blend_occlude1_few.c image_blend_occlude2_few.c \
-       image_blend_occlude3_few.c image_blend_occlude1.c \
-       image_blend_occlude2.c image_blend_occlude3.c \
-       image_blend_occlude1_many.c image_blend_occlude2_many.c \
-       image_blend_occlude3_many.c image_blend_occlude1_very_many.c \
+       text_change.c textblock_basic.c textblock_intl.c \
+       textblock_auto_align.c rect_blend.c rect_blend_pow2.c \
+       rect_solid.c rect_blend_few.c rect_blend_pow2_few.c \
+       rect_solid_few.c image_blend_occlude1_few.c \
+       image_blend_occlude2_few.c image_blend_occlude3_few.c \
+       image_blend_occlude1.c image_blend_occlude2.c \
+       image_blend_occlude3.c image_blend_occlude1_many.c \
+       image_blend_occlude2_many.c image_blend_occlude3_many.c \
+       image_blend_occlude1_very_many.c \
        image_blend_occlude2_very_many.c \
        image_blend_occlude3_very_many.c poly_blend.c $(am__append_1) \
        $(am__append_2) $(am__append_3) $(am__append_4) \
@@ -654,13 +680,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expedite-text_change.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expedite-text_styles.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expedite-text_styles_different_strings.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expedite-textblock_auto_align.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expedite-textblock_basic.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expedite-textblock_intl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expedite-ui.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expedite-widgets_file_icons.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expedite-widgets_file_icons_2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expedite-widgets_file_icons_2_grouped.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expedite-widgets_file_icons_2_same.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expedite-widgets_file_icons_2_same_grouped.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expedite-widgets_file_icons_3.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expedite-widgets_file_icons_4.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expedite-widgets_list_1.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expedite-widgets_list_1_grouped.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expedite-widgets_list_2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expedite-widgets_list_2_grouped.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expedite-widgets_list_3.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expedite-widgets_list_3_grouped.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expedite-widgets_list_4.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expedite-widgets_list_4_grouped.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -746,6 +784,48 @@ expedite-widgets_file_icons_2.obj: widgets_file_icons_2.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -c -o expedite-widgets_file_icons_2.obj `if test -f 'widgets_file_icons_2.c'; then $(CYGPATH_W) 'widgets_file_icons_2.c'; else $(CYGPATH_W) '$(srcdir)/widgets_file_icons_2.c'; fi`
 
+expedite-widgets_file_icons_2_grouped.o: widgets_file_icons_2_grouped.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -MT expedite-widgets_file_icons_2_grouped.o -MD -MP -MF $(DEPDIR)/expedite-widgets_file_icons_2_grouped.Tpo -c -o expedite-widgets_file_icons_2_grouped.o `test -f 'widgets_file_icons_2_grouped.c' || echo '$(srcdir)/'`widgets_file_icons_2_grouped.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/expedite-widgets_file_icons_2_grouped.Tpo $(DEPDIR)/expedite-widgets_file_icons_2_grouped.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='widgets_file_icons_2_grouped.c' object='expedite-widgets_file_icons_2_grouped.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -c -o expedite-widgets_file_icons_2_grouped.o `test -f 'widgets_file_icons_2_grouped.c' || echo '$(srcdir)/'`widgets_file_icons_2_grouped.c
+
+expedite-widgets_file_icons_2_grouped.obj: widgets_file_icons_2_grouped.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -MT expedite-widgets_file_icons_2_grouped.obj -MD -MP -MF $(DEPDIR)/expedite-widgets_file_icons_2_grouped.Tpo -c -o expedite-widgets_file_icons_2_grouped.obj `if test -f 'widgets_file_icons_2_grouped.c'; then $(CYGPATH_W) 'widgets_file_icons_2_grouped.c'; else $(CYGPATH_W) '$(srcdir)/widgets_file_icons_2_grouped.c'; fi`
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/expedite-widgets_file_icons_2_grouped.Tpo $(DEPDIR)/expedite-widgets_file_icons_2_grouped.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='widgets_file_icons_2_grouped.c' object='expedite-widgets_file_icons_2_grouped.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -c -o expedite-widgets_file_icons_2_grouped.obj `if test -f 'widgets_file_icons_2_grouped.c'; then $(CYGPATH_W) 'widgets_file_icons_2_grouped.c'; else $(CYGPATH_W) '$(srcdir)/widgets_file_icons_2_grouped.c'; fi`
+
+expedite-widgets_file_icons_2_same.o: widgets_file_icons_2_same.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -MT expedite-widgets_file_icons_2_same.o -MD -MP -MF $(DEPDIR)/expedite-widgets_file_icons_2_same.Tpo -c -o expedite-widgets_file_icons_2_same.o `test -f 'widgets_file_icons_2_same.c' || echo '$(srcdir)/'`widgets_file_icons_2_same.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/expedite-widgets_file_icons_2_same.Tpo $(DEPDIR)/expedite-widgets_file_icons_2_same.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='widgets_file_icons_2_same.c' object='expedite-widgets_file_icons_2_same.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -c -o expedite-widgets_file_icons_2_same.o `test -f 'widgets_file_icons_2_same.c' || echo '$(srcdir)/'`widgets_file_icons_2_same.c
+
+expedite-widgets_file_icons_2_same.obj: widgets_file_icons_2_same.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -MT expedite-widgets_file_icons_2_same.obj -MD -MP -MF $(DEPDIR)/expedite-widgets_file_icons_2_same.Tpo -c -o expedite-widgets_file_icons_2_same.obj `if test -f 'widgets_file_icons_2_same.c'; then $(CYGPATH_W) 'widgets_file_icons_2_same.c'; else $(CYGPATH_W) '$(srcdir)/widgets_file_icons_2_same.c'; fi`
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/expedite-widgets_file_icons_2_same.Tpo $(DEPDIR)/expedite-widgets_file_icons_2_same.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='widgets_file_icons_2_same.c' object='expedite-widgets_file_icons_2_same.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -c -o expedite-widgets_file_icons_2_same.obj `if test -f 'widgets_file_icons_2_same.c'; then $(CYGPATH_W) 'widgets_file_icons_2_same.c'; else $(CYGPATH_W) '$(srcdir)/widgets_file_icons_2_same.c'; fi`
+
+expedite-widgets_file_icons_2_same_grouped.o: widgets_file_icons_2_same_grouped.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -MT expedite-widgets_file_icons_2_same_grouped.o -MD -MP -MF $(DEPDIR)/expedite-widgets_file_icons_2_same_grouped.Tpo -c -o expedite-widgets_file_icons_2_same_grouped.o `test -f 'widgets_file_icons_2_same_grouped.c' || echo '$(srcdir)/'`widgets_file_icons_2_same_grouped.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/expedite-widgets_file_icons_2_same_grouped.Tpo $(DEPDIR)/expedite-widgets_file_icons_2_same_grouped.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='widgets_file_icons_2_same_grouped.c' object='expedite-widgets_file_icons_2_same_grouped.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -c -o expedite-widgets_file_icons_2_same_grouped.o `test -f 'widgets_file_icons_2_same_grouped.c' || echo '$(srcdir)/'`widgets_file_icons_2_same_grouped.c
+
+expedite-widgets_file_icons_2_same_grouped.obj: widgets_file_icons_2_same_grouped.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -MT expedite-widgets_file_icons_2_same_grouped.obj -MD -MP -MF $(DEPDIR)/expedite-widgets_file_icons_2_same_grouped.Tpo -c -o expedite-widgets_file_icons_2_same_grouped.obj `if test -f 'widgets_file_icons_2_same_grouped.c'; then $(CYGPATH_W) 'widgets_file_icons_2_same_grouped.c'; else $(CYGPATH_W) '$(srcdir)/widgets_file_icons_2_same_grouped.c'; fi`
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/expedite-widgets_file_icons_2_same_grouped.Tpo $(DEPDIR)/expedite-widgets_file_icons_2_same_grouped.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='widgets_file_icons_2_same_grouped.c' object='expedite-widgets_file_icons_2_same_grouped.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -c -o expedite-widgets_file_icons_2_same_grouped.obj `if test -f 'widgets_file_icons_2_same_grouped.c'; then $(CYGPATH_W) 'widgets_file_icons_2_same_grouped.c'; else $(CYGPATH_W) '$(srcdir)/widgets_file_icons_2_same_grouped.c'; fi`
+
 expedite-widgets_file_icons_3.o: widgets_file_icons_3.c
 @am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -MT expedite-widgets_file_icons_3.o -MD -MP -MF $(DEPDIR)/expedite-widgets_file_icons_3.Tpo -c -o expedite-widgets_file_icons_3.o `test -f 'widgets_file_icons_3.c' || echo '$(srcdir)/'`widgets_file_icons_3.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/expedite-widgets_file_icons_3.Tpo $(DEPDIR)/expedite-widgets_file_icons_3.Po
@@ -774,6 +854,118 @@ expedite-widgets_file_icons_4.obj: widgets_file_icons_4.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -c -o expedite-widgets_file_icons_4.obj `if test -f 'widgets_file_icons_4.c'; then $(CYGPATH_W) 'widgets_file_icons_4.c'; else $(CYGPATH_W) '$(srcdir)/widgets_file_icons_4.c'; fi`
 
+expedite-widgets_list_1.o: widgets_list_1.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -MT expedite-widgets_list_1.o -MD -MP -MF $(DEPDIR)/expedite-widgets_list_1.Tpo -c -o expedite-widgets_list_1.o `test -f 'widgets_list_1.c' || echo '$(srcdir)/'`widgets_list_1.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/expedite-widgets_list_1.Tpo $(DEPDIR)/expedite-widgets_list_1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='widgets_list_1.c' object='expedite-widgets_list_1.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -c -o expedite-widgets_list_1.o `test -f 'widgets_list_1.c' || echo '$(srcdir)/'`widgets_list_1.c
+
+expedite-widgets_list_1.obj: widgets_list_1.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -MT expedite-widgets_list_1.obj -MD -MP -MF $(DEPDIR)/expedite-widgets_list_1.Tpo -c -o expedite-widgets_list_1.obj `if test -f 'widgets_list_1.c'; then $(CYGPATH_W) 'widgets_list_1.c'; else $(CYGPATH_W) '$(srcdir)/widgets_list_1.c'; fi`
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/expedite-widgets_list_1.Tpo $(DEPDIR)/expedite-widgets_list_1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='widgets_list_1.c' object='expedite-widgets_list_1.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -c -o expedite-widgets_list_1.obj `if test -f 'widgets_list_1.c'; then $(CYGPATH_W) 'widgets_list_1.c'; else $(CYGPATH_W) '$(srcdir)/widgets_list_1.c'; fi`
+
+expedite-widgets_list_1_grouped.o: widgets_list_1_grouped.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -MT expedite-widgets_list_1_grouped.o -MD -MP -MF $(DEPDIR)/expedite-widgets_list_1_grouped.Tpo -c -o expedite-widgets_list_1_grouped.o `test -f 'widgets_list_1_grouped.c' || echo '$(srcdir)/'`widgets_list_1_grouped.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/expedite-widgets_list_1_grouped.Tpo $(DEPDIR)/expedite-widgets_list_1_grouped.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='widgets_list_1_grouped.c' object='expedite-widgets_list_1_grouped.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -c -o expedite-widgets_list_1_grouped.o `test -f 'widgets_list_1_grouped.c' || echo '$(srcdir)/'`widgets_list_1_grouped.c
+
+expedite-widgets_list_1_grouped.obj: widgets_list_1_grouped.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -MT expedite-widgets_list_1_grouped.obj -MD -MP -MF $(DEPDIR)/expedite-widgets_list_1_grouped.Tpo -c -o expedite-widgets_list_1_grouped.obj `if test -f 'widgets_list_1_grouped.c'; then $(CYGPATH_W) 'widgets_list_1_grouped.c'; else $(CYGPATH_W) '$(srcdir)/widgets_list_1_grouped.c'; fi`
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/expedite-widgets_list_1_grouped.Tpo $(DEPDIR)/expedite-widgets_list_1_grouped.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='widgets_list_1_grouped.c' object='expedite-widgets_list_1_grouped.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -c -o expedite-widgets_list_1_grouped.obj `if test -f 'widgets_list_1_grouped.c'; then $(CYGPATH_W) 'widgets_list_1_grouped.c'; else $(CYGPATH_W) '$(srcdir)/widgets_list_1_grouped.c'; fi`
+
+expedite-widgets_list_2.o: widgets_list_2.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -MT expedite-widgets_list_2.o -MD -MP -MF $(DEPDIR)/expedite-widgets_list_2.Tpo -c -o expedite-widgets_list_2.o `test -f 'widgets_list_2.c' || echo '$(srcdir)/'`widgets_list_2.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/expedite-widgets_list_2.Tpo $(DEPDIR)/expedite-widgets_list_2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='widgets_list_2.c' object='expedite-widgets_list_2.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -c -o expedite-widgets_list_2.o `test -f 'widgets_list_2.c' || echo '$(srcdir)/'`widgets_list_2.c
+
+expedite-widgets_list_2.obj: widgets_list_2.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -MT expedite-widgets_list_2.obj -MD -MP -MF $(DEPDIR)/expedite-widgets_list_2.Tpo -c -o expedite-widgets_list_2.obj `if test -f 'widgets_list_2.c'; then $(CYGPATH_W) 'widgets_list_2.c'; else $(CYGPATH_W) '$(srcdir)/widgets_list_2.c'; fi`
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/expedite-widgets_list_2.Tpo $(DEPDIR)/expedite-widgets_list_2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='widgets_list_2.c' object='expedite-widgets_list_2.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -c -o expedite-widgets_list_2.obj `if test -f 'widgets_list_2.c'; then $(CYGPATH_W) 'widgets_list_2.c'; else $(CYGPATH_W) '$(srcdir)/widgets_list_2.c'; fi`
+
+expedite-widgets_list_2_grouped.o: widgets_list_2_grouped.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -MT expedite-widgets_list_2_grouped.o -MD -MP -MF $(DEPDIR)/expedite-widgets_list_2_grouped.Tpo -c -o expedite-widgets_list_2_grouped.o `test -f 'widgets_list_2_grouped.c' || echo '$(srcdir)/'`widgets_list_2_grouped.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/expedite-widgets_list_2_grouped.Tpo $(DEPDIR)/expedite-widgets_list_2_grouped.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='widgets_list_2_grouped.c' object='expedite-widgets_list_2_grouped.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -c -o expedite-widgets_list_2_grouped.o `test -f 'widgets_list_2_grouped.c' || echo '$(srcdir)/'`widgets_list_2_grouped.c
+
+expedite-widgets_list_2_grouped.obj: widgets_list_2_grouped.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -MT expedite-widgets_list_2_grouped.obj -MD -MP -MF $(DEPDIR)/expedite-widgets_list_2_grouped.Tpo -c -o expedite-widgets_list_2_grouped.obj `if test -f 'widgets_list_2_grouped.c'; then $(CYGPATH_W) 'widgets_list_2_grouped.c'; else $(CYGPATH_W) '$(srcdir)/widgets_list_2_grouped.c'; fi`
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/expedite-widgets_list_2_grouped.Tpo $(DEPDIR)/expedite-widgets_list_2_grouped.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='widgets_list_2_grouped.c' object='expedite-widgets_list_2_grouped.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -c -o expedite-widgets_list_2_grouped.obj `if test -f 'widgets_list_2_grouped.c'; then $(CYGPATH_W) 'widgets_list_2_grouped.c'; else $(CYGPATH_W) '$(srcdir)/widgets_list_2_grouped.c'; fi`
+
+expedite-widgets_list_3.o: widgets_list_3.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -MT expedite-widgets_list_3.o -MD -MP -MF $(DEPDIR)/expedite-widgets_list_3.Tpo -c -o expedite-widgets_list_3.o `test -f 'widgets_list_3.c' || echo '$(srcdir)/'`widgets_list_3.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/expedite-widgets_list_3.Tpo $(DEPDIR)/expedite-widgets_list_3.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='widgets_list_3.c' object='expedite-widgets_list_3.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -c -o expedite-widgets_list_3.o `test -f 'widgets_list_3.c' || echo '$(srcdir)/'`widgets_list_3.c
+
+expedite-widgets_list_3.obj: widgets_list_3.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -MT expedite-widgets_list_3.obj -MD -MP -MF $(DEPDIR)/expedite-widgets_list_3.Tpo -c -o expedite-widgets_list_3.obj `if test -f 'widgets_list_3.c'; then $(CYGPATH_W) 'widgets_list_3.c'; else $(CYGPATH_W) '$(srcdir)/widgets_list_3.c'; fi`
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/expedite-widgets_list_3.Tpo $(DEPDIR)/expedite-widgets_list_3.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='widgets_list_3.c' object='expedite-widgets_list_3.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -c -o expedite-widgets_list_3.obj `if test -f 'widgets_list_3.c'; then $(CYGPATH_W) 'widgets_list_3.c'; else $(CYGPATH_W) '$(srcdir)/widgets_list_3.c'; fi`
+
+expedite-widgets_list_3_grouped.o: widgets_list_3_grouped.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -MT expedite-widgets_list_3_grouped.o -MD -MP -MF $(DEPDIR)/expedite-widgets_list_3_grouped.Tpo -c -o expedite-widgets_list_3_grouped.o `test -f 'widgets_list_3_grouped.c' || echo '$(srcdir)/'`widgets_list_3_grouped.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/expedite-widgets_list_3_grouped.Tpo $(DEPDIR)/expedite-widgets_list_3_grouped.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='widgets_list_3_grouped.c' object='expedite-widgets_list_3_grouped.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -c -o expedite-widgets_list_3_grouped.o `test -f 'widgets_list_3_grouped.c' || echo '$(srcdir)/'`widgets_list_3_grouped.c
+
+expedite-widgets_list_3_grouped.obj: widgets_list_3_grouped.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -MT expedite-widgets_list_3_grouped.obj -MD -MP -MF $(DEPDIR)/expedite-widgets_list_3_grouped.Tpo -c -o expedite-widgets_list_3_grouped.obj `if test -f 'widgets_list_3_grouped.c'; then $(CYGPATH_W) 'widgets_list_3_grouped.c'; else $(CYGPATH_W) '$(srcdir)/widgets_list_3_grouped.c'; fi`
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/expedite-widgets_list_3_grouped.Tpo $(DEPDIR)/expedite-widgets_list_3_grouped.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='widgets_list_3_grouped.c' object='expedite-widgets_list_3_grouped.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -c -o expedite-widgets_list_3_grouped.obj `if test -f 'widgets_list_3_grouped.c'; then $(CYGPATH_W) 'widgets_list_3_grouped.c'; else $(CYGPATH_W) '$(srcdir)/widgets_list_3_grouped.c'; fi`
+
+expedite-widgets_list_4.o: widgets_list_4.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -MT expedite-widgets_list_4.o -MD -MP -MF $(DEPDIR)/expedite-widgets_list_4.Tpo -c -o expedite-widgets_list_4.o `test -f 'widgets_list_4.c' || echo '$(srcdir)/'`widgets_list_4.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/expedite-widgets_list_4.Tpo $(DEPDIR)/expedite-widgets_list_4.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='widgets_list_4.c' object='expedite-widgets_list_4.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -c -o expedite-widgets_list_4.o `test -f 'widgets_list_4.c' || echo '$(srcdir)/'`widgets_list_4.c
+
+expedite-widgets_list_4.obj: widgets_list_4.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -MT expedite-widgets_list_4.obj -MD -MP -MF $(DEPDIR)/expedite-widgets_list_4.Tpo -c -o expedite-widgets_list_4.obj `if test -f 'widgets_list_4.c'; then $(CYGPATH_W) 'widgets_list_4.c'; else $(CYGPATH_W) '$(srcdir)/widgets_list_4.c'; fi`
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/expedite-widgets_list_4.Tpo $(DEPDIR)/expedite-widgets_list_4.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='widgets_list_4.c' object='expedite-widgets_list_4.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -c -o expedite-widgets_list_4.obj `if test -f 'widgets_list_4.c'; then $(CYGPATH_W) 'widgets_list_4.c'; else $(CYGPATH_W) '$(srcdir)/widgets_list_4.c'; fi`
+
+expedite-widgets_list_4_grouped.o: widgets_list_4_grouped.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -MT expedite-widgets_list_4_grouped.o -MD -MP -MF $(DEPDIR)/expedite-widgets_list_4_grouped.Tpo -c -o expedite-widgets_list_4_grouped.o `test -f 'widgets_list_4_grouped.c' || echo '$(srcdir)/'`widgets_list_4_grouped.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/expedite-widgets_list_4_grouped.Tpo $(DEPDIR)/expedite-widgets_list_4_grouped.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='widgets_list_4_grouped.c' object='expedite-widgets_list_4_grouped.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -c -o expedite-widgets_list_4_grouped.o `test -f 'widgets_list_4_grouped.c' || echo '$(srcdir)/'`widgets_list_4_grouped.c
+
+expedite-widgets_list_4_grouped.obj: widgets_list_4_grouped.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -MT expedite-widgets_list_4_grouped.obj -MD -MP -MF $(DEPDIR)/expedite-widgets_list_4_grouped.Tpo -c -o expedite-widgets_list_4_grouped.obj `if test -f 'widgets_list_4_grouped.c'; then $(CYGPATH_W) 'widgets_list_4_grouped.c'; else $(CYGPATH_W) '$(srcdir)/widgets_list_4_grouped.c'; fi`
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/expedite-widgets_list_4_grouped.Tpo $(DEPDIR)/expedite-widgets_list_4_grouped.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='widgets_list_4_grouped.c' object='expedite-widgets_list_4_grouped.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -c -o expedite-widgets_list_4_grouped.obj `if test -f 'widgets_list_4_grouped.c'; then $(CYGPATH_W) 'widgets_list_4_grouped.c'; else $(CYGPATH_W) '$(srcdir)/widgets_list_4_grouped.c'; fi`
+
 expedite-image_blend_unscaled.o: image_blend_unscaled.c
 @am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -MT expedite-image_blend_unscaled.o -MD -MP -MF $(DEPDIR)/expedite-image_blend_unscaled.Tpo -c -o expedite-image_blend_unscaled.o `test -f 'image_blend_unscaled.c' || echo '$(srcdir)/'`image_blend_unscaled.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/expedite-image_blend_unscaled.Tpo $(DEPDIR)/expedite-image_blend_unscaled.Po
@@ -1474,6 +1666,20 @@ expedite-textblock_intl.obj: textblock_intl.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -c -o expedite-textblock_intl.obj `if test -f 'textblock_intl.c'; then $(CYGPATH_W) 'textblock_intl.c'; else $(CYGPATH_W) '$(srcdir)/textblock_intl.c'; fi`
 
+expedite-textblock_auto_align.o: textblock_auto_align.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -MT expedite-textblock_auto_align.o -MD -MP -MF $(DEPDIR)/expedite-textblock_auto_align.Tpo -c -o expedite-textblock_auto_align.o `test -f 'textblock_auto_align.c' || echo '$(srcdir)/'`textblock_auto_align.c
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/expedite-textblock_auto_align.Tpo $(DEPDIR)/expedite-textblock_auto_align.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='textblock_auto_align.c' object='expedite-textblock_auto_align.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -c -o expedite-textblock_auto_align.o `test -f 'textblock_auto_align.c' || echo '$(srcdir)/'`textblock_auto_align.c
+
+expedite-textblock_auto_align.obj: textblock_auto_align.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -MT expedite-textblock_auto_align.obj -MD -MP -MF $(DEPDIR)/expedite-textblock_auto_align.Tpo -c -o expedite-textblock_auto_align.obj `if test -f 'textblock_auto_align.c'; then $(CYGPATH_W) 'textblock_auto_align.c'; else $(CYGPATH_W) '$(srcdir)/textblock_auto_align.c'; fi`
+@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/expedite-textblock_auto_align.Tpo $(DEPDIR)/expedite-textblock_auto_align.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='textblock_auto_align.c' object='expedite-textblock_auto_align.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -c -o expedite-textblock_auto_align.obj `if test -f 'textblock_auto_align.c'; then $(CYGPATH_W) 'textblock_auto_align.c'; else $(CYGPATH_W) '$(srcdir)/textblock_auto_align.c'; fi`
+
 expedite-rect_blend.o: rect_blend.c
 @am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expedite_CFLAGS) $(CFLAGS) -MT expedite-rect_blend.o -MD -MP -MF $(DEPDIR)/expedite-rect_blend.Tpo -c -o expedite-rect_blend.o `test -f 'rect_blend.c' || echo '$(srcdir)/'`rect_blend.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/expedite-rect_blend.Tpo $(DEPDIR)/expedite-rect_blend.Po
index e008516..191ba24 100644 (file)
@@ -47,7 +47,7 @@ static void _cleanup(void)
 /* loop - do things */
 static void _loop(double t, int f)
 {
-   int i;
+   int i, st;
    Evas_Coord x, y, w, h;
    for (i = 0; i < 1; i++)
      {
@@ -61,6 +61,7 @@ static void _loop(double t, int f)
        evas_object_resize(o_images[i], w, h);
        evas_object_image_fill_set(o_images[i], 0, 0, w, h);
        data = evas_object_image_data_get(o_images[i], 1);
+        st = evas_object_image_stride_get(o_images[i]);
        p = data;
        ff = (f ^ (f << 8) ^ (f << 16) ^ (f << 24));
        for (y = 0; y < 480; y++)
@@ -70,6 +71,7 @@ static void _loop(double t, int f)
                  *p = ((((x * y) + f) << 8) ^ (x - y - f)) | 0xff000000;
                  p++;
               }
+             p += (st - w);
          }
        evas_object_image_data_set(o_images[i], data);
        evas_object_image_data_update_add(o_images[i], 0, 0, 640, 480);
index 00a1e63..0cdba76 100644 (file)
@@ -47,7 +47,7 @@ static void _cleanup(void)
 /* loop - do things */
 static void _loop(double t, int f)
 {
-   int i;
+   int i, st;
    Evas_Coord x, y, w, h;
    for (i = 0; i < 1; i++)
      {
@@ -61,6 +61,7 @@ static void _loop(double t, int f)
        evas_object_resize(o_images[i], w, h);
        evas_object_image_fill_set(o_images[i], 0, 0, w, h);
        data = evas_object_image_data_get(o_images[i], 1);
+        st = evas_object_image_stride_get(o_images[i]);
        p = data;
        ff = (f ^ (f << 8) ^ (f << 16) ^ (f << 24));
        for (y = 0; y < 480; y++)
@@ -81,6 +82,7 @@ static void _loop(double t, int f)
                  *p = (a << 24) | (r << 16) | (g << 8) | b;
                  p++;
               }
+             p += (st - w);
          }
        evas_object_image_data_set(o_images[i], data);
        evas_object_image_data_update_add(o_images[i], 0, 0, 640, 480);
index c3c4923..e972a06 100644 (file)
@@ -1,7 +1,9 @@
 #include "main.h"
 
 Evas *evas = NULL;
+const char *profile = "n800";
 int win_w = 720, win_h = 420;
+const char *engine = NULL;
 int loops = LOOPS;
 int fullscreen = 0;
 
@@ -1261,6 +1263,7 @@ _profile_parse(int argc, char **argv)
             for (j = 0; resolutions[j].name != NULL; ++j)
               if (!strcmp(argv[i], resolutions[j].name))
                 {
+                    profile = resolutions[j].name;
                    win_w = resolutions[j].width;
                    win_h = resolutions[j].height;
                    break;
@@ -1318,6 +1321,7 @@ _engine_args(int argc, char **argv)
          for (j = 0; engines[j].name != NULL; ++j)
            if (!strcmp(argv[i], engines[j].name))
              {
+                 engine = engines[j].name;
                 if (engines[j].init(engines[j].name, win_w, win_h))
                   {
                      loop_func = engines[j].loop;
index d854c0f..66e48b0 100644 (file)
@@ -1,7 +1,18 @@
 #include "widgets_file_icons.c"
 #include "widgets_file_icons_2.c"
+#include "widgets_file_icons_2_grouped.c"
+#include "widgets_file_icons_2_same.c"
+#include "widgets_file_icons_2_same_grouped.c"
 #include "widgets_file_icons_3.c"
 #include "widgets_file_icons_4.c"
+#include "widgets_list_1.c"
+#include "widgets_list_1_grouped.c"
+#include "widgets_list_2.c"
+#include "widgets_list_2_grouped.c"
+#include "widgets_list_3.c"
+#include "widgets_list_3_grouped.c"
+#include "widgets_list_4.c"
+#include "widgets_list_4_grouped.c"
 #include "image_blend_unscaled.c"
 #include "image_blend_solid_middle_unscaled.c"
 #include "image_blend_fade_unscaled.c"
@@ -52,6 +63,7 @@
 #include "text_change.c"
 #include "textblock_basic.c"
 #include "textblock_intl.c"
+#include "textblock_auto_align.c"
 #include "rect_blend.c"
 #include "rect_blend_pow2.c"
 #include "rect_solid.c"
diff --git a/src/bin/textblock_auto_align.c b/src/bin/textblock_auto_align.c
new file mode 100644 (file)
index 0000000..da5a341
--- /dev/null
@@ -0,0 +1,129 @@
+#undef FNAME
+#undef NAME
+#undef ICON
+
+/* metadata */
+#define FNAME textblock_auto_align_start
+#define NAME "Textblock auto align"
+#define ICON "text.png"
+
+#ifndef PROTO
+# ifndef UI
+#  include "main.h"
+
+/* standard var */
+static int done = 0;
+
+/* private data */
+static Evas_Object *o_text;
+
+/* setup */
+static void _setup(void)
+{
+   Evas_Object *o;
+   Evas_Textblock_Style *st;
+
+   o = evas_object_textblock_add(evas);
+   o_text = o;
+   st = evas_textblock_style_new();
+   evas_textblock_style_set
+     (st,
+      "DEFAULT='font=Sans font_size=10 color=#000000 wrap=word'"
+      "br='\n'"
+      "ps='ps'"
+      );
+   evas_object_textblock_style_set(o, st);
+   evas_textblock_style_free(st);
+   evas_object_textblock_clear(o);
+
+   evas_object_textblock_text_markup_set
+     (o,
+      "This is a test of auto alignment in Evas<ps>"
+      "<br>"
+      "This text should be left aligned<ps>"
+      "\xE2\x80\x8FThis text should be right aligned<ps>"
+      "\xE2\x80\x8FThis text should be right aligned<br>"
+      "Same as this text.<ps>"
+      "This text should be left aligned<br>"
+      "\xE2\x80\x8FSame as this text."
+      "<br><br><ps>"
+      "The word '×–×”' should be the rightmost, 'טקסט' after, and 'בעברית' last<br>"
+      "in the following text:<ps>"
+      "×–×” ×˜×§×¡×˜ ×‘עברית<ps>"
+      "<br>"
+      "In the next text, the paragraph should be right aligned and the<br>"
+      "words should appear in the following order: 'דוגמה' first, 'of' second,<br>"
+      "'טקסט' third, 'english' fourth and 'in' fifth, counting from right to left<ps>"
+      "דוגמה of ×˜×§×¡×˜ in english."
+      );
+
+   evas_object_show(o);
+
+   done = 0;
+}
+
+/* cleanup */
+static void _cleanup(void)
+{
+   evas_object_del(o_text);
+}
+
+/* loop - do things */
+static void _loop(double t, int f)
+{
+   Evas_Coord x, y, w, h, w0, h0;
+   int i = 0;
+
+   evas_object_textblock_size_native_get(o_text, &w0, &h0);
+   w = w0;
+   h = h0;
+   w += fabs(sin((double)(f + (i * 13)) / (31.1 * SLOW))) * (w0);
+   x = (win_w / 2) - (w / 2);
+   y = (win_h / 2) - (h0 / 2);
+   evas_object_move(o_text, x, y);
+   evas_object_resize(o_text, w, h);
+
+   FPS_STD(NAME);
+}
+
+/* prepend special key handlers if interactive (before STD) */
+static void _key(char *key)
+{
+   KEY_STD;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+/* template stuff - ignore */
+# endif
+#endif
+
+#ifdef UI
+_ui_menu_item_add(ICON, NAME, FNAME);
+#endif
+
+#ifdef PROTO
+void FNAME(void);
+#endif
+
+#ifndef PROTO
+# ifndef UI
+void FNAME(void)
+{
+   ui_func_set(_key, _loop);
+   _setup();
+}
+# endif
+#endif
+#undef FNAME
+#undef NAME
+#undef ICON
index d89a961..98c44e1 100644 (file)
@@ -53,8 +53,19 @@ static double weights[] =
    0.0, // no test 0
      
      50.4851, // test 1
-     37.3703, // test 2
-     10.6493, // ...
+     97.3703, // test 2
+     10.0000, // test 3
+     87.3703, // ...
+     10.0000, 
+     150.0000,
+     10.0000,
+     150.0000,
+     10.0000,
+     150.0000,
+     10.0000,
+     150.0000,
+     10.0000,
+     10.6493, 
      38.4818,
      40.7314,
      32.0866,
@@ -143,6 +154,12 @@ _ui_exit(void)
    engine_abort();
 }
 
+extern const char *profile;
+extern int win_w, win_h;
+extern const char *engine;
+extern int loops;
+extern int fullscreen;
+
 static void
 _ui_all(void)
 {
@@ -190,11 +207,39 @@ _ui_all(void)
      }
    for (i = 1; i < ((sizeof(weights) / sizeof(double)) - 1); i++)
      avgw += weights[i];
-   avgw /= (i - 1);   
+   avgw /= (i - 1);
    if (t_count > 0)
      {
+        char datestr[1024];
+        struct tm *tim;
+        time_t now;
+        
+        now = time(NULL);
+        tim = localtime(&now);
+        if (tim) strftime(datestr, sizeof(datestr), "%F %T", tim);
+        else snprintf(datestr, sizeof(datestr), "unknown");
 //        printf("%5.2f , EVAS SPEED\n", fps / t_count);
-        printf("%5.2f , EVAS SPEED (WEIGHTED)\n", wfps / (t_count * avgw));
+        printf("%5.2f , EVAS SPEED (WEIGHTED), "
+               "tn, %i , "
+               "t, %s , "
+               "ev , %i.%i.%i.%i , "
+               "p , %s , "
+               "sz , %i , %i , "
+               "c , %i , "
+               "e , %s , "
+               "fs , %i\n"
+               ,
+               wfps / (t_count * avgw),
+//               fps / t_count,
+               t_count,
+               datestr,
+               evas_version->major, evas_version->minor, evas_version->micro, evas_version->revision,
+               profile,
+               win_w, win_h,
+               loops,
+               engine,
+               fullscreen
+              );
      }
 }
 
@@ -493,7 +538,7 @@ _ui_setup(void)
    evas_object_move(o, x, y);
    o_menu_title = o;
 
-   _ui_menu_item_add("e.png", "About Enlightenment", about_start);
+   _ui_menu_item_add("e.png", "About", about_start);
    _ui_menu_item_add("e.png", "All Tests", _ui_all);
 #define UI
 #include "tests.h"
diff --git a/src/bin/widgets_file_icons_2_grouped.c b/src/bin/widgets_file_icons_2_grouped.c
new file mode 100644 (file)
index 0000000..87dc91c
--- /dev/null
@@ -0,0 +1,147 @@
+#undef FNAME
+#undef NAME
+#undef ICON
+
+/* metadata */
+#define FNAME widgets_file_icons_2_grouped_start
+#define NAME "Widgets File Icons 2 Grouped"
+#define ICON "widgets.png"
+
+#ifndef PROTO
+# ifndef UI
+#  include "main.h"
+
+/* standard var */
+static int done = 0;
+/* private data */
+#define NUM 512
+#define ICON_SIZE 64
+static Evas_Object *o_images[NUM];
+static Evas_Object *o_texts[NUM];
+
+static const char *icons[] = 
+{
+   "bug.png",
+   "bulb.png",
+   "camera.png",
+   "colorbox.png",
+     
+   "e.png",
+   "error.png",
+   "flower.png",
+   "house.png",
+     
+   "mushroom.png",
+   "pulse.png",
+   "typewriter.png",
+   "warning.png",
+     
+   "watch.png"
+};
+
+/* setup */
+static void _setup(void)
+{
+   int i;
+   Evas_Object *o;
+   for (i = 0; i < NUM; i++)
+     {
+       o = evas_object_image_add(evas);
+       o_images[i] = o;
+        evas_object_image_file_set(o, build_path(icons[i % 13]), NULL);
+       evas_object_image_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
+       evas_object_resize(o, ICON_SIZE, ICON_SIZE);
+       evas_object_show(o);
+        
+        o = evas_object_text_add(evas);
+        o_texts[i] = o;
+        evas_object_text_font_set(o, "Vera-Bold", 10);
+        evas_object_text_text_set(o, icons[i % 13]);
+        evas_object_color_set(o, 0, 0, 0, 255);
+        evas_object_show(o);
+     }
+   for (i = 0; i < NUM; i++)
+     {
+        evas_object_raise(o_images[i]);
+     }
+   for (i = 0; i < NUM; i++)
+     {
+        if (i > 13) evas_object_stack_above(o_images[i], o_images[i - 13]);
+     }
+   done = 0;
+}
+
+/* cleanup */
+static void _cleanup(void)
+{
+   int i;
+   for (i = 0; i < NUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < NUM; i++) evas_object_del(o_texts[i]);
+}
+
+/* loop - do things */
+static void _loop(double t, int f)
+{
+   int i;
+   Evas_Coord x, y, w, h, tw, th, cent;
+   x = 0;
+   y = 0 - f;
+   w = ICON_SIZE;
+   h = ICON_SIZE;
+   for (i = 0; i < NUM; i++)
+     {
+       evas_object_move(o_images[i], x + 8, y);
+        evas_object_geometry_get(o_texts[i], NULL, NULL, &tw, &th);
+        cent = (ICON_SIZE + 16 - tw) / 2;
+       evas_object_move(o_texts[i], x + cent, y + ICON_SIZE + 4);
+        x += ICON_SIZE + 16;
+        if (x > win_w)
+          {
+             x = 0;
+             y += ICON_SIZE + 16;
+          }
+     }
+   FPS_STD(NAME);
+}
+
+/* prepend special key handlers if interactive (before STD) */
+static void _key(char *key)
+{
+   KEY_STD;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+/* template stuff - ignore */
+# endif
+#endif
+
+#ifdef UI
+_ui_menu_item_add(ICON, NAME, FNAME);
+#endif
+
+#ifdef PROTO
+void FNAME(void);
+#endif
+
+#ifndef PROTO
+# ifndef UI
+void FNAME(void)
+{
+   ui_func_set(_key, _loop);
+   _setup();
+}
+# endif
+#endif
+#undef FNAME
+#undef NAME
+#undef ICON
diff --git a/src/bin/widgets_file_icons_2_same.c b/src/bin/widgets_file_icons_2_same.c
new file mode 100644 (file)
index 0000000..47b9b48
--- /dev/null
@@ -0,0 +1,124 @@
+#undef FNAME
+#undef NAME
+#undef ICON
+
+/* metadata */
+#define FNAME widgets_file_icons_2_same_start
+#define NAME "Widgets File Icons 2 Same"
+#define ICON "widgets.png"
+
+#ifndef PROTO
+# ifndef UI
+#  include "main.h"
+
+/* standard var */
+static int done = 0;
+/* private data */
+#define NUM 512
+#define ICON_SIZE 64
+static Evas_Object *o_images[NUM];
+static Evas_Object *o_texts[NUM];
+
+static const char *icons[] = 
+{
+   "e.png",
+};
+
+/* setup */
+static void _setup(void)
+{
+   int i;
+   Evas_Object *o;
+   for (i = 0; i < NUM; i++)
+     {
+       o = evas_object_image_add(evas);
+       o_images[i] = o;
+        evas_object_image_file_set(o, build_path(icons[i % 1]), NULL);
+       evas_object_image_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
+       evas_object_resize(o, ICON_SIZE, ICON_SIZE);
+       evas_object_show(o);
+        
+        o = evas_object_text_add(evas);
+        o_texts[i] = o;
+        evas_object_text_font_set(o, "Vera-Bold", 10);
+        evas_object_text_text_set(o, icons[i % 1]);
+        evas_object_color_set(o, 0, 0, 0, 255);
+        evas_object_show(o);
+     }
+   done = 0;
+}
+
+/* cleanup */
+static void _cleanup(void)
+{
+   int i;
+   for (i = 0; i < NUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < NUM; i++) evas_object_del(o_texts[i]);
+}
+
+/* loop - do things */
+static void _loop(double t, int f)
+{
+   int i;
+   Evas_Coord x, y, w, h, tw, th, cent;
+   x = 0;
+   y = 0 - f;
+   w = ICON_SIZE;
+   h = ICON_SIZE;
+   for (i = 0; i < NUM; i++)
+     {
+       evas_object_move(o_images[i], x + 8, y);
+        evas_object_geometry_get(o_texts[i], NULL, NULL, &tw, &th);
+        cent = (ICON_SIZE + 16 - tw) / 2;
+       evas_object_move(o_texts[i], x + cent, y + ICON_SIZE + 4);
+        x += ICON_SIZE + 16;
+        if (x > win_w)
+          {
+             x = 0;
+             y += ICON_SIZE + 16;
+          }
+     }
+   FPS_STD(NAME);
+}
+
+/* prepend special key handlers if interactive (before STD) */
+static void _key(char *key)
+{
+   KEY_STD;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+/* template stuff - ignore */
+# endif
+#endif
+
+#ifdef UI
+_ui_menu_item_add(ICON, NAME, FNAME);
+#endif
+
+#ifdef PROTO
+void FNAME(void);
+#endif
+
+#ifndef PROTO
+# ifndef UI
+void FNAME(void)
+{
+   ui_func_set(_key, _loop);
+   _setup();
+}
+# endif
+#endif
+#undef FNAME
+#undef NAME
+#undef ICON
diff --git a/src/bin/widgets_file_icons_2_same_grouped.c b/src/bin/widgets_file_icons_2_same_grouped.c
new file mode 100644 (file)
index 0000000..5a2e6a0
--- /dev/null
@@ -0,0 +1,128 @@
+#undef FNAME
+#undef NAME
+#undef ICON
+
+/* metadata */
+#define FNAME widgets_file_icons_2_same_grouped_start
+#define NAME "Widgets File Icons 2 Same Grouped"
+#define ICON "widgets.png"
+
+#ifndef PROTO
+# ifndef UI
+#  include "main.h"
+
+/* standard var */
+static int done = 0;
+/* private data */
+#define NUM 512
+#define ICON_SIZE 64
+static Evas_Object *o_images[NUM];
+static Evas_Object *o_texts[NUM];
+
+static const char *icons[] = 
+{
+   "e.png",
+};
+
+/* setup */
+static void _setup(void)
+{
+   int i;
+   Evas_Object *o;
+   for (i = 0; i < NUM; i++)
+     {
+       o = evas_object_image_add(evas);
+       o_images[i] = o;
+        evas_object_image_file_set(o, build_path(icons[i % 1]), NULL);
+       evas_object_image_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
+       evas_object_resize(o, ICON_SIZE, ICON_SIZE);
+       evas_object_show(o);
+        
+        o = evas_object_text_add(evas);
+        o_texts[i] = o;
+        evas_object_text_font_set(o, "Vera-Bold", 10);
+        evas_object_text_text_set(o, icons[i % 1]);
+        evas_object_color_set(o, 0, 0, 0, 255);
+        evas_object_show(o);
+     }
+   for (i = 0; i < NUM; i++)
+     {
+        evas_object_raise(o_images[i]);
+     }
+   done = 0;
+}
+
+/* cleanup */
+static void _cleanup(void)
+{
+   int i;
+   for (i = 0; i < NUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < NUM; i++) evas_object_del(o_texts[i]);
+}
+
+/* loop - do things */
+static void _loop(double t, int f)
+{
+   int i;
+   Evas_Coord x, y, w, h, tw, th, cent;
+   x = 0;
+   y = 0 - f;
+   w = ICON_SIZE;
+   h = ICON_SIZE;
+   for (i = 0; i < NUM; i++)
+     {
+       evas_object_move(o_images[i], x + 8, y);
+        evas_object_geometry_get(o_texts[i], NULL, NULL, &tw, &th);
+        cent = (ICON_SIZE + 16 - tw) / 2;
+       evas_object_move(o_texts[i], x + cent, y + ICON_SIZE + 4);
+        x += ICON_SIZE + 16;
+        if (x > win_w)
+          {
+             x = 0;
+             y += ICON_SIZE + 16;
+          }
+     }
+   FPS_STD(NAME);
+}
+
+/* prepend special key handlers if interactive (before STD) */
+static void _key(char *key)
+{
+   KEY_STD;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+/* template stuff - ignore */
+# endif
+#endif
+
+#ifdef UI
+_ui_menu_item_add(ICON, NAME, FNAME);
+#endif
+
+#ifdef PROTO
+void FNAME(void);
+#endif
+
+#ifndef PROTO
+# ifndef UI
+void FNAME(void)
+{
+   ui_func_set(_key, _loop);
+   _setup();
+}
+# endif
+#endif
+#undef FNAME
+#undef NAME
+#undef ICON
diff --git a/src/bin/widgets_list_1.c b/src/bin/widgets_list_1.c
new file mode 100644 (file)
index 0000000..64cd2a1
--- /dev/null
@@ -0,0 +1,150 @@
+#undef FNAME
+#undef NAME
+#undef ICON
+
+/* metadata */
+#define FNAME widgets_list_1_start
+#define NAME "Widgets List"
+#define ICON "widgets.png"
+
+#ifndef PROTO
+# ifndef UI
+#  include "main.h"
+
+/* standard var */
+static int done = 0;
+/* private data */
+#define NUM 512
+#define ICON_SIZE 64
+static Evas_Object *o_images[NUM];
+static Evas_Object *o_texts[NUM];
+
+static const char *labels[] = 
+{
+   "Andrew",
+   "Alex",
+   "Amanda",
+   "Arthur",
+   "Astrid",
+   "Avery",
+   
+   "Beethoven",
+   "Billy",
+   "Bob",
+   "Bundy",
+   
+   "Candy",   
+   "Carsten",
+   
+   "Danny",
+   "Dennis",
+   "Dirk",
+   "Doug",
+   
+   "Edmond",
+   "Erik",
+   
+   "Fernando",
+   "Frank",
+   "Frederick",
+   
+   "Gabby",
+   "George",
+   "Gilroy",
+   "Goodrich",
+   "Gumby",
+};
+
+/* setup */
+static void _setup(void)
+{
+   int i;
+   Evas_Object *o;
+   for (i = 0; i < NUM; i++)
+     {
+       o = evas_object_image_filled_add(evas);
+       o_images[i] = o;
+        evas_object_image_border_set(o, 2, 2, 2, 2);
+        evas_object_image_file_set(o, build_path("pan.png"), NULL);
+       evas_object_resize(o, win_w, ICON_SIZE);
+       evas_object_show(o);
+        
+        o = evas_object_text_add(evas);
+        o_texts[i] = o;
+        evas_object_text_font_set(o, "Vera-Bold", 10);
+        evas_object_text_text_set(o, labels[i % 26]);
+        evas_object_color_set(o, 0, 0, 0, 255);
+        evas_object_show(o);
+     }
+   done = 0;
+}
+
+/* cleanup */
+static void _cleanup(void)
+{
+   int i;
+   for (i = 0; i < NUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < NUM; i++) evas_object_del(o_texts[i]);
+}
+
+/* loop - do things */
+static void _loop(double t, int f)
+{
+   int i;
+   Evas_Coord x, y, w, h, tw, th, cent;
+   x = 0;
+   y = 0 - f;
+   w = win_w;
+   h = ICON_SIZE;
+   for (i = 0; i < NUM; i++)
+     {
+       evas_object_move(o_images[i], x, y);
+        evas_object_geometry_get(o_texts[i], NULL, NULL, &tw, &th);
+        cent = (ICON_SIZE - th) / 2;
+       evas_object_move(o_texts[i], x + 8, y + cent);
+        y += ICON_SIZE;
+     }
+   FPS_STD(NAME);
+}
+
+/* prepend special key handlers if interactive (before STD) */
+static void _key(char *key)
+{
+   KEY_STD;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+/* template stuff - ignore */
+# endif
+#endif
+
+#ifdef UI
+_ui_menu_item_add(ICON, NAME, FNAME);
+#endif
+
+#ifdef PROTO
+void FNAME(void);
+#endif
+
+#ifndef PROTO
+# ifndef UI
+void FNAME(void)
+{
+   ui_func_set(_key, _loop);
+   _setup();
+}
+# endif
+#endif
+#undef FNAME
+#undef NAME
+#undef ICON
diff --git a/src/bin/widgets_list_1_grouped.c b/src/bin/widgets_list_1_grouped.c
new file mode 100644 (file)
index 0000000..b327efb
--- /dev/null
@@ -0,0 +1,158 @@
+#undef FNAME
+#undef NAME
+#undef ICON
+
+/* metadata */
+#define FNAME widgets_list_1_grouped_start
+#define NAME "Widgets List Grouped"
+#define ICON "widgets.png"
+
+#ifndef PROTO
+# ifndef UI
+#  include "main.h"
+
+/* standard var */
+static int done = 0;
+/* private data */
+#define NUM 512
+#define ICON_SIZE 64
+static Evas_Object *o_images[NUM];
+static Evas_Object *o_texts[NUM];
+
+static const char *labels[] = 
+{
+   "Andrew",
+   "Alex",
+   "Amanda",
+   "Arthur",
+   "Astrid",
+   "Avery",
+   
+   "Beethoven",
+   "Billy",
+   "Bob",
+   "Bundy",
+   
+   "Candy",   
+   "Carsten",
+   
+   "Danny",
+   "Dennis",
+   "Dirk",
+   "Doug",
+   
+   "Edmond",
+   "Erik",
+   
+   "Fernando",
+   "Frank",
+   "Frederick",
+   
+   "Gabby",
+   "George",
+   "Gilroy",
+   "Goodrich",
+   "Gumby",
+};
+
+/* setup */
+static void _setup(void)
+{
+   int i;
+   Evas_Object *o;
+   for (i = 0; i < NUM; i++)
+     {
+       o = evas_object_image_filled_add(evas);
+       o_images[i] = o;
+        evas_object_image_border_set(o, 2, 2, 2, 2);
+        evas_object_image_file_set(o, build_path("pan.png"), NULL);
+       evas_object_resize(o, win_w, ICON_SIZE);
+       evas_object_show(o);
+        
+        o = evas_object_text_add(evas);
+        o_texts[i] = o;
+        evas_object_text_font_set(o, "Vera-Bold", 10);
+        evas_object_text_text_set(o, labels[i % 26]);
+        evas_object_color_set(o, 0, 0, 0, 255);
+        evas_object_show(o);
+     }
+   for (i = 0; i < NUM; i++)
+     {
+        evas_object_raise(o_images[i]);
+     }
+   for (i = 0; i < NUM; i++)
+     {
+        evas_object_raise(o_texts[i]);
+     }
+   done = 0;
+}
+
+/* cleanup */
+static void _cleanup(void)
+{
+   int i;
+   for (i = 0; i < NUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < NUM; i++) evas_object_del(o_texts[i]);
+}
+
+/* loop - do things */
+static void _loop(double t, int f)
+{
+   int i;
+   Evas_Coord x, y, w, h, tw, th, cent;
+   x = 0;
+   y = 0 - f;
+   w = win_w;
+   h = ICON_SIZE;
+   for (i = 0; i < NUM; i++)
+     {
+       evas_object_move(o_images[i], x, y);
+        evas_object_geometry_get(o_texts[i], NULL, NULL, &tw, &th);
+        cent = (ICON_SIZE - th) / 2;
+       evas_object_move(o_texts[i], x + 8, y + cent);
+        y += ICON_SIZE;
+     }
+   FPS_STD(NAME);
+}
+
+/* prepend special key handlers if interactive (before STD) */
+static void _key(char *key)
+{
+   KEY_STD;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+/* template stuff - ignore */
+# endif
+#endif
+
+#ifdef UI
+_ui_menu_item_add(ICON, NAME, FNAME);
+#endif
+
+#ifdef PROTO
+void FNAME(void);
+#endif
+
+#ifndef PROTO
+# ifndef UI
+void FNAME(void)
+{
+   ui_func_set(_key, _loop);
+   _setup();
+}
+# endif
+#endif
+#undef FNAME
+#undef NAME
+#undef ICON
diff --git a/src/bin/widgets_list_2.c b/src/bin/widgets_list_2.c
new file mode 100644 (file)
index 0000000..56dff92
--- /dev/null
@@ -0,0 +1,150 @@
+#undef FNAME
+#undef NAME
+#undef ICON
+
+/* metadata */
+#define FNAME widgets_list_2_start
+#define NAME "Widgets List 2"
+#define ICON "widgets.png"
+
+#ifndef PROTO
+# ifndef UI
+#  include "main.h"
+
+/* standard var */
+static int done = 0;
+/* private data */
+#define NUM 512
+#define ICON_SIZE 32
+static Evas_Object *o_images[NUM];
+static Evas_Object *o_texts[NUM];
+
+static const char *labels[] = 
+{
+   "Andrew",
+   "Alex",
+   "Amanda",
+   "Arthur",
+   "Astrid",
+   "Avery",
+   
+   "Beethoven",
+   "Billy",
+   "Bob",
+   "Bundy",
+   
+   "Candy",   
+   "Carsten",
+   
+   "Danny",
+   "Dennis",
+   "Dirk",
+   "Doug",
+   
+   "Edmond",
+   "Erik",
+   
+   "Fernando",
+   "Frank",
+   "Frederick",
+   
+   "Gabby",
+   "George",
+   "Gilroy",
+   "Goodrich",
+   "Gumby",
+};
+
+/* setup */
+static void _setup(void)
+{
+   int i;
+   Evas_Object *o;
+   for (i = 0; i < NUM; i++)
+     {
+       o = evas_object_image_filled_add(evas);
+       o_images[i] = o;
+        evas_object_image_border_set(o, 2, 2, 2, 2);
+        evas_object_image_file_set(o, build_path("pan.png"), NULL);
+       evas_object_resize(o, win_w, ICON_SIZE);
+       evas_object_show(o);
+        
+        o = evas_object_text_add(evas);
+        o_texts[i] = o;
+        evas_object_text_font_set(o, "Vera-Bold", 10);
+        evas_object_text_text_set(o, labels[i % 26]);
+        evas_object_color_set(o, 0, 0, 0, 255);
+        evas_object_show(o);
+     }
+   done = 0;
+}
+
+/* cleanup */
+static void _cleanup(void)
+{
+   int i;
+   for (i = 0; i < NUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < NUM; i++) evas_object_del(o_texts[i]);
+}
+
+/* loop - do things */
+static void _loop(double t, int f)
+{
+   int i;
+   Evas_Coord x, y, w, h, tw, th, cent;
+   x = 0;
+   y = 0 - f;
+   w = win_w;
+   h = ICON_SIZE;
+   for (i = 0; i < NUM; i++)
+     {
+       evas_object_move(o_images[i], x, y);
+        evas_object_geometry_get(o_texts[i], NULL, NULL, &tw, &th);
+        cent = (ICON_SIZE - th) / 2;
+       evas_object_move(o_texts[i], x + 8, y + cent);
+        y += ICON_SIZE;
+     }
+   FPS_STD(NAME);
+}
+
+/* prepend special key handlers if interactive (before STD) */
+static void _key(char *key)
+{
+   KEY_STD;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+/* template stuff - ignore */
+# endif
+#endif
+
+#ifdef UI
+_ui_menu_item_add(ICON, NAME, FNAME);
+#endif
+
+#ifdef PROTO
+void FNAME(void);
+#endif
+
+#ifndef PROTO
+# ifndef UI
+void FNAME(void)
+{
+   ui_func_set(_key, _loop);
+   _setup();
+}
+# endif
+#endif
+#undef FNAME
+#undef NAME
+#undef ICON
diff --git a/src/bin/widgets_list_2_grouped.c b/src/bin/widgets_list_2_grouped.c
new file mode 100644 (file)
index 0000000..fae8011
--- /dev/null
@@ -0,0 +1,158 @@
+#undef FNAME
+#undef NAME
+#undef ICON
+
+/* metadata */
+#define FNAME widgets_list_2_grouped_start
+#define NAME "Widgets List 2 Grouped"
+#define ICON "widgets.png"
+
+#ifndef PROTO
+# ifndef UI
+#  include "main.h"
+
+/* standard var */
+static int done = 0;
+/* private data */
+#define NUM 512
+#define ICON_SIZE 64
+static Evas_Object *o_images[NUM];
+static Evas_Object *o_texts[NUM];
+
+static const char *labels[] = 
+{
+   "Andrew",
+   "Alex",
+   "Amanda",
+   "Arthur",
+   "Astrid",
+   "Avery",
+   
+   "Beethoven",
+   "Billy",
+   "Bob",
+   "Bundy",
+   
+   "Candy",   
+   "Carsten",
+   
+   "Danny",
+   "Dennis",
+   "Dirk",
+   "Doug",
+   
+   "Edmond",
+   "Erik",
+   
+   "Fernando",
+   "Frank",
+   "Frederick",
+   
+   "Gabby",
+   "George",
+   "Gilroy",
+   "Goodrich",
+   "Gumby",
+};
+
+/* setup */
+static void _setup(void)
+{
+   int i;
+   Evas_Object *o;
+   for (i = 0; i < NUM; i++)
+     {
+       o = evas_object_image_filled_add(evas);
+       o_images[i] = o;
+        evas_object_image_border_set(o, 2, 2, 2, 2);
+        evas_object_image_file_set(o, build_path("pan.png"), NULL);
+       evas_object_resize(o, win_w, ICON_SIZE);
+       evas_object_show(o);
+        
+        o = evas_object_text_add(evas);
+        o_texts[i] = o;
+        evas_object_text_font_set(o, "Vera-Bold", 10);
+        evas_object_text_text_set(o, labels[i % 26]);
+        evas_object_color_set(o, 0, 0, 0, 255);
+        evas_object_show(o);
+     }
+   for (i = 0; i < NUM; i++)
+     {
+        evas_object_raise(o_images[i]);
+     }
+   for (i = 0; i < NUM; i++)
+     {
+        evas_object_raise(o_texts[i]);
+     }
+   done = 0;
+}
+
+/* cleanup */
+static void _cleanup(void)
+{
+   int i;
+   for (i = 0; i < NUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < NUM; i++) evas_object_del(o_texts[i]);
+}
+
+/* loop - do things */
+static void _loop(double t, int f)
+{
+   int i;
+   Evas_Coord x, y, w, h, tw, th, cent;
+   x = 0;
+   y = 0 - f;
+   w = win_w;
+   h = ICON_SIZE;
+   for (i = 0; i < NUM; i++)
+     {
+       evas_object_move(o_images[i], x, y);
+        evas_object_geometry_get(o_texts[i], NULL, NULL, &tw, &th);
+        cent = (ICON_SIZE - th) / 2;
+       evas_object_move(o_texts[i], x + 8, y + cent);
+        y += ICON_SIZE;
+     }
+   FPS_STD(NAME);
+}
+
+/* prepend special key handlers if interactive (before STD) */
+static void _key(char *key)
+{
+   KEY_STD;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+/* template stuff - ignore */
+# endif
+#endif
+
+#ifdef UI
+_ui_menu_item_add(ICON, NAME, FNAME);
+#endif
+
+#ifdef PROTO
+void FNAME(void);
+#endif
+
+#ifndef PROTO
+# ifndef UI
+void FNAME(void)
+{
+   ui_func_set(_key, _loop);
+   _setup();
+}
+# endif
+#endif
+#undef FNAME
+#undef NAME
+#undef ICON
diff --git a/src/bin/widgets_list_3.c b/src/bin/widgets_list_3.c
new file mode 100644 (file)
index 0000000..ae022cd
--- /dev/null
@@ -0,0 +1,180 @@
+#undef FNAME
+#undef NAME
+#undef ICON
+
+/* metadata */
+#define FNAME widgets_list_3_start
+#define NAME "Widgets List 3"
+#define ICON "widgets.png"
+
+#ifndef PROTO
+# ifndef UI
+#  include "main.h"
+
+/* standard var */
+static int done = 0;
+/* private data */
+#define NUM 512
+#define ICON_SIZE 64
+static Evas_Object *o_images[NUM];
+static Evas_Object *o_icons[NUM];
+static Evas_Object *o_texts[NUM];
+
+static const char *icons[] =
+{
+   "bug.png",
+   "bulb.png",
+   "camera.png",
+   "colorbox.png",
+   
+   "e.png",
+   "error.png",
+   "flower.png",
+   "house.png",
+   
+   "mushroom.png",
+   "pulse.png",
+   "typewriter.png",
+   "warning.png",
+   
+   "watch.png"
+};
+
+static const char *labels[] = 
+{
+   "Andrew",
+   "Alex",
+   "Amanda",
+   "Arthur",
+   "Astrid",
+   "Avery",
+   
+   "Beethoven",
+   "Billy",
+   "Bob",
+   "Bundy",
+   
+   "Candy",   
+   "Carsten",
+   
+   "Danny",
+   "Dennis",
+   "Dirk",
+   "Doug",
+   
+   "Edmond",
+   "Erik",
+   
+   "Fernando",
+   "Frank",
+   "Frederick",
+   
+   "Gabby",
+   "George",
+   "Gilroy",
+   "Goodrich",
+   "Gumby",
+};
+
+/* setup */
+static void _setup(void)
+{
+   int i;
+   Evas_Object *o;
+   for (i = 0; i < NUM; i++)
+     {
+       o = evas_object_image_filled_add(evas);
+       o_images[i] = o;
+        evas_object_image_border_set(o, 2, 2, 2, 2);
+        evas_object_image_file_set(o, build_path("pan.png"), NULL);
+       evas_object_resize(o, win_w, ICON_SIZE);
+       evas_object_show(o);
+        
+       o = evas_object_image_filled_add(evas);
+       o_icons[i] = o;
+        evas_object_image_border_set(o, 2, 2, 2, 2);
+        evas_object_image_file_set(o, build_path(icons[i % 13]), NULL);
+       evas_object_resize(o, ICON_SIZE - 8, ICON_SIZE - 8);
+       evas_object_show(o);
+        
+        o = evas_object_text_add(evas);
+        o_texts[i] = o;
+        evas_object_text_font_set(o, "Vera-Bold", 10);
+        evas_object_text_text_set(o, labels[i % 26]);
+        evas_object_color_set(o, 0, 0, 0, 255);
+        evas_object_show(o);
+     }
+   done = 0;
+}
+
+/* cleanup */
+static void _cleanup(void)
+{
+   int i;
+   for (i = 0; i < NUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < NUM; i++) evas_object_del(o_icons[i]);
+   for (i = 0; i < NUM; i++) evas_object_del(o_texts[i]);
+}
+
+/* loop - do things */
+static void _loop(double t, int f)
+{
+   int i;
+   Evas_Coord x, y, w, h, tw, th, cent;
+   x = 0;
+   y = 0 - f;
+   w = win_w;
+   h = ICON_SIZE;
+   for (i = 0; i < NUM; i++)
+     {
+       evas_object_move(o_images[i], x, y);
+       evas_object_move(o_icons[i], x + 4, y + 4);
+        evas_object_geometry_get(o_texts[i], NULL, NULL, &tw, &th);
+        cent = (ICON_SIZE - th) / 2;
+       evas_object_move(o_texts[i], x + 8 + ICON_SIZE + 8, y + cent);
+        y += ICON_SIZE;
+     }
+   FPS_STD(NAME);
+}
+
+/* prepend special key handlers if interactive (before STD) */
+static void _key(char *key)
+{
+   KEY_STD;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+/* template stuff - ignore */
+# endif
+#endif
+
+#ifdef UI
+_ui_menu_item_add(ICON, NAME, FNAME);
+#endif
+
+#ifdef PROTO
+void FNAME(void);
+#endif
+
+#ifndef PROTO
+# ifndef UI
+void FNAME(void)
+{
+   ui_func_set(_key, _loop);
+   _setup();
+}
+# endif
+#endif
+#undef FNAME
+#undef NAME
+#undef ICON
diff --git a/src/bin/widgets_list_3_grouped.c b/src/bin/widgets_list_3_grouped.c
new file mode 100644 (file)
index 0000000..d545f0f
--- /dev/null
@@ -0,0 +1,196 @@
+#undef FNAME
+#undef NAME
+#undef ICON
+
+/* metadata */
+#define FNAME widgets_list_3_grouped_start
+#define NAME "Widgets List 3 Grouped"
+#define ICON "widgets.png"
+
+#ifndef PROTO
+# ifndef UI
+#  include "main.h"
+
+/* standard var */
+static int done = 0;
+/* private data */
+#define NUM 512
+#define ICON_SIZE 64
+static Evas_Object *o_images[NUM];
+static Evas_Object *o_icons[NUM];
+static Evas_Object *o_texts[NUM];
+
+static const char *icons[] =
+{
+   "bug.png",
+   "bulb.png",
+   "camera.png",
+   "colorbox.png",
+   
+   "e.png",
+   "error.png",
+   "flower.png",
+   "house.png",
+   
+   "mushroom.png",
+   "pulse.png",
+   "typewriter.png",
+   "warning.png",
+   
+   "watch.png"
+};
+
+static const char *labels[] = 
+{
+   "Andrew",
+   "Alex",
+   "Amanda",
+   "Arthur",
+   "Astrid",
+   "Avery",
+   
+   "Beethoven",
+   "Billy",
+   "Bob",
+   "Bundy",
+   
+   "Candy",   
+   "Carsten",
+   
+   "Danny",
+   "Dennis",
+   "Dirk",
+   "Doug",
+   
+   "Edmond",
+   "Erik",
+   
+   "Fernando",
+   "Frank",
+   "Frederick",
+   
+   "Gabby",
+   "George",
+   "Gilroy",
+   "Goodrich",
+   "Gumby",
+};
+
+/* setup */
+static void _setup(void)
+{
+   int i;
+   Evas_Object *o;
+   for (i = 0; i < NUM; i++)
+     {
+       o = evas_object_image_filled_add(evas);
+       o_images[i] = o;
+        evas_object_image_border_set(o, 2, 2, 2, 2);
+        evas_object_image_file_set(o, build_path("pan.png"), NULL);
+       evas_object_resize(o, win_w, ICON_SIZE);
+       evas_object_show(o);
+        
+       o = evas_object_image_filled_add(evas);
+       o_icons[i] = o;
+        evas_object_image_border_set(o, 2, 2, 2, 2);
+        evas_object_image_file_set(o, build_path(icons[i % 13]), NULL);
+       evas_object_resize(o, ICON_SIZE - 8, ICON_SIZE - 8);
+       evas_object_show(o);
+        
+        o = evas_object_text_add(evas);
+        o_texts[i] = o;
+        evas_object_text_font_set(o, "Vera-Bold", 10);
+        evas_object_text_text_set(o, labels[i % 26]);
+        evas_object_color_set(o, 0, 0, 0, 255);
+        evas_object_show(o);
+     }
+   for (i = 0; i < NUM; i++)
+     {
+        evas_object_raise(o_images[i]);
+     }
+   for (i = 0; i < NUM; i++)
+     {
+        evas_object_raise(o_icons[i]);
+     }
+   for (i = 0; i < NUM; i++)
+     {
+        if (i > 13) evas_object_stack_above(o_icons[i], o_icons[i - 13]);
+     }
+   for (i = 0; i < NUM; i++)
+     {
+        evas_object_raise(o_texts[i]);
+     }
+   done = 0;
+}
+
+/* cleanup */
+static void _cleanup(void)
+{
+   int i;
+   for (i = 0; i < NUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < NUM; i++) evas_object_del(o_icons[i]);
+   for (i = 0; i < NUM; i++) evas_object_del(o_texts[i]);
+}
+
+/* loop - do things */
+static void _loop(double t, int f)
+{
+   int i;
+   Evas_Coord x, y, w, h, tw, th, cent;
+   x = 0;
+   y = 0 - f;
+   w = win_w;
+   h = ICON_SIZE;
+   for (i = 0; i < NUM; i++)
+     {
+       evas_object_move(o_images[i], x, y);
+       evas_object_move(o_icons[i], x + 4, y + 4);
+        evas_object_geometry_get(o_texts[i], NULL, NULL, &tw, &th);
+        cent = (ICON_SIZE - th) / 2;
+       evas_object_move(o_texts[i], x + 8 + ICON_SIZE + 8, y + cent);
+        y += ICON_SIZE;
+     }
+   FPS_STD(NAME);
+}
+
+/* prepend special key handlers if interactive (before STD) */
+static void _key(char *key)
+{
+   KEY_STD;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+/* template stuff - ignore */
+# endif
+#endif
+
+#ifdef UI
+_ui_menu_item_add(ICON, NAME, FNAME);
+#endif
+
+#ifdef PROTO
+void FNAME(void);
+#endif
+
+#ifndef PROTO
+# ifndef UI
+void FNAME(void)
+{
+   ui_func_set(_key, _loop);
+   _setup();
+}
+# endif
+#endif
+#undef FNAME
+#undef NAME
+#undef ICON
diff --git a/src/bin/widgets_list_4.c b/src/bin/widgets_list_4.c
new file mode 100644 (file)
index 0000000..4291b29
--- /dev/null
@@ -0,0 +1,180 @@
+#undef FNAME
+#undef NAME
+#undef ICON
+
+/* metadata */
+#define FNAME widgets_list_4_start
+#define NAME "Widgets List 4"
+#define ICON "widgets.png"
+
+#ifndef PROTO
+# ifndef UI
+#  include "main.h"
+
+/* standard var */
+static int done = 0;
+/* private data */
+#define NUM 512
+#define ICON_SIZE 32
+static Evas_Object *o_images[NUM];
+static Evas_Object *o_icons[NUM];
+static Evas_Object *o_texts[NUM];
+
+static const char *icons[] =
+{
+   "bug.png",
+   "bulb.png",
+   "camera.png",
+   "colorbox.png",
+   
+   "e.png",
+   "error.png",
+   "flower.png",
+   "house.png",
+   
+   "mushroom.png",
+   "pulse.png",
+   "typewriter.png",
+   "warning.png",
+   
+   "watch.png"
+};
+
+static const char *labels[] = 
+{
+   "Andrew",
+   "Alex",
+   "Amanda",
+   "Arthur",
+   "Astrid",
+   "Avery",
+   
+   "Beethoven",
+   "Billy",
+   "Bob",
+   "Bundy",
+   
+   "Candy",   
+   "Carsten",
+   
+   "Danny",
+   "Dennis",
+   "Dirk",
+   "Doug",
+   
+   "Edmond",
+   "Erik",
+   
+   "Fernando",
+   "Frank",
+   "Frederick",
+   
+   "Gabby",
+   "George",
+   "Gilroy",
+   "Goodrich",
+   "Gumby",
+};
+
+/* setup */
+static void _setup(void)
+{
+   int i;
+   Evas_Object *o;
+   for (i = 0; i < NUM; i++)
+     {
+       o = evas_object_image_filled_add(evas);
+       o_images[i] = o;
+        evas_object_image_border_set(o, 2, 2, 2, 2);
+        evas_object_image_file_set(o, build_path("pan.png"), NULL);
+       evas_object_resize(o, win_w, ICON_SIZE);
+       evas_object_show(o);
+        
+       o = evas_object_image_filled_add(evas);
+       o_icons[i] = o;
+        evas_object_image_border_set(o, 2, 2, 2, 2);
+        evas_object_image_file_set(o, build_path(icons[i % 13]), NULL);
+       evas_object_resize(o, ICON_SIZE - 8, ICON_SIZE - 8);
+       evas_object_show(o);
+        
+        o = evas_object_text_add(evas);
+        o_texts[i] = o;
+        evas_object_text_font_set(o, "Vera-Bold", 10);
+        evas_object_text_text_set(o, labels[i % 26]);
+        evas_object_color_set(o, 0, 0, 0, 255);
+        evas_object_show(o);
+     }
+   done = 0;
+}
+
+/* cleanup */
+static void _cleanup(void)
+{
+   int i;
+   for (i = 0; i < NUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < NUM; i++) evas_object_del(o_icons[i]);
+   for (i = 0; i < NUM; i++) evas_object_del(o_texts[i]);
+}
+
+/* loop - do things */
+static void _loop(double t, int f)
+{
+   int i;
+   Evas_Coord x, y, w, h, tw, th, cent;
+   x = 0;
+   y = 0 - f;
+   w = win_w;
+   h = ICON_SIZE;
+   for (i = 0; i < NUM; i++)
+     {
+       evas_object_move(o_images[i], x, y);
+       evas_object_move(o_icons[i], x + 4, y + 4);
+        evas_object_geometry_get(o_texts[i], NULL, NULL, &tw, &th);
+        cent = (ICON_SIZE - th) / 2;
+       evas_object_move(o_texts[i], x + 8 + ICON_SIZE + 8, y + cent);
+        y += ICON_SIZE;
+     }
+   FPS_STD(NAME);
+}
+
+/* prepend special key handlers if interactive (before STD) */
+static void _key(char *key)
+{
+   KEY_STD;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+/* template stuff - ignore */
+# endif
+#endif
+
+#ifdef UI
+_ui_menu_item_add(ICON, NAME, FNAME);
+#endif
+
+#ifdef PROTO
+void FNAME(void);
+#endif
+
+#ifndef PROTO
+# ifndef UI
+void FNAME(void)
+{
+   ui_func_set(_key, _loop);
+   _setup();
+}
+# endif
+#endif
+#undef FNAME
+#undef NAME
+#undef ICON
diff --git a/src/bin/widgets_list_4_grouped.c b/src/bin/widgets_list_4_grouped.c
new file mode 100644 (file)
index 0000000..2cb9aae
--- /dev/null
@@ -0,0 +1,196 @@
+#undef FNAME
+#undef NAME
+#undef ICON
+
+/* metadata */
+#define FNAME widgets_list_4_grouped_start
+#define NAME "Widgets List 4 Grouped"
+#define ICON "widgets.png"
+
+#ifndef PROTO
+# ifndef UI
+#  include "main.h"
+
+/* standard var */
+static int done = 0;
+/* private data */
+#define NUM 512
+#define ICON_SIZE 32
+static Evas_Object *o_images[NUM];
+static Evas_Object *o_icons[NUM];
+static Evas_Object *o_texts[NUM];
+
+static const char *icons[] =
+{
+   "bug.png",
+   "bulb.png",
+   "camera.png",
+   "colorbox.png",
+   
+   "e.png",
+   "error.png",
+   "flower.png",
+   "house.png",
+   
+   "mushroom.png",
+   "pulse.png",
+   "typewriter.png",
+   "warning.png",
+   
+   "watch.png"
+};
+
+static const char *labels[] = 
+{
+   "Andrew",
+   "Alex",
+   "Amanda",
+   "Arthur",
+   "Astrid",
+   "Avery",
+   
+   "Beethoven",
+   "Billy",
+   "Bob",
+   "Bundy",
+   
+   "Candy",   
+   "Carsten",
+   
+   "Danny",
+   "Dennis",
+   "Dirk",
+   "Doug",
+   
+   "Edmond",
+   "Erik",
+   
+   "Fernando",
+   "Frank",
+   "Frederick",
+   
+   "Gabby",
+   "George",
+   "Gilroy",
+   "Goodrich",
+   "Gumby",
+};
+
+/* setup */
+static void _setup(void)
+{
+   int i;
+   Evas_Object *o;
+   for (i = 0; i < NUM; i++)
+     {
+       o = evas_object_image_filled_add(evas);
+       o_images[i] = o;
+        evas_object_image_border_set(o, 2, 2, 2, 2);
+        evas_object_image_file_set(o, build_path("pan.png"), NULL);
+       evas_object_resize(o, win_w, ICON_SIZE);
+       evas_object_show(o);
+        
+       o = evas_object_image_filled_add(evas);
+       o_icons[i] = o;
+        evas_object_image_border_set(o, 2, 2, 2, 2);
+        evas_object_image_file_set(o, build_path(icons[i % 13]), NULL);
+       evas_object_resize(o, ICON_SIZE - 8, ICON_SIZE - 8);
+       evas_object_show(o);
+        
+        o = evas_object_text_add(evas);
+        o_texts[i] = o;
+        evas_object_text_font_set(o, "Vera-Bold", 10);
+        evas_object_text_text_set(o, labels[i % 26]);
+        evas_object_color_set(o, 0, 0, 0, 255);
+        evas_object_show(o);
+     }
+   for (i = 0; i < NUM; i++)
+     {
+        evas_object_raise(o_images[i]);
+     }
+   for (i = 0; i < NUM; i++)
+     {
+        evas_object_raise(o_icons[i]);
+     }
+   for (i = 0; i < NUM; i++)
+     {
+        if (i > 13) evas_object_stack_above(o_icons[i], o_icons[i - 13]);
+     }
+   for (i = 0; i < NUM; i++)
+     {
+        evas_object_raise(o_texts[i]);
+     }
+   done = 0;
+}
+
+/* cleanup */
+static void _cleanup(void)
+{
+   int i;
+   for (i = 0; i < NUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < NUM; i++) evas_object_del(o_icons[i]);
+   for (i = 0; i < NUM; i++) evas_object_del(o_texts[i]);
+}
+
+/* loop - do things */
+static void _loop(double t, int f)
+{
+   int i;
+   Evas_Coord x, y, w, h, tw, th, cent;
+   x = 0;
+   y = 0 - f;
+   w = win_w;
+   h = ICON_SIZE;
+   for (i = 0; i < NUM; i++)
+     {
+       evas_object_move(o_images[i], x, y);
+       evas_object_move(o_icons[i], x + 4, y + 4);
+        evas_object_geometry_get(o_texts[i], NULL, NULL, &tw, &th);
+        cent = (ICON_SIZE - th) / 2;
+       evas_object_move(o_texts[i], x + 8 + ICON_SIZE + 8, y + cent);
+        y += ICON_SIZE;
+     }
+   FPS_STD(NAME);
+}
+
+/* prepend special key handlers if interactive (before STD) */
+static void _key(char *key)
+{
+   KEY_STD;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+/* template stuff - ignore */
+# endif
+#endif
+
+#ifdef UI
+_ui_menu_item_add(ICON, NAME, FNAME);
+#endif
+
+#ifdef PROTO
+void FNAME(void);
+#endif
+
+#ifndef PROTO
+# ifndef UI
+void FNAME(void)
+{
+   ui_func_set(_key, _loop);
+   _setup();
+}
+# endif
+#endif
+#undef FNAME
+#undef NAME
+#undef ICON