aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/libraries/edje
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/edje')
-rw-r--r--libraries/edje/AUTHORS1
-rw-r--r--libraries/edje/ChangeLog111
-rw-r--r--libraries/edje/Makefile.in2
-rw-r--r--libraries/edje/NEWS15
-rw-r--r--libraries/edje/README3
-rw-r--r--libraries/edje/aclocal.m464
-rwxr-xr-xlibraries/edje/config.guess149
-rwxr-xr-xlibraries/edje/config.sub47
-rwxr-xr-xlibraries/edje/configure2028
-rw-r--r--libraries/edje/configure.ac51
-rw-r--r--libraries/edje/data/Makefile.in2
-rw-r--r--libraries/edje/data/include/Makefile.in2
-rw-r--r--libraries/edje/doc/Makefile.in2
-rw-r--r--libraries/edje/edje.spec2
-rwxr-xr-xlibraries/edje/ltmain.sh4
-rw-r--r--libraries/edje/m4/efl_binary.m427
-rw-r--r--libraries/edje/src/Makefile.in2
-rw-r--r--libraries/edje/src/bin/Makefile.in2
-rw-r--r--libraries/edje/src/bin/edje_cc.h2
-rw-r--r--libraries/edje/src/bin/edje_cc_handlers.c251
-rw-r--r--libraries/edje/src/bin/edje_cc_mem.c10
-rw-r--r--libraries/edje/src/bin/edje_cc_out.c168
-rw-r--r--libraries/edje/src/bin/edje_inspector.c10
-rw-r--r--libraries/edje/src/bin/edje_player.c8
-rw-r--r--libraries/edje/src/bin/epp/Makefile.in2
-rw-r--r--libraries/edje/src/examples/Makefile.am38
-rw-r--r--libraries/edje/src/examples/Makefile.in45
-rw-r--r--libraries/edje/src/examples/edje-animations.c125
-rw-r--r--libraries/edje/src/examples/edje-basic.c107
-rw-r--r--libraries/edje/src/examples/edje-box.c185
-rw-r--r--libraries/edje/src/examples/edje-box2.c187
-rw-r--r--libraries/edje/src/examples/edje-color-class.c140
-rw-r--r--libraries/edje/src/examples/edje-drag.c175
-rw-r--r--libraries/edje/src/examples/edje-perspective.c132
-rw-r--r--libraries/edje/src/examples/edje-signals-messages.c112
-rw-r--r--libraries/edje/src/examples/edje-swallow.c73
-rw-r--r--libraries/edje/src/examples/edje-table.c101
-rw-r--r--libraries/edje/src/examples/edje-text.c65
-rw-r--r--libraries/edje/src/examples/sigtest.c110
-rw-r--r--libraries/edje/src/lib/Edje.h585
-rw-r--r--libraries/edje/src/lib/Makefile.in2
-rw-r--r--libraries/edje/src/lib/edje_cache.c6
-rw-r--r--libraries/edje/src/lib/edje_calc.c74
-rw-r--r--libraries/edje/src/lib/edje_data.c3
-rw-r--r--libraries/edje/src/lib/edje_entry.c462
-rw-r--r--libraries/edje/src/lib/edje_load.c29
-rw-r--r--libraries/edje/src/lib/edje_lua2.c38
-rw-r--r--libraries/edje/src/lib/edje_main.c5
-rw-r--r--libraries/edje/src/lib/edje_multisense.c5
-rw-r--r--libraries/edje/src/lib/edje_private.h76
-rw-r--r--libraries/edje/src/lib/edje_program.c86
-rw-r--r--libraries/edje/src/lib/edje_util.c546
-rw-r--r--libraries/edje/src/modules/Makefile.in2
-rw-r--r--libraries/edje/src/modules/alsa_snd_player/Makefile.in2
-rw-r--r--libraries/edje/src/modules/eet_snd_reader/Makefile.in2
-rw-r--r--libraries/edje/src/modules/multisense_factory/Makefile.in2
-rw-r--r--libraries/edje/src/tests/Makefile.in2
-rw-r--r--libraries/edje/utils/Makefile.in2
58 files changed, 4224 insertions, 2265 deletions
diff --git a/libraries/edje/AUTHORS b/libraries/edje/AUTHORS
index e60e979..893fb07 100644
--- a/libraries/edje/AUTHORS
+++ b/libraries/edje/AUTHORS
@@ -21,3 +21,4 @@ billiob (Boris Faure) <billiob@gmail.com>
21Govindaraju SM <govi.sm@samsung.com> <govism@gmail.com> 21Govindaraju SM <govi.sm@samsung.com> <govism@gmail.com>
22Prince Kumar Dubey <prince.dubey@samsung.com> <prince.dubey@gmail.com> 22Prince Kumar Dubey <prince.dubey@samsung.com> <prince.dubey@gmail.com>
23David Seikel <onefang at gmail.com> 23David Seikel <onefang at gmail.com>
24Mikael Sans <sans.mikael@gmail.com> \ No newline at end of file
diff --git a/libraries/edje/ChangeLog b/libraries/edje/ChangeLog
index ae65d85..87de11e 100644
--- a/libraries/edje/ChangeLog
+++ b/libraries/edje/ChangeLog
@@ -285,3 +285,114 @@
2852012-01-14 Carsten Haitzler (The Rasterman) 2852012-01-14 Carsten Haitzler (The Rasterman)
286 286
287 * Added minmul propery for edje to multiply minimum size during min size calc 287 * Added minmul propery for edje to multiply minimum size during min size calc
288
2892012-01-20 Carsten Haitzler (The Rasterman)
290
291 * Fix the ability to change the edje file source of an edje object
292 inside a callback - it worked but you couldn't swallow/set text etc.
293
2942012-01-03 Tom Hacohen (TAsn)
295
296 * Entry: Added edje_object_part_text_style_user_set/get that'll use
297 the new corresponding textblock functions.
298
2992012-01-23 Cedric Bail
300
301 * Fix overridding group in edje_cc by fixing with the right index.
302
3032012-01-24 Cedric Bail
304
305 * Filter should only be valid once all program affecting there part are done.
306
3072012-01-25 Cedric Bail
308
309 * Only store the image used by active group.
310
3112012-01-26 Cedric Bail
312
313 * Add min: SOURCE, max: SOURCE.
314
3152012-02-03 Jihoon Kim
316
317 * Entry: Fix to work edje_object_part_text_input_panel_enabled_set/get well
318 even though ecore_imf doesn't exist or immodule isn't used.
319
3202012-02-07 WooHyun Jung
321
322 * Added edje_object_markup_filter_callback_{add,del,del_full}.
323 These let you append(delete) markup filter functions for filtering
324 inserted text.
325
3262012-02-08 Cedric Bail
327
328 * Fix bug when using EDJE_CALC_CACHE and using relative to x and y
329 on separate part.
330 * Fix bug with filter preventing any action to be triggered.
331
3322012-02-10 Cedric Bail
333
334 * Prevent propagation of signal, when there is a matching target with edje GROUP.
335
3362012-02-13 Jihoon Kim
337
338 * add edje_object_part_text_input_panel_show/hide.
339 These APIs can be used in input panel manual control mode.
340 * add edje_object_part_text_imf_context_reset that will use
341 for reseting the input method context.
342
3432012-02-14 Jihoon Kim
344
345 * add edje_object_part_text_prediction_allow_set/get.
346 These APIs can be used to set whether prediction feature is allowed or not.
347
3482012-02-14 Cedric Bail
349
350 * add a way to disable signal broadcasting introduced in edje 1.1.
351
3522012-02-15 Jihoon Kim
353
354 * add edje_object_part_text_input_panel_language_set/get
355 edje_object_part_text_input_panel_imdata_set/get
356 edje_object_part_text_input_panel_return_key_type_set/get
357 edje_object_part_text_input_panel_return_key_disabled_set/get
358
3592012-02-20 WooHyun Jung
360
361 * Change API names from edje_object_markup_filter_callback_{add,del,del_full}.
362 to edje_object_text_markup_filter_callback_{add,del,del_full}.
363
3642012-02-24 Jihoon Kim
365
366 * add edje_object_part_text_imf_context_get for getting Ecore_IMF_Context handle in edje text object
367
3682012-02-29 Tom Hacohen (TAsn)
369
370 * Entry: Added edje_object_part_text_user_insert.
371 This function inserts text as if the user has inserted it.
372 This means it actually registers as a change and etc.
373
3742012-03-06 Mikael Sans (XHeLL)
375
376 * Entry: Added double click and triple click.
377 Double click selects a word.
378 Triple click selects a line.
379
3802012-03-07 Tom Hacohen (TAsn)
381
382 * Entry: Replaced edje_object_part_text_style_user_set/get
383 with edje_object_part_text_style_user_set/get to correspond to
384 textblock's recent changes.
385
3862012-03-07 Cedric Bail
387
388 * Correctly count and propagate preload signal with GROUP.
389 * Fix rotation with fixed point.
390
3912012-03-11 Cedric Bail
392
393 * Propagate scale factor to GROUP's part.
394
3952012-03-12 Cedric Bail
396
397 * Make it possible for edje to update size hint automatically.
398 * Add min: SOURCE to GROUP's part.
diff --git a/libraries/edje/Makefile.in b/libraries/edje/Makefile.in
index b63286c..2666156 100644
--- a/libraries/edje/Makefile.in
+++ b/libraries/edje/Makefile.in
@@ -236,6 +236,8 @@ PACKAGE_URL = @PACKAGE_URL@
236PACKAGE_VERSION = @PACKAGE_VERSION@ 236PACKAGE_VERSION = @PACKAGE_VERSION@
237PATH_SEPARATOR = @PATH_SEPARATOR@ 237PATH_SEPARATOR = @PATH_SEPARATOR@
238PKG_CONFIG = @PKG_CONFIG@ 238PKG_CONFIG = @PKG_CONFIG@
239PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
240PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
239PYTHON = @PYTHON@ 241PYTHON = @PYTHON@
240PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 242PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
241PYTHON_PLATFORM = @PYTHON_PLATFORM@ 243PYTHON_PLATFORM = @PYTHON_PLATFORM@
diff --git a/libraries/edje/NEWS b/libraries/edje/NEWS
index bf529dc..3f6dbe9 100644
--- a/libraries/edje/NEWS
+++ b/libraries/edje/NEWS
@@ -5,10 +5,15 @@ Changes since Edje 1.1.0:
5 5
6Additions: 6Additions:
7 7
8 * "recalc" smart callback for object size changes 8 * "recalc" smart callback for object size changes.
9 * EDJE_ASPECT_PREFER_SOURCE. 9 * EDJE_ASPECT_PREFER_SOURCE.
10 * edje.version() Lua function. 10 * edje.version() Lua function.
11 * minmul edc property 11 * minmul edc property.
12 * add min: SOURCE and max: SOURCE to IMAGE and GROUP parts.
13 * add edje_object_markup_filter_callback_add/del/delfull().
14 * add broadcast_signal: bool.
15 * add edje_object_part_text_imf_context_get()
16 * add edje_object_update_hints_set() and edje_object_update_hints_get()
12 17
13Improvements: 18Improvements:
14 * speedup load time of Edje file. 19 * speedup load time of Edje file.
@@ -16,6 +21,12 @@ Improvements:
16 * reduce number of call to stat during edje_object_file_set. 21 * reduce number of call to stat during edje_object_file_set.
17 * unswallow object about to be swallowed if necessary. 22 * unswallow object about to be swallowed if necessary.
18 * Lua scripts now more resilient against API changes. 23 * Lua scripts now more resilient against API changes.
24 * edje_cc only store the image activelly used in an edje file.
25
26Fixes:
27 * Correctly count and propagate preload signal with GROUP.
28 * Fix rotation with fixed point.
29 * Correctly propagate scale factor to GROUP.
19 30
20Changes since Edje 1.0.0: 31Changes since Edje 1.0.0:
21------------------------- 32-------------------------
diff --git a/libraries/edje/README b/libraries/edje/README
index 3cf9a65..9af4e36 100644
--- a/libraries/edje/README
+++ b/libraries/edje/README
@@ -1,4 +1,4 @@
1Edje 1.1.0 1Edje 1.2.0
2 2
3****************************************************************************** 3******************************************************************************
4 4
@@ -12,7 +12,6 @@ Requirements:
12 12
13Must: 13Must:
14 libc 14 libc
15 libm
16 eet (at least 1.5.0) 15 eet (at least 1.5.0)
17 ecore (at least 1.1.0) 16 ecore (at least 1.1.0)
18 ecore-evas (at least 1.1.0) 17 ecore-evas (at least 1.1.0)
diff --git a/libraries/edje/aclocal.m4 b/libraries/edje/aclocal.m4
index a809f4b..23ca0ef 100644
--- a/libraries/edje/aclocal.m4
+++ b/libraries/edje/aclocal.m4
@@ -13,13 +13,14 @@
13 13
14m4_ifndef([AC_AUTOCONF_VERSION], 14m4_ifndef([AC_AUTOCONF_VERSION],
15 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl 15 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
16m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, 16m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
17[m4_warning([this file was generated for autoconf 2.65. 17[m4_warning([this file was generated for autoconf 2.67.
18You have another version of autoconf. It may work, but is not guaranteed to. 18You have another version of autoconf. It may work, but is not guaranteed to.
19If you have problems, you may need to regenerate the build system entirely. 19If you have problems, you may need to regenerate the build system entirely.
20To do so, use the procedure documented by the package, typically `autoreconf'.])]) 20To do so, use the procedure documented by the package, typically `autoreconf'.])])
21 21
22# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- 22# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
23# serial 1 (pkg-config-0.24)
23# 24#
24# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. 25# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
25# 26#
@@ -47,7 +48,10 @@ To do so, use the procedure documented by the package, typically `autoreconf'.])
47AC_DEFUN([PKG_PROG_PKG_CONFIG], 48AC_DEFUN([PKG_PROG_PKG_CONFIG],
48[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) 49[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
49m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) 50m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
50AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl 51AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
52AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
53AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
54
51if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then 55if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
52 AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) 56 AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
53fi 57fi
@@ -60,7 +64,6 @@ if test -n "$PKG_CONFIG"; then
60 AC_MSG_RESULT([no]) 64 AC_MSG_RESULT([no])
61 PKG_CONFIG="" 65 PKG_CONFIG=""
62 fi 66 fi
63
64fi[]dnl 67fi[]dnl
65])# PKG_PROG_PKG_CONFIG 68])# PKG_PROG_PKG_CONFIG
66 69
@@ -69,34 +72,31 @@ fi[]dnl
69# Check to see whether a particular set of modules exists. Similar 72# Check to see whether a particular set of modules exists. Similar
70# to PKG_CHECK_MODULES(), but does not set variables or print errors. 73# to PKG_CHECK_MODULES(), but does not set variables or print errors.
71# 74#
72# 75# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
73# Similar to PKG_CHECK_MODULES, make sure that the first instance of 76# only at the first occurence in configure.ac, so if the first place
74# this or PKG_CHECK_MODULES is called, or make sure to call 77# it's called might be skipped (such as if it is within an "if", you
75# PKG_CHECK_EXISTS manually 78# have to call PKG_CHECK_EXISTS manually
76# -------------------------------------------------------------- 79# --------------------------------------------------------------
77AC_DEFUN([PKG_CHECK_EXISTS], 80AC_DEFUN([PKG_CHECK_EXISTS],
78[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 81[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
79if test -n "$PKG_CONFIG" && \ 82if test -n "$PKG_CONFIG" && \
80 AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then 83 AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
81 m4_ifval([$2], [$2], [:]) 84 m4_default([$2], [:])
82m4_ifvaln([$3], [else 85m4_ifvaln([$3], [else
83 $3])dnl 86 $3])dnl
84fi]) 87fi])
85 88
86
87# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) 89# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
88# --------------------------------------------- 90# ---------------------------------------------
89m4_define([_PKG_CONFIG], 91m4_define([_PKG_CONFIG],
90[if test -n "$PKG_CONFIG"; then 92[if test -n "$$1"; then
91 if test -n "$$1"; then 93 pkg_cv_[]$1="$$1"
92 pkg_cv_[]$1="$$1" 94 elif test -n "$PKG_CONFIG"; then
93 else 95 PKG_CHECK_EXISTS([$3],
94 PKG_CHECK_EXISTS([$3], 96 [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
95 [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], 97 [pkg_failed=yes])
96 [pkg_failed=yes]) 98 else
97 fi 99 pkg_failed=untried
98else
99 pkg_failed=untried
100fi[]dnl 100fi[]dnl
101])# _PKG_CONFIG 101])# _PKG_CONFIG
102 102
@@ -138,16 +138,17 @@ and $1[]_LIBS to avoid the need to call pkg-config.
138See the pkg-config man page for more details.]) 138See the pkg-config man page for more details.])
139 139
140if test $pkg_failed = yes; then 140if test $pkg_failed = yes; then
141 AC_MSG_RESULT([no])
141 _PKG_SHORT_ERRORS_SUPPORTED 142 _PKG_SHORT_ERRORS_SUPPORTED
142 if test $_pkg_short_errors_supported = yes; then 143 if test $_pkg_short_errors_supported = yes; then
143 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` 144 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
144 else 145 else
145 $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` 146 $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
146 fi 147 fi
147 # Put the nasty error message in config.log where it belongs 148 # Put the nasty error message in config.log where it belongs
148 echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD 149 echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
149 150
150 ifelse([$4], , [AC_MSG_ERROR(dnl 151 m4_default([$4], [AC_MSG_ERROR(
151[Package requirements ($2) were not met: 152[Package requirements ($2) were not met:
152 153
153$$1_PKG_ERRORS 154$$1_PKG_ERRORS
@@ -155,25 +156,24 @@ $$1_PKG_ERRORS
155Consider adjusting the PKG_CONFIG_PATH environment variable if you 156Consider adjusting the PKG_CONFIG_PATH environment variable if you
156installed software in a non-standard prefix. 157installed software in a non-standard prefix.
157 158
158_PKG_TEXT 159_PKG_TEXT])[]dnl
159])], 160 ])
160 [AC_MSG_RESULT([no])
161 $4])
162elif test $pkg_failed = untried; then 161elif test $pkg_failed = untried; then
163 ifelse([$4], , [AC_MSG_FAILURE(dnl 162 AC_MSG_RESULT([no])
163 m4_default([$4], [AC_MSG_FAILURE(
164[The pkg-config script could not be found or is too old. Make sure it 164[The pkg-config script could not be found or is too old. Make sure it
165is in your PATH or set the PKG_CONFIG environment variable to the full 165is in your PATH or set the PKG_CONFIG environment variable to the full
166path to pkg-config. 166path to pkg-config.
167 167
168_PKG_TEXT 168_PKG_TEXT
169 169
170To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], 170To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
171 [$4]) 171 ])
172else 172else
173 $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS 173 $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
174 $1[]_LIBS=$pkg_cv_[]$1[]_LIBS 174 $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
175 AC_MSG_RESULT([yes]) 175 AC_MSG_RESULT([yes])
176 ifelse([$3], , :, [$3]) 176 $3
177fi[]dnl 177fi[]dnl
178])# PKG_CHECK_MODULES 178])# PKG_CHECK_MODULES
179 179
@@ -968,7 +968,7 @@ AC_DEFUN([AM_PATH_PYTHON],
968 dnl Find a Python interpreter. Python versions prior to 2.0 are not 968 dnl Find a Python interpreter. Python versions prior to 2.0 are not
969 dnl supported. (2.0 was released on October 16, 2000). 969 dnl supported. (2.0 was released on October 16, 2000).
970 m4_define_default([_AM_PYTHON_INTERPRETER_LIST], 970 m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
971 [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl 971 [python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl
972python2.1 python2.0]) 972python2.1 python2.0])
973 973
974 m4_if([$1],[],[ 974 m4_if([$1],[],[
diff --git a/libraries/edje/config.guess b/libraries/edje/config.guess
index e3a2116..c2246a4 100755
--- a/libraries/edje/config.guess
+++ b/libraries/edje/config.guess
@@ -1,10 +1,10 @@
1#! /bin/sh 1#! /bin/sh
2# Attempt to guess a canonical system name. 2# Attempt to guess a canonical system name.
3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 4# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
5# Free Software Foundation, Inc. 5# Free Software Foundation, Inc.
6 6
7timestamp='2009-06-10' 7timestamp='2009-12-30'
8 8
9# This file is free software; you can redistribute it and/or modify it 9# This file is free software; you can redistribute it and/or modify it
10# under the terms of the GNU General Public License as published by 10# under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@ timestamp='2009-06-10'
27# the same distribution terms that you use for the rest of that program. 27# the same distribution terms that you use for the rest of that program.
28 28
29 29
30# Originally written by Per Bothner <per@bothner.com>. 30# Originally written by Per Bothner. Please send patches (context
31# Please send patches to <config-patches@gnu.org>. Submit a context 31# diff format) to <config-patches@gnu.org> and include a ChangeLog
32# diff and a properly formatted ChangeLog entry. 32# entry.
33# 33#
34# This script attempts to guess a canonical system name similar to 34# This script attempts to guess a canonical system name similar to
35# config.sub. If it succeeds, it prints the system name on stdout, and 35# config.sub. If it succeeds, it prints the system name on stdout, and
36# exits with 0. Otherwise, it exits with 1. 36# exits with 0. Otherwise, it exits with 1.
37# 37#
38# The plan is that this can be called by configure scripts if you 38# You can get the latest version of this script from:
39# don't specify an explicit build system type. 39# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
40 40
41me=`echo "$0" | sed -e 's,.*/,,'` 41me=`echo "$0" | sed -e 's,.*/,,'`
42 42
@@ -56,8 +56,9 @@ version="\
56GNU config.guess ($timestamp) 56GNU config.guess ($timestamp)
57 57
58Originally written by Per Bothner. 58Originally written by Per Bothner.
59Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 59Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
602002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. 602001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
61Software Foundation, Inc.
61 62
62This is free software; see the source for copying conditions. There is NO 63This is free software; see the source for copying conditions. There is NO
63warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." 64warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -333,6 +334,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
333 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) 334 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
334 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 335 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
335 exit ;; 336 exit ;;
337 i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
338 echo i386-pc-auroraux${UNAME_RELEASE}
339 exit ;;
336 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) 340 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
337 eval $set_cc_for_build 341 eval $set_cc_for_build
338 SUN_ARCH="i386" 342 SUN_ARCH="i386"
@@ -807,12 +811,12 @@ EOF
807 i*:PW*:*) 811 i*:PW*:*)
808 echo ${UNAME_MACHINE}-pc-pw32 812 echo ${UNAME_MACHINE}-pc-pw32
809 exit ;; 813 exit ;;
810 *:Interix*:[3456]*) 814 *:Interix*:*)
811 case ${UNAME_MACHINE} in 815 case ${UNAME_MACHINE} in
812 x86) 816 x86)
813 echo i586-pc-interix${UNAME_RELEASE} 817 echo i586-pc-interix${UNAME_RELEASE}
814 exit ;; 818 exit ;;
815 EM64T | authenticamd | genuineintel) 819 authenticamd | genuineintel | EM64T)
816 echo x86_64-unknown-interix${UNAME_RELEASE} 820 echo x86_64-unknown-interix${UNAME_RELEASE}
817 exit ;; 821 exit ;;
818 IA64) 822 IA64)
@@ -854,6 +858,20 @@ EOF
854 i*86:Minix:*:*) 858 i*86:Minix:*:*)
855 echo ${UNAME_MACHINE}-pc-minix 859 echo ${UNAME_MACHINE}-pc-minix
856 exit ;; 860 exit ;;
861 alpha:Linux:*:*)
862 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
863 EV5) UNAME_MACHINE=alphaev5 ;;
864 EV56) UNAME_MACHINE=alphaev56 ;;
865 PCA56) UNAME_MACHINE=alphapca56 ;;
866 PCA57) UNAME_MACHINE=alphapca56 ;;
867 EV6) UNAME_MACHINE=alphaev6 ;;
868 EV67) UNAME_MACHINE=alphaev67 ;;
869 EV68*) UNAME_MACHINE=alphaev68 ;;
870 esac
871 objdump --private-headers /bin/sh | grep -q ld.so.1
872 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
873 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
874 exit ;;
857 arm*:Linux:*:*) 875 arm*:Linux:*:*)
858 eval $set_cc_for_build 876 eval $set_cc_for_build
859 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ 877 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -876,6 +894,17 @@ EOF
876 frv:Linux:*:*) 894 frv:Linux:*:*)
877 echo frv-unknown-linux-gnu 895 echo frv-unknown-linux-gnu
878 exit ;; 896 exit ;;
897 i*86:Linux:*:*)
898 LIBC=gnu
899 eval $set_cc_for_build
900 sed 's/^ //' << EOF >$dummy.c
901 #ifdef __dietlibc__
902 LIBC=dietlibc
903 #endif
904EOF
905 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
906 echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
907 exit ;;
879 ia64:Linux:*:*) 908 ia64:Linux:*:*)
880 echo ${UNAME_MACHINE}-unknown-linux-gnu 909 echo ${UNAME_MACHINE}-unknown-linux-gnu
881 exit ;; 910 exit ;;
@@ -901,39 +930,18 @@ EOF
901 #endif 930 #endif
902 #endif 931 #endif
903EOF 932EOF
904 eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' 933 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
905 /^CPU/{
906 s: ::g
907 p
908 }'`"
909 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } 934 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
910 ;; 935 ;;
911 or32:Linux:*:*) 936 or32:Linux:*:*)
912 echo or32-unknown-linux-gnu 937 echo or32-unknown-linux-gnu
913 exit ;; 938 exit ;;
914 ppc:Linux:*:*)
915 echo powerpc-unknown-linux-gnu
916 exit ;;
917 ppc64:Linux:*:*)
918 echo powerpc64-unknown-linux-gnu
919 exit ;;
920 alpha:Linux:*:*)
921 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
922 EV5) UNAME_MACHINE=alphaev5 ;;
923 EV56) UNAME_MACHINE=alphaev56 ;;
924 PCA56) UNAME_MACHINE=alphapca56 ;;
925 PCA57) UNAME_MACHINE=alphapca56 ;;
926 EV6) UNAME_MACHINE=alphaev6 ;;
927 EV67) UNAME_MACHINE=alphaev67 ;;
928 EV68*) UNAME_MACHINE=alphaev68 ;;
929 esac
930 objdump --private-headers /bin/sh | grep -q ld.so.1
931 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
932 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
933 exit ;;
934 padre:Linux:*:*) 939 padre:Linux:*:*)
935 echo sparc-unknown-linux-gnu 940 echo sparc-unknown-linux-gnu
936 exit ;; 941 exit ;;
942 parisc64:Linux:*:* | hppa64:Linux:*:*)
943 echo hppa64-unknown-linux-gnu
944 exit ;;
937 parisc:Linux:*:* | hppa:Linux:*:*) 945 parisc:Linux:*:* | hppa:Linux:*:*)
938 # Look for CPU level 946 # Look for CPU level
939 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in 947 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -942,8 +950,11 @@ EOF
942 *) echo hppa-unknown-linux-gnu ;; 950 *) echo hppa-unknown-linux-gnu ;;
943 esac 951 esac
944 exit ;; 952 exit ;;
945 parisc64:Linux:*:* | hppa64:Linux:*:*) 953 ppc64:Linux:*:*)
946 echo hppa64-unknown-linux-gnu 954 echo powerpc64-unknown-linux-gnu
955 exit ;;
956 ppc:Linux:*:*)
957 echo powerpc-unknown-linux-gnu
947 exit ;; 958 exit ;;
948 s390:Linux:*:* | s390x:Linux:*:*) 959 s390:Linux:*:* | s390x:Linux:*:*)
949 echo ${UNAME_MACHINE}-ibm-linux 960 echo ${UNAME_MACHINE}-ibm-linux
@@ -966,58 +977,6 @@ EOF
966 xtensa*:Linux:*:*) 977 xtensa*:Linux:*:*)
967 echo ${UNAME_MACHINE}-unknown-linux-gnu 978 echo ${UNAME_MACHINE}-unknown-linux-gnu
968 exit ;; 979 exit ;;
969 i*86:Linux:*:*)
970 # The BFD linker knows what the default object file format is, so
971 # first see if it will tell us. cd to the root directory to prevent
972 # problems with other programs or directories called `ld' in the path.
973 # Set LC_ALL=C to ensure ld outputs messages in English.
974 ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
975 | sed -ne '/supported targets:/!d
976 s/[ ][ ]*/ /g
977 s/.*supported targets: *//
978 s/ .*//
979 p'`
980 case "$ld_supported_targets" in
981 elf32-i386)
982 TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
983 ;;
984 esac
985 # Determine whether the default compiler is a.out or elf
986 eval $set_cc_for_build
987 sed 's/^ //' << EOF >$dummy.c
988 #include <features.h>
989 #ifdef __ELF__
990 # ifdef __GLIBC__
991 # if __GLIBC__ >= 2
992 LIBC=gnu
993 # else
994 LIBC=gnulibc1
995 # endif
996 # else
997 LIBC=gnulibc1
998 # endif
999 #else
1000 #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
1001 LIBC=gnu
1002 #else
1003 LIBC=gnuaout
1004 #endif
1005 #endif
1006 #ifdef __dietlibc__
1007 LIBC=dietlibc
1008 #endif
1009EOF
1010 eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
1011 /^LIBC/{
1012 s: ::g
1013 p
1014 }'`"
1015 test x"${LIBC}" != x && {
1016 echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
1017 exit
1018 }
1019 test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
1020 ;;
1021 i*86:DYNIX/ptx:4*:*) 980 i*86:DYNIX/ptx:4*:*)
1022 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. 981 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
1023 # earlier versions are messed up and put the nodename in both 982 # earlier versions are messed up and put the nodename in both
@@ -1247,6 +1206,16 @@ EOF
1247 *:Darwin:*:*) 1206 *:Darwin:*:*)
1248 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown 1207 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1249 case $UNAME_PROCESSOR in 1208 case $UNAME_PROCESSOR in
1209 i386)
1210 eval $set_cc_for_build
1211 if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1212 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1213 (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1214 grep IS_64BIT_ARCH >/dev/null
1215 then
1216 UNAME_PROCESSOR="x86_64"
1217 fi
1218 fi ;;
1250 unknown) UNAME_PROCESSOR=powerpc ;; 1219 unknown) UNAME_PROCESSOR=powerpc ;;
1251 esac 1220 esac
1252 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} 1221 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
diff --git a/libraries/edje/config.sub b/libraries/edje/config.sub
index eb0389a..c2d1257 100755
--- a/libraries/edje/config.sub
+++ b/libraries/edje/config.sub
@@ -1,10 +1,10 @@
1#! /bin/sh 1#! /bin/sh
2# Configuration validation subroutine script. 2# Configuration validation subroutine script.
3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 4# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
5# Free Software Foundation, Inc. 5# Free Software Foundation, Inc.
6 6
7timestamp='2009-06-11' 7timestamp='2010-01-22'
8 8
9# This file is (in principle) common to ALL GNU software. 9# This file is (in principle) common to ALL GNU software.
10# The presence of a machine in this file suggests that SOME GNU software 10# The presence of a machine in this file suggests that SOME GNU software
@@ -32,13 +32,16 @@ timestamp='2009-06-11'
32 32
33 33
34# Please send patches to <config-patches@gnu.org>. Submit a context 34# Please send patches to <config-patches@gnu.org>. Submit a context
35# diff and a properly formatted ChangeLog entry. 35# diff and a properly formatted GNU ChangeLog entry.
36# 36#
37# Configuration subroutine to validate and canonicalize a configuration type. 37# Configuration subroutine to validate and canonicalize a configuration type.
38# Supply the specified configuration type as an argument. 38# Supply the specified configuration type as an argument.
39# If it is invalid, we print an error message on stderr and exit with code 1. 39# If it is invalid, we print an error message on stderr and exit with code 1.
40# Otherwise, we print the canonical config type on stdout and succeed. 40# Otherwise, we print the canonical config type on stdout and succeed.
41 41
42# You can get the latest version of this script from:
43# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
44
42# This file is supposed to be the same for all GNU packages 45# This file is supposed to be the same for all GNU packages
43# and recognize all the CPU types, system types and aliases 46# and recognize all the CPU types, system types and aliases
44# that are meaningful with *any* GNU software. 47# that are meaningful with *any* GNU software.
@@ -72,8 +75,9 @@ Report bugs and patches to <config-patches@gnu.org>."
72version="\ 75version="\
73GNU config.sub ($timestamp) 76GNU config.sub ($timestamp)
74 77
75Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 78Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
762002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. 792001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
80Software Foundation, Inc.
77 81
78This is free software; see the source for copying conditions. There is NO 82This is free software; see the source for copying conditions. There is NO
79warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." 83warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -149,7 +153,7 @@ case $os in
149 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ 153 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
150 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ 154 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
151 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ 155 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
152 -apple | -axis | -knuth | -cray) 156 -apple | -axis | -knuth | -cray | -microblaze)
153 os= 157 os=
154 basic_machine=$1 158 basic_machine=$1
155 ;; 159 ;;
@@ -284,6 +288,7 @@ case $basic_machine in
284 | pdp10 | pdp11 | pj | pjl \ 288 | pdp10 | pdp11 | pj | pjl \
285 | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ 289 | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
286 | pyramid \ 290 | pyramid \
291 | rx \
287 | score \ 292 | score \
288 | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ 293 | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
289 | sh64 | sh64le \ 294 | sh64 | sh64le \
@@ -291,13 +296,14 @@ case $basic_machine in
291 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ 296 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
292 | spu | strongarm \ 297 | spu | strongarm \
293 | tahoe | thumb | tic4x | tic80 | tron \ 298 | tahoe | thumb | tic4x | tic80 | tron \
299 | ubicom32 \
294 | v850 | v850e \ 300 | v850 | v850e \
295 | we32k \ 301 | we32k \
296 | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ 302 | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
297 | z8k | z80) 303 | z8k | z80)
298 basic_machine=$basic_machine-unknown 304 basic_machine=$basic_machine-unknown
299 ;; 305 ;;
300 m6811 | m68hc11 | m6812 | m68hc12) 306 m6811 | m68hc11 | m6812 | m68hc12 | picochip)
301 # Motorola 68HC11/12. 307 # Motorola 68HC11/12.
302 basic_machine=$basic_machine-unknown 308 basic_machine=$basic_machine-unknown
303 os=-none 309 os=-none
@@ -340,7 +346,7 @@ case $basic_machine in
340 | lm32-* \ 346 | lm32-* \
341 | m32c-* | m32r-* | m32rle-* \ 347 | m32c-* | m32r-* | m32rle-* \
342 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ 348 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
343 | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ 349 | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
344 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ 350 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
345 | mips16-* \ 351 | mips16-* \
346 | mips64-* | mips64el-* \ 352 | mips64-* | mips64el-* \
@@ -368,15 +374,17 @@ case $basic_machine in
368 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ 374 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
369 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ 375 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
370 | pyramid-* \ 376 | pyramid-* \
371 | romp-* | rs6000-* \ 377 | romp-* | rs6000-* | rx-* \
372 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ 378 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
373 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ 379 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
374 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ 380 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
375 | sparclite-* \ 381 | sparclite-* \
376 | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ 382 | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
377 | tahoe-* | thumb-* \ 383 | tahoe-* | thumb-* \
378 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ 384 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
385 | tile-* | tilegx-* \
379 | tron-* \ 386 | tron-* \
387 | ubicom32-* \
380 | v850-* | v850e-* | vax-* \ 388 | v850-* | v850e-* | vax-* \
381 | we32k-* \ 389 | we32k-* \
382 | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ 390 | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -726,6 +734,9 @@ case $basic_machine in
726 basic_machine=ns32k-utek 734 basic_machine=ns32k-utek
727 os=-sysv 735 os=-sysv
728 ;; 736 ;;
737 microblaze)
738 basic_machine=microblaze-xilinx
739 ;;
729 mingw32) 740 mingw32)
730 basic_machine=i386-pc 741 basic_machine=i386-pc
731 os=-mingw32 742 os=-mingw32
@@ -1076,6 +1087,11 @@ case $basic_machine in
1076 basic_machine=tic6x-unknown 1087 basic_machine=tic6x-unknown
1077 os=-coff 1088 os=-coff
1078 ;; 1089 ;;
1090 # This must be matched before tile*.
1091 tilegx*)
1092 basic_machine=tilegx-unknown
1093 os=-linux-gnu
1094 ;;
1079 tile*) 1095 tile*)
1080 basic_machine=tile-unknown 1096 basic_machine=tile-unknown
1081 os=-linux-gnu 1097 os=-linux-gnu
@@ -1247,6 +1263,9 @@ case $os in
1247 # First match some system type aliases 1263 # First match some system type aliases
1248 # that might get confused with valid system types. 1264 # that might get confused with valid system types.
1249 # -solaris* is a basic system type, with this one exception. 1265 # -solaris* is a basic system type, with this one exception.
1266 -auroraux)
1267 os=-auroraux
1268 ;;
1250 -solaris1 | -solaris1.*) 1269 -solaris1 | -solaris1.*)
1251 os=`echo $os | sed -e 's|solaris1|sunos4|'` 1270 os=`echo $os | sed -e 's|solaris1|sunos4|'`
1252 ;; 1271 ;;
@@ -1268,8 +1287,8 @@ case $os in
1268 # -sysv* is not here because it comes later, after sysvr4. 1287 # -sysv* is not here because it comes later, after sysvr4.
1269 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ 1288 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
1270 | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ 1289 | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
1271 | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ 1290 | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
1272 | -kopensolaris* \ 1291 | -sym* | -kopensolaris* \
1273 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ 1292 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1274 | -aos* | -aros* \ 1293 | -aos* | -aros* \
1275 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ 1294 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1290,7 +1309,7 @@ case $os in
1290 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ 1309 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1291 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ 1310 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1292 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ 1311 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1293 | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) 1312 | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
1294 # Remember, each alternative MUST END IN *, to match a version number. 1313 # Remember, each alternative MUST END IN *, to match a version number.
1295 ;; 1314 ;;
1296 -qnx*) 1315 -qnx*)
@@ -1423,6 +1442,8 @@ case $os in
1423 -dicos*) 1442 -dicos*)
1424 os=-dicos 1443 os=-dicos
1425 ;; 1444 ;;
1445 -nacl*)
1446 ;;
1426 -none) 1447 -none)
1427 ;; 1448 ;;
1428 *) 1449 *)
diff --git a/libraries/edje/configure b/libraries/edje/configure
index c763308..aafa1b0 100755
--- a/libraries/edje/configure
+++ b/libraries/edje/configure
@@ -1,13 +1,13 @@
1#! /bin/sh 1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles. 2# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.65 for edje 1.1.99.67344. 3# Generated by GNU Autoconf 2.67 for edje 1.2.0-alpha.
4# 4#
5# Report bugs to <enlightenment-devel@lists.sourceforge.net>. 5# Report bugs to <enlightenment-devel@lists.sourceforge.net>.
6# 6#
7# 7#
8# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 8# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
9# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, 9# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
10# Inc. 10# Foundation, Inc.
11# 11#
12# 12#
13# This configure script is free software; the Free Software Foundation 13# This configure script is free software; the Free Software Foundation
@@ -319,7 +319,7 @@ $as_echo X"$as_dir" |
319 test -d "$as_dir" && break 319 test -d "$as_dir" && break
320 done 320 done
321 test -z "$as_dirs" || eval "mkdir $as_dirs" 321 test -z "$as_dirs" || eval "mkdir $as_dirs"
322 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 322 } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
323 323
324 324
325} # as_fn_mkdir_p 325} # as_fn_mkdir_p
@@ -359,19 +359,19 @@ else
359fi # as_fn_arith 359fi # as_fn_arith
360 360
361 361
362# as_fn_error ERROR [LINENO LOG_FD] 362# as_fn_error STATUS ERROR [LINENO LOG_FD]
363# --------------------------------- 363# ----------------------------------------
364# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 364# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
365# provided, also output the error to LOG_FD, referencing LINENO. Then exit the 365# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
366# script with status $?, using 1 if that was 0. 366# script with STATUS, using 1 if that was 0.
367as_fn_error () 367as_fn_error ()
368{ 368{
369 as_status=$?; test $as_status -eq 0 && as_status=1 369 as_status=$1; test $as_status -eq 0 && as_status=1
370 if test "$3"; then 370 if test "$4"; then
371 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 371 as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
372 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 372 $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
373 fi 373 fi
374 $as_echo "$as_me: error: $1" >&2 374 $as_echo "$as_me: error: $2" >&2
375 as_fn_exit $as_status 375 as_fn_exit $as_status
376} # as_fn_error 376} # as_fn_error
377 377
@@ -682,7 +682,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null
682exec 6>&1 682exec 6>&1
683 683
684# Name of the host. 684# Name of the host.
685# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, 685# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
686# so uname gets run too. 686# so uname gets run too.
687ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` 687ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
688 688
@@ -701,8 +701,8 @@ MAKEFLAGS=
701# Identity of this package. 701# Identity of this package.
702PACKAGE_NAME='edje' 702PACKAGE_NAME='edje'
703PACKAGE_TARNAME='edje' 703PACKAGE_TARNAME='edje'
704PACKAGE_VERSION='1.1.99.67344' 704PACKAGE_VERSION='1.2.0-alpha'
705PACKAGE_STRING='edje 1.1.99.67344' 705PACKAGE_STRING='edje 1.2.0-alpha'
706PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net' 706PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net'
707PACKAGE_URL='' 707PACKAGE_URL=''
708 708
@@ -750,7 +750,6 @@ LIBOBJS
750requirement_edje 750requirement_edje
751BUILD_EXAMPLES_FALSE 751BUILD_EXAMPLES_FALSE
752BUILD_EXAMPLES_TRUE 752BUILD_EXAMPLES_TRUE
753edje_cc
754EFL_ENABLE_COVERAGE_FALSE 753EFL_ENABLE_COVERAGE_FALSE
755EFL_ENABLE_COVERAGE_TRUE 754EFL_ENABLE_COVERAGE_TRUE
756EFL_COVERAGE_LIBS 755EFL_COVERAGE_LIBS
@@ -806,6 +805,8 @@ EFL_EDJE_BUILD
806EVIL_LIBS 805EVIL_LIBS
807EVIL_CFLAGS 806EVIL_CFLAGS
808pkgconfig_requires_private 807pkgconfig_requires_private
808PKG_CONFIG_LIBDIR
809PKG_CONFIG_PATH
809PKG_CONFIG 810PKG_CONFIG
810HAVE_PYTHON_FALSE 811HAVE_PYTHON_FALSE
811HAVE_PYTHON_TRUE 812HAVE_PYTHON_TRUE
@@ -847,6 +848,7 @@ EDJE_DECC_PRG
847BUILD_EDJE_CC_FALSE 848BUILD_EDJE_CC_FALSE
848BUILD_EDJE_CC_TRUE 849BUILD_EDJE_CC_TRUE
849EDJE_CC_PRG 850EDJE_CC_PRG
851edje_cc
850EDJE_AMALGAMATION_FALSE 852EDJE_AMALGAMATION_FALSE
851EDJE_AMALGAMATION_TRUE 853EDJE_AMALGAMATION_TRUE
852MODULE_ARCH 854MODULE_ARCH
@@ -974,6 +976,7 @@ enable_dependency_tracking
974with_gnu_ld 976with_gnu_ld
975enable_libtool_lock 977enable_libtool_lock
976enable_amalgamation 978enable_amalgamation
979with_edje_cc
977enable_edje_cc 980enable_edje_cc
978enable_edje_decc 981enable_edje_decc
979enable_edje_recc 982enable_edje_recc
@@ -1005,6 +1008,8 @@ LIBS
1005CPPFLAGS 1008CPPFLAGS
1006CPP 1009CPP
1007PKG_CONFIG 1010PKG_CONFIG
1011PKG_CONFIG_PATH
1012PKG_CONFIG_LIBDIR
1008EVIL_CFLAGS 1013EVIL_CFLAGS
1009EVIL_LIBS 1014EVIL_LIBS
1010LUA_CFLAGS 1015LUA_CFLAGS
@@ -1099,8 +1104,9 @@ do
1099 fi 1104 fi
1100 1105
1101 case $ac_option in 1106 case $ac_option in
1102 *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 1107 *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
1103 *) ac_optarg=yes ;; 1108 *=) ac_optarg= ;;
1109 *) ac_optarg=yes ;;
1104 esac 1110 esac
1105 1111
1106 # Accept the important Cygnus configure options, so we can diagnose typos. 1112 # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1145,7 +1151,7 @@ do
1145 ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` 1151 ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
1146 # Reject names that are not valid shell variable names. 1152 # Reject names that are not valid shell variable names.
1147 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1153 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1148 as_fn_error "invalid feature name: $ac_useropt" 1154 as_fn_error $? "invalid feature name: $ac_useropt"
1149 ac_useropt_orig=$ac_useropt 1155 ac_useropt_orig=$ac_useropt
1150 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 1156 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1151 case $ac_user_opts in 1157 case $ac_user_opts in
@@ -1171,7 +1177,7 @@ do
1171 ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` 1177 ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
1172 # Reject names that are not valid shell variable names. 1178 # Reject names that are not valid shell variable names.
1173 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1179 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1174 as_fn_error "invalid feature name: $ac_useropt" 1180 as_fn_error $? "invalid feature name: $ac_useropt"
1175 ac_useropt_orig=$ac_useropt 1181 ac_useropt_orig=$ac_useropt
1176 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 1182 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1177 case $ac_user_opts in 1183 case $ac_user_opts in
@@ -1375,7 +1381,7 @@ do
1375 ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` 1381 ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
1376 # Reject names that are not valid shell variable names. 1382 # Reject names that are not valid shell variable names.
1377 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1383 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1378 as_fn_error "invalid package name: $ac_useropt" 1384 as_fn_error $? "invalid package name: $ac_useropt"
1379 ac_useropt_orig=$ac_useropt 1385 ac_useropt_orig=$ac_useropt
1380 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 1386 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1381 case $ac_user_opts in 1387 case $ac_user_opts in
@@ -1391,7 +1397,7 @@ do
1391 ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` 1397 ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
1392 # Reject names that are not valid shell variable names. 1398 # Reject names that are not valid shell variable names.
1393 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1399 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1394 as_fn_error "invalid package name: $ac_useropt" 1400 as_fn_error $? "invalid package name: $ac_useropt"
1395 ac_useropt_orig=$ac_useropt 1401 ac_useropt_orig=$ac_useropt
1396 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 1402 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1397 case $ac_user_opts in 1403 case $ac_user_opts in
@@ -1421,8 +1427,8 @@ do
1421 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) 1427 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
1422 x_libraries=$ac_optarg ;; 1428 x_libraries=$ac_optarg ;;
1423 1429
1424 -*) as_fn_error "unrecognized option: \`$ac_option' 1430 -*) as_fn_error $? "unrecognized option: \`$ac_option'
1425Try \`$0 --help' for more information." 1431Try \`$0 --help' for more information"
1426 ;; 1432 ;;
1427 1433
1428 *=*) 1434 *=*)
@@ -1430,7 +1436,7 @@ Try \`$0 --help' for more information."
1430 # Reject names that are not valid shell variable names. 1436 # Reject names that are not valid shell variable names.
1431 case $ac_envvar in #( 1437 case $ac_envvar in #(
1432 '' | [0-9]* | *[!_$as_cr_alnum]* ) 1438 '' | [0-9]* | *[!_$as_cr_alnum]* )
1433 as_fn_error "invalid variable name: \`$ac_envvar'" ;; 1439 as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
1434 esac 1440 esac
1435 eval $ac_envvar=\$ac_optarg 1441 eval $ac_envvar=\$ac_optarg
1436 export $ac_envvar ;; 1442 export $ac_envvar ;;
@@ -1448,13 +1454,13 @@ done
1448 1454
1449if test -n "$ac_prev"; then 1455if test -n "$ac_prev"; then
1450 ac_option=--`echo $ac_prev | sed 's/_/-/g'` 1456 ac_option=--`echo $ac_prev | sed 's/_/-/g'`
1451 as_fn_error "missing argument to $ac_option" 1457 as_fn_error $? "missing argument to $ac_option"
1452fi 1458fi
1453 1459
1454if test -n "$ac_unrecognized_opts"; then 1460if test -n "$ac_unrecognized_opts"; then
1455 case $enable_option_checking in 1461 case $enable_option_checking in
1456 no) ;; 1462 no) ;;
1457 fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; 1463 fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
1458 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; 1464 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
1459 esac 1465 esac
1460fi 1466fi
@@ -1477,7 +1483,7 @@ do
1477 [\\/$]* | ?:[\\/]* ) continue;; 1483 [\\/$]* | ?:[\\/]* ) continue;;
1478 NONE | '' ) case $ac_var in *prefix ) continue;; esac;; 1484 NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
1479 esac 1485 esac
1480 as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" 1486 as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
1481done 1487done
1482 1488
1483# There might be people who depend on the old broken behavior: `$host' 1489# There might be people who depend on the old broken behavior: `$host'
@@ -1491,8 +1497,8 @@ target=$target_alias
1491if test "x$host_alias" != x; then 1497if test "x$host_alias" != x; then
1492 if test "x$build_alias" = x; then 1498 if test "x$build_alias" = x; then
1493 cross_compiling=maybe 1499 cross_compiling=maybe
1494 $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. 1500 $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
1495 If a cross compiler is detected then cross compile mode will be used." >&2 1501 If a cross compiler is detected then cross compile mode will be used" >&2
1496 elif test "x$build_alias" != "x$host_alias"; then 1502 elif test "x$build_alias" != "x$host_alias"; then
1497 cross_compiling=yes 1503 cross_compiling=yes
1498 fi 1504 fi
@@ -1507,9 +1513,9 @@ test "$silent" = yes && exec 6>/dev/null
1507ac_pwd=`pwd` && test -n "$ac_pwd" && 1513ac_pwd=`pwd` && test -n "$ac_pwd" &&
1508ac_ls_di=`ls -di .` && 1514ac_ls_di=`ls -di .` &&
1509ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || 1515ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
1510 as_fn_error "working directory cannot be determined" 1516 as_fn_error $? "working directory cannot be determined"
1511test "X$ac_ls_di" = "X$ac_pwd_ls_di" || 1517test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
1512 as_fn_error "pwd does not report name of working directory" 1518 as_fn_error $? "pwd does not report name of working directory"
1513 1519
1514 1520
1515# Find the source files, if location was not specified. 1521# Find the source files, if location was not specified.
@@ -1548,11 +1554,11 @@ else
1548fi 1554fi
1549if test ! -r "$srcdir/$ac_unique_file"; then 1555if test ! -r "$srcdir/$ac_unique_file"; then
1550 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." 1556 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
1551 as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" 1557 as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
1552fi 1558fi
1553ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" 1559ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
1554ac_abs_confdir=`( 1560ac_abs_confdir=`(
1555 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" 1561 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
1556 pwd)` 1562 pwd)`
1557# When building in place, set srcdir=. 1563# When building in place, set srcdir=.
1558if test "$ac_abs_confdir" = "$ac_pwd"; then 1564if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1578,7 +1584,7 @@ if test "$ac_init_help" = "long"; then
1578 # Omit some internal or obsolete options to make the list less imposing. 1584 # Omit some internal or obsolete options to make the list less imposing.
1579 # This message is too long to be a string in the A/UX 3.1 sh. 1585 # This message is too long to be a string in the A/UX 3.1 sh.
1580 cat <<_ACEOF 1586 cat <<_ACEOF
1581\`configure' configures edje 1.1.99.67344 to adapt to many kinds of systems. 1587\`configure' configures edje 1.2.0-alpha to adapt to many kinds of systems.
1582 1588
1583Usage: $0 [OPTION]... [VAR=VALUE]... 1589Usage: $0 [OPTION]... [VAR=VALUE]...
1584 1590
@@ -1592,7 +1598,7 @@ Configuration:
1592 --help=short display options specific to this package 1598 --help=short display options specific to this package
1593 --help=recursive display the short help of all the included packages 1599 --help=recursive display the short help of all the included packages
1594 -V, --version display version information and exit 1600 -V, --version display version information and exit
1595 -q, --quiet, --silent do not print \`checking...' messages 1601 -q, --quiet, --silent do not print \`checking ...' messages
1596 --cache-file=FILE cache test results in FILE [disabled] 1602 --cache-file=FILE cache test results in FILE [disabled]
1597 -C, --config-cache alias for \`--cache-file=config.cache' 1603 -C, --config-cache alias for \`--cache-file=config.cache'
1598 -n, --no-create do not create output files 1604 -n, --no-create do not create output files
@@ -1648,7 +1654,7 @@ fi
1648 1654
1649if test -n "$ac_init_help"; then 1655if test -n "$ac_init_help"; then
1650 case $ac_init_help in 1656 case $ac_init_help in
1651 short | recursive ) echo "Configuration of edje 1.1.99.67344:";; 1657 short | recursive ) echo "Configuration of edje 1.2.0-alpha:";;
1652 esac 1658 esac
1653 cat <<\_ACEOF 1659 cat <<\_ACEOF
1654 1660
@@ -1705,6 +1711,7 @@ Optional Packages:
1705 --with-pic try to use only PIC/non-PIC objects [default=use 1711 --with-pic try to use only PIC/non-PIC objects [default=use
1706 both] 1712 both]
1707 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 1713 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
1714 --with-edje-cc=PATH specify a specific path to edje_cc [default=edje_cc]
1708 --with-vim=DIR Location of Vim data files [[autodetect]] 1715 --with-vim=DIR Location of Vim data files [[autodetect]]
1709 --with-doxygen=FILE doxygen program to use [default=doxygen] 1716 --with-doxygen=FILE doxygen program to use [default=doxygen]
1710 1717
@@ -1718,6 +1725,10 @@ Some influential environment variables:
1718 you have headers in a nonstandard directory <include dir> 1725 you have headers in a nonstandard directory <include dir>
1719 CPP C preprocessor 1726 CPP C preprocessor
1720 PKG_CONFIG path to pkg-config utility 1727 PKG_CONFIG path to pkg-config utility
1728 PKG_CONFIG_PATH
1729 directories to add to pkg-config's search path
1730 PKG_CONFIG_LIBDIR
1731 path overriding pkg-config's built-in search path
1721 EVIL_CFLAGS C compiler flags for EVIL, overriding pkg-config 1732 EVIL_CFLAGS C compiler flags for EVIL, overriding pkg-config
1722 EVIL_LIBS linker flags for EVIL, overriding pkg-config 1733 EVIL_LIBS linker flags for EVIL, overriding pkg-config
1723 LUA_CFLAGS C compiler flags for LUA, overriding pkg-config 1734 LUA_CFLAGS C compiler flags for LUA, overriding pkg-config
@@ -1838,10 +1849,10 @@ fi
1838test -n "$ac_init_help" && exit $ac_status 1849test -n "$ac_init_help" && exit $ac_status
1839if $ac_init_version; then 1850if $ac_init_version; then
1840 cat <<\_ACEOF 1851 cat <<\_ACEOF
1841edje configure 1.1.99.67344 1852edje configure 1.2.0-alpha
1842generated by GNU Autoconf 2.65 1853generated by GNU Autoconf 2.67
1843 1854
1844Copyright (C) 2009 Free Software Foundation, Inc. 1855Copyright (C) 2010 Free Software Foundation, Inc.
1845This configure script is free software; the Free Software Foundation 1856This configure script is free software; the Free Software Foundation
1846gives unlimited permission to copy, distribute and modify it. 1857gives unlimited permission to copy, distribute and modify it.
1847_ACEOF 1858_ACEOF
@@ -1945,7 +1956,7 @@ ac_fn_c_check_header_compile ()
1945 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1956 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1946 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1957 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1947$as_echo_n "checking for $2... " >&6; } 1958$as_echo_n "checking for $2... " >&6; }
1948if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1959if eval "test \"\${$3+set}\"" = set; then :
1949 $as_echo_n "(cached) " >&6 1960 $as_echo_n "(cached) " >&6
1950else 1961else
1951 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1962 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1988,7 +1999,7 @@ $as_echo "$ac_try_echo"; } >&5
1988 mv -f conftest.er1 conftest.err 1999 mv -f conftest.er1 conftest.err
1989 fi 2000 fi
1990 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 2001 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1991 test $ac_status = 0; } >/dev/null && { 2002 test $ac_status = 0; } > conftest.i && {
1992 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || 2003 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
1993 test ! -s conftest.err 2004 test ! -s conftest.err
1994 }; then : 2005 }; then :
@@ -2054,7 +2065,7 @@ ac_fn_c_check_func ()
2054 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2065 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2055 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2066 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2056$as_echo_n "checking for $2... " >&6; } 2067$as_echo_n "checking for $2... " >&6; }
2057if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 2068if eval "test \"\${$3+set}\"" = set; then :
2058 $as_echo_n "(cached) " >&6 2069 $as_echo_n "(cached) " >&6
2059else 2070else
2060 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2071 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2121,10 +2132,10 @@ $as_echo "$ac_res" >&6; }
2121ac_fn_c_check_header_mongrel () 2132ac_fn_c_check_header_mongrel ()
2122{ 2133{
2123 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2134 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2124 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 2135 if eval "test \"\${$3+set}\"" = set; then :
2125 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2136 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2126$as_echo_n "checking for $2... " >&6; } 2137$as_echo_n "checking for $2... " >&6; }
2127if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 2138if eval "test \"\${$3+set}\"" = set; then :
2128 $as_echo_n "(cached) " >&6 2139 $as_echo_n "(cached) " >&6
2129fi 2140fi
2130eval ac_res=\$$3 2141eval ac_res=\$$3
@@ -2160,7 +2171,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
2160else 2171else
2161 ac_header_preproc=no 2172 ac_header_preproc=no
2162fi 2173fi
2163rm -f conftest.err conftest.$ac_ext 2174rm -f conftest.err conftest.i conftest.$ac_ext
2164{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 2175{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
2165$as_echo "$ac_header_preproc" >&6; } 2176$as_echo "$ac_header_preproc" >&6; }
2166 2177
@@ -2183,17 +2194,15 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
2183$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} 2194$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
2184 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 2195 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
2185$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} 2196$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
2186( cat <<\_ASBOX 2197( $as_echo "## -------------------------------------------------------- ##
2187## -------------------------------------------------------- ##
2188## Report this to enlightenment-devel@lists.sourceforge.net ## 2198## Report this to enlightenment-devel@lists.sourceforge.net ##
2189## -------------------------------------------------------- ## 2199## -------------------------------------------------------- ##"
2190_ASBOX
2191 ) | sed "s/^/$as_me: WARNING: /" >&2 2200 ) | sed "s/^/$as_me: WARNING: /" >&2
2192 ;; 2201 ;;
2193esac 2202esac
2194 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2203 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2195$as_echo_n "checking for $2... " >&6; } 2204$as_echo_n "checking for $2... " >&6; }
2196if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 2205if eval "test \"\${$3+set}\"" = set; then :
2197 $as_echo_n "(cached) " >&6 2206 $as_echo_n "(cached) " >&6
2198else 2207else
2199 eval "$3=\$ac_header_compiler" 2208 eval "$3=\$ac_header_compiler"
@@ -2209,8 +2218,8 @@ cat >config.log <<_ACEOF
2209This file contains any messages produced by compilers while 2218This file contains any messages produced by compilers while
2210running configure, to aid debugging if configure makes a mistake. 2219running configure, to aid debugging if configure makes a mistake.
2211 2220
2212It was created by edje $as_me 1.1.99.67344, which was 2221It was created by edje $as_me 1.2.0-alpha, which was
2213generated by GNU Autoconf 2.65. Invocation command line was 2222generated by GNU Autoconf 2.67. Invocation command line was
2214 2223
2215 $ $0 $@ 2224 $ $0 $@
2216 2225
@@ -2320,11 +2329,9 @@ trap 'exit_status=$?
2320 { 2329 {
2321 echo 2330 echo
2322 2331
2323 cat <<\_ASBOX 2332 $as_echo "## ---------------- ##
2324## ---------------- ##
2325## Cache variables. ## 2333## Cache variables. ##
2326## ---------------- ## 2334## ---------------- ##"
2327_ASBOX
2328 echo 2335 echo
2329 # The following way of writing the cache mishandles newlines in values, 2336 # The following way of writing the cache mishandles newlines in values,
2330( 2337(
@@ -2358,11 +2365,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
2358) 2365)
2359 echo 2366 echo
2360 2367
2361 cat <<\_ASBOX 2368 $as_echo "## ----------------- ##
2362## ----------------- ##
2363## Output variables. ## 2369## Output variables. ##
2364## ----------------- ## 2370## ----------------- ##"
2365_ASBOX
2366 echo 2371 echo
2367 for ac_var in $ac_subst_vars 2372 for ac_var in $ac_subst_vars
2368 do 2373 do
@@ -2375,11 +2380,9 @@ _ASBOX
2375 echo 2380 echo
2376 2381
2377 if test -n "$ac_subst_files"; then 2382 if test -n "$ac_subst_files"; then
2378 cat <<\_ASBOX 2383 $as_echo "## ------------------- ##
2379## ------------------- ##
2380## File substitutions. ## 2384## File substitutions. ##
2381## ------------------- ## 2385## ------------------- ##"
2382_ASBOX
2383 echo 2386 echo
2384 for ac_var in $ac_subst_files 2387 for ac_var in $ac_subst_files
2385 do 2388 do
@@ -2393,11 +2396,9 @@ _ASBOX
2393 fi 2396 fi
2394 2397
2395 if test -s confdefs.h; then 2398 if test -s confdefs.h; then
2396 cat <<\_ASBOX 2399 $as_echo "## ----------- ##
2397## ----------- ##
2398## confdefs.h. ## 2400## confdefs.h. ##
2399## ----------- ## 2401## ----------- ##"
2400_ASBOX
2401 echo 2402 echo
2402 cat confdefs.h 2403 cat confdefs.h
2403 echo 2404 echo
@@ -2452,7 +2453,12 @@ _ACEOF
2452ac_site_file1=NONE 2453ac_site_file1=NONE
2453ac_site_file2=NONE 2454ac_site_file2=NONE
2454if test -n "$CONFIG_SITE"; then 2455if test -n "$CONFIG_SITE"; then
2455 ac_site_file1=$CONFIG_SITE 2456 # We do not want a PATH search for config.site.
2457 case $CONFIG_SITE in #((
2458 -*) ac_site_file1=./$CONFIG_SITE;;
2459 */*) ac_site_file1=$CONFIG_SITE;;
2460 *) ac_site_file1=./$CONFIG_SITE;;
2461 esac
2456elif test "x$prefix" != xNONE; then 2462elif test "x$prefix" != xNONE; then
2457 ac_site_file1=$prefix/share/config.site 2463 ac_site_file1=$prefix/share/config.site
2458 ac_site_file2=$prefix/etc/config.site 2464 ac_site_file2=$prefix/etc/config.site
@@ -2467,7 +2473,11 @@ do
2467 { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 2473 { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
2468$as_echo "$as_me: loading site script $ac_site_file" >&6;} 2474$as_echo "$as_me: loading site script $ac_site_file" >&6;}
2469 sed 's/^/| /' "$ac_site_file" >&5 2475 sed 's/^/| /' "$ac_site_file" >&5
2470 . "$ac_site_file" 2476 . "$ac_site_file" \
2477 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2478$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2479as_fn_error $? "failed to load site script $ac_site_file
2480See \`config.log' for more details" "$LINENO" 5 ; }
2471 fi 2481 fi
2472done 2482done
2473 2483
@@ -2543,7 +2553,7 @@ if $ac_cache_corrupted; then
2543$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2553$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2544 { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 2554 { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
2545$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} 2555$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
2546 as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 2556 as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
2547fi 2557fi
2548## -------------------- ## 2558## -------------------- ##
2549## Main body of script. ## 2559## Main body of script. ##
@@ -2569,16 +2579,22 @@ am__api_version='1.11'
2569 2579
2570ac_aux_dir= 2580ac_aux_dir=
2571for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do 2581for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
2572 for ac_t in install-sh install.sh shtool; do 2582 if test -f "$ac_dir/install-sh"; then
2573 if test -f "$ac_dir/$ac_t"; then 2583 ac_aux_dir=$ac_dir
2574 ac_aux_dir=$ac_dir 2584 ac_install_sh="$ac_aux_dir/install-sh -c"
2575 ac_install_sh="$ac_aux_dir/$ac_t -c" 2585 break
2576 break 2 2586 elif test -f "$ac_dir/install.sh"; then
2577 fi 2587 ac_aux_dir=$ac_dir
2578 done 2588 ac_install_sh="$ac_aux_dir/install.sh -c"
2589 break
2590 elif test -f "$ac_dir/shtool"; then
2591 ac_aux_dir=$ac_dir
2592 ac_install_sh="$ac_aux_dir/shtool install -c"
2593 break
2594 fi
2579done 2595done
2580if test -z "$ac_aux_dir"; then 2596if test -z "$ac_aux_dir"; then
2581 as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 2597 as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
2582fi 2598fi
2583 2599
2584# These three variables are undocumented and unsupported, 2600# These three variables are undocumented and unsupported,
@@ -2694,11 +2710,11 @@ am_lf='
2694' 2710'
2695case `pwd` in 2711case `pwd` in
2696 *[\\\"\#\$\&\'\`$am_lf]*) 2712 *[\\\"\#\$\&\'\`$am_lf]*)
2697 as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; 2713 as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
2698esac 2714esac
2699case $srcdir in 2715case $srcdir in
2700 *[\\\"\#\$\&\'\`$am_lf\ \ ]*) 2716 *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
2701 as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; 2717 as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
2702esac 2718esac
2703 2719
2704# Do `set' in a subshell so we don't clobber the current shell's 2720# Do `set' in a subshell so we don't clobber the current shell's
@@ -2720,7 +2736,7 @@ if (
2720 # if, for instance, CONFIG_SHELL is bash and it inherits a 2736 # if, for instance, CONFIG_SHELL is bash and it inherits a
2721 # broken ls alias from the environment. This has actually 2737 # broken ls alias from the environment. This has actually
2722 # happened. Such a system could not be considered "sane". 2738 # happened. Such a system could not be considered "sane".
2723 as_fn_error "ls -t appears to fail. Make sure there is not a broken 2739 as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
2724alias in your environment" "$LINENO" 5 2740alias in your environment" "$LINENO" 5
2725 fi 2741 fi
2726 2742
@@ -2730,7 +2746,7 @@ then
2730 # Ok. 2746 # Ok.
2731 : 2747 :
2732else 2748else
2733 as_fn_error "newly created file is older than distributed files! 2749 as_fn_error $? "newly created file is older than distributed files!
2734Check your system clock" "$LINENO" 5 2750Check your system clock" "$LINENO" 5
2735fi 2751fi
2736{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 2752{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -2968,7 +2984,7 @@ done
2968$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } 2984$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
2969set x ${MAKE-make} 2985set x ${MAKE-make}
2970ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` 2986ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
2971if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : 2987if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
2972 $as_echo_n "(cached) " >&6 2988 $as_echo_n "(cached) " >&6
2973else 2989else
2974 cat >conftest.make <<\_ACEOF 2990 cat >conftest.make <<\_ACEOF
@@ -2976,7 +2992,7 @@ SHELL = /bin/sh
2976all: 2992all:
2977 @echo '@@@%%%=$(MAKE)=@@@%%%' 2993 @echo '@@@%%%=$(MAKE)=@@@%%%'
2978_ACEOF 2994_ACEOF
2979# GNU make sometimes prints "make[1]: Entering...", which would confuse us. 2995# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
2980case `${MAKE-make} -f conftest.make 2>/dev/null` in 2996case `${MAKE-make} -f conftest.make 2>/dev/null` in
2981 *@@@%%%=?*=@@@%%%*) 2997 *@@@%%%=?*=@@@%%%*)
2982 eval ac_cv_prog_make_${ac_make}_set=yes;; 2998 eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -3010,7 +3026,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
3010 am__isrc=' -I$(srcdir)' 3026 am__isrc=' -I$(srcdir)'
3011 # test to see if srcdir already configured 3027 # test to see if srcdir already configured
3012 if test -f $srcdir/config.status; then 3028 if test -f $srcdir/config.status; then
3013 as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 3029 as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
3014 fi 3030 fi
3015fi 3031fi
3016 3032
@@ -3026,7 +3042,7 @@ fi
3026 3042
3027# Define the identity of the package. 3043# Define the identity of the package.
3028 PACKAGE='edje' 3044 PACKAGE='edje'
3029 VERSION='1.1.99.67344' 3045 VERSION='1.2.0-alpha'
3030 3046
3031 3047
3032cat >>confdefs.h <<_ACEOF 3048cat >>confdefs.h <<_ACEOF
@@ -3081,7 +3097,7 @@ AM_BACKSLASH='\'
3081 3097
3082# Make sure we can run config.sub. 3098# Make sure we can run config.sub.
3083$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || 3099$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
3084 as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 3100 as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
3085 3101
3086{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 3102{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
3087$as_echo_n "checking build system type... " >&6; } 3103$as_echo_n "checking build system type... " >&6; }
@@ -3092,16 +3108,16 @@ else
3092test "x$ac_build_alias" = x && 3108test "x$ac_build_alias" = x &&
3093 ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` 3109 ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
3094test "x$ac_build_alias" = x && 3110test "x$ac_build_alias" = x &&
3095 as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 3111 as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
3096ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || 3112ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
3097 as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 3113 as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
3098 3114
3099fi 3115fi
3100{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 3116{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
3101$as_echo "$ac_cv_build" >&6; } 3117$as_echo "$ac_cv_build" >&6; }
3102case $ac_cv_build in 3118case $ac_cv_build in
3103*-*-*) ;; 3119*-*-*) ;;
3104*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; 3120*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
3105esac 3121esac
3106build=$ac_cv_build 3122build=$ac_cv_build
3107ac_save_IFS=$IFS; IFS='-' 3123ac_save_IFS=$IFS; IFS='-'
@@ -3126,7 +3142,7 @@ else
3126 ac_cv_host=$ac_cv_build 3142 ac_cv_host=$ac_cv_build
3127else 3143else
3128 ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || 3144 ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
3129 as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 3145 as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
3130fi 3146fi
3131 3147
3132fi 3148fi
@@ -3134,7 +3150,7 @@ fi
3134$as_echo "$ac_cv_host" >&6; } 3150$as_echo "$ac_cv_host" >&6; }
3135case $ac_cv_host in 3151case $ac_cv_host in
3136*-*-*) ;; 3152*-*-*) ;;
3137*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; 3153*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
3138esac 3154esac
3139host=$ac_cv_host 3155host=$ac_cv_host
3140ac_save_IFS=$IFS; IFS='-' 3156ac_save_IFS=$IFS; IFS='-'
@@ -3840,8 +3856,8 @@ fi
3840 3856
3841test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3857test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3842$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3858$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3843as_fn_error "no acceptable C compiler found in \$PATH 3859as_fn_error $? "no acceptable C compiler found in \$PATH
3844See \`config.log' for more details." "$LINENO" 5; } 3860See \`config.log' for more details" "$LINENO" 5 ; }
3845 3861
3846# Provide some information about the compiler. 3862# Provide some information about the compiler.
3847$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 3863$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3955,9 +3971,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
3955 3971
3956{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3972{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3957$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3973$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3958{ as_fn_set_status 77 3974as_fn_error 77 "C compiler cannot create executables
3959as_fn_error "C compiler cannot create executables 3975See \`config.log' for more details" "$LINENO" 5 ; }
3960See \`config.log' for more details." "$LINENO" 5; }; }
3961else 3976else
3962 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 3977 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3963$as_echo "yes" >&6; } 3978$as_echo "yes" >&6; }
@@ -3999,8 +4014,8 @@ done
3999else 4014else
4000 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 4015 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4001$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 4016$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4002as_fn_error "cannot compute suffix of executables: cannot compile and link 4017as_fn_error $? "cannot compute suffix of executables: cannot compile and link
4003See \`config.log' for more details." "$LINENO" 5; } 4018See \`config.log' for more details" "$LINENO" 5 ; }
4004fi 4019fi
4005rm -f conftest conftest$ac_cv_exeext 4020rm -f conftest conftest$ac_cv_exeext
4006{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 4021{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -4057,9 +4072,9 @@ $as_echo "$ac_try_echo"; } >&5
4057 else 4072 else
4058 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 4073 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4059$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 4074$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4060as_fn_error "cannot run C compiled programs. 4075as_fn_error $? "cannot run C compiled programs.
4061If you meant to cross compile, use \`--host'. 4076If you meant to cross compile, use \`--host'.
4062See \`config.log' for more details." "$LINENO" 5; } 4077See \`config.log' for more details" "$LINENO" 5 ; }
4063 fi 4078 fi
4064 fi 4079 fi
4065fi 4080fi
@@ -4110,8 +4125,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
4110 4125
4111{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 4126{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4112$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 4127$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4113as_fn_error "cannot compute suffix of object files: cannot compile 4128as_fn_error $? "cannot compute suffix of object files: cannot compile
4114See \`config.log' for more details." "$LINENO" 5; } 4129See \`config.log' for more details" "$LINENO" 5 ; }
4115fi 4130fi
4116rm -f conftest.$ac_cv_objext conftest.$ac_ext 4131rm -f conftest.$ac_cv_objext conftest.$ac_ext
4117fi 4132fi
@@ -4515,7 +4530,7 @@ esac
4515 done 4530 done
4516IFS=$as_save_IFS 4531IFS=$as_save_IFS
4517 if test -z "$ac_cv_path_SED"; then 4532 if test -z "$ac_cv_path_SED"; then
4518 as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 4533 as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
4519 fi 4534 fi
4520else 4535else
4521 ac_cv_path_SED=$SED 4536 ac_cv_path_SED=$SED
@@ -4591,7 +4606,7 @@ esac
4591 done 4606 done
4592IFS=$as_save_IFS 4607IFS=$as_save_IFS
4593 if test -z "$ac_cv_path_GREP"; then 4608 if test -z "$ac_cv_path_GREP"; then
4594 as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 4609 as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
4595 fi 4610 fi
4596else 4611else
4597 ac_cv_path_GREP=$GREP 4612 ac_cv_path_GREP=$GREP
@@ -4657,7 +4672,7 @@ esac
4657 done 4672 done
4658IFS=$as_save_IFS 4673IFS=$as_save_IFS
4659 if test -z "$ac_cv_path_EGREP"; then 4674 if test -z "$ac_cv_path_EGREP"; then
4660 as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 4675 as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
4661 fi 4676 fi
4662else 4677else
4663 ac_cv_path_EGREP=$EGREP 4678 ac_cv_path_EGREP=$EGREP
@@ -4724,7 +4739,7 @@ esac
4724 done 4739 done
4725IFS=$as_save_IFS 4740IFS=$as_save_IFS
4726 if test -z "$ac_cv_path_FGREP"; then 4741 if test -z "$ac_cv_path_FGREP"; then
4727 as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 4742 as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
4728 fi 4743 fi
4729else 4744else
4730 ac_cv_path_FGREP=$FGREP 4745 ac_cv_path_FGREP=$FGREP
@@ -4840,7 +4855,7 @@ else
4840 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 4855 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4841$as_echo "no" >&6; } 4856$as_echo "no" >&6; }
4842fi 4857fi
4843test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 4858test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
4844{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 4859{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
4845$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } 4860$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
4846if test "${lt_cv_prog_gnu_ld+set}" = set; then : 4861if test "${lt_cv_prog_gnu_ld+set}" = set; then :
@@ -5042,13 +5057,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
5042else 5057else
5043 lt_cv_nm_interface="BSD nm" 5058 lt_cv_nm_interface="BSD nm"
5044 echo "int some_variable = 0;" > conftest.$ac_ext 5059 echo "int some_variable = 0;" > conftest.$ac_ext
5045 (eval echo "\"\$as_me:5045: $ac_compile\"" >&5) 5060 (eval echo "\"\$as_me:5060: $ac_compile\"" >&5)
5046 (eval "$ac_compile" 2>conftest.err) 5061 (eval "$ac_compile" 2>conftest.err)
5047 cat conftest.err >&5 5062 cat conftest.err >&5
5048 (eval echo "\"\$as_me:5048: $NM \\\"conftest.$ac_objext\\\"\"" >&5) 5063 (eval echo "\"\$as_me:5063: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
5049 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) 5064 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
5050 cat conftest.err >&5 5065 cat conftest.err >&5
5051 (eval echo "\"\$as_me:5051: output\"" >&5) 5066 (eval echo "\"\$as_me:5066: output\"" >&5)
5052 cat conftest.out >&5 5067 cat conftest.out >&5
5053 if $GREP 'External.*some_variable' conftest.out > /dev/null; then 5068 if $GREP 'External.*some_variable' conftest.out > /dev/null; then
5054 lt_cv_nm_interface="MS dumpbin" 5069 lt_cv_nm_interface="MS dumpbin"
@@ -6251,7 +6266,7 @@ ia64-*-hpux*)
6251 ;; 6266 ;;
6252*-*-irix6*) 6267*-*-irix6*)
6253 # Find out which ABI we are using. 6268 # Find out which ABI we are using.
6254 echo '#line 6254 "configure"' > conftest.$ac_ext 6269 echo '#line 6269 "configure"' > conftest.$ac_ext
6255 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 6270 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
6256 (eval $ac_compile) 2>&5 6271 (eval $ac_compile) 2>&5
6257 ac_status=$? 6272 ac_status=$?
@@ -7040,7 +7055,7 @@ else
7040 # Broken: fails on valid input. 7055 # Broken: fails on valid input.
7041continue 7056continue
7042fi 7057fi
7043rm -f conftest.err conftest.$ac_ext 7058rm -f conftest.err conftest.i conftest.$ac_ext
7044 7059
7045 # OK, works on sane cases. Now check whether nonexistent headers 7060 # OK, works on sane cases. Now check whether nonexistent headers
7046 # can be detected and how. 7061 # can be detected and how.
@@ -7056,11 +7071,11 @@ else
7056ac_preproc_ok=: 7071ac_preproc_ok=:
7057break 7072break
7058fi 7073fi
7059rm -f conftest.err conftest.$ac_ext 7074rm -f conftest.err conftest.i conftest.$ac_ext
7060 7075
7061done 7076done
7062# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 7077# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
7063rm -f conftest.err conftest.$ac_ext 7078rm -f conftest.i conftest.err conftest.$ac_ext
7064if $ac_preproc_ok; then : 7079if $ac_preproc_ok; then :
7065 break 7080 break
7066fi 7081fi
@@ -7099,7 +7114,7 @@ else
7099 # Broken: fails on valid input. 7114 # Broken: fails on valid input.
7100continue 7115continue
7101fi 7116fi
7102rm -f conftest.err conftest.$ac_ext 7117rm -f conftest.err conftest.i conftest.$ac_ext
7103 7118
7104 # OK, works on sane cases. Now check whether nonexistent headers 7119 # OK, works on sane cases. Now check whether nonexistent headers
7105 # can be detected and how. 7120 # can be detected and how.
@@ -7115,18 +7130,18 @@ else
7115ac_preproc_ok=: 7130ac_preproc_ok=:
7116break 7131break
7117fi 7132fi
7118rm -f conftest.err conftest.$ac_ext 7133rm -f conftest.err conftest.i conftest.$ac_ext
7119 7134
7120done 7135done
7121# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 7136# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
7122rm -f conftest.err conftest.$ac_ext 7137rm -f conftest.i conftest.err conftest.$ac_ext
7123if $ac_preproc_ok; then : 7138if $ac_preproc_ok; then :
7124 7139
7125else 7140else
7126 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 7141 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
7127$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 7142$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
7128as_fn_error "C preprocessor \"$CPP\" fails sanity check 7143as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
7129See \`config.log' for more details." "$LINENO" 5; } 7144See \`config.log' for more details" "$LINENO" 5 ; }
7130fi 7145fi
7131 7146
7132ac_ext=c 7147ac_ext=c
@@ -7255,8 +7270,7 @@ do :
7255 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 7270 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
7256ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default 7271ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
7257" 7272"
7258eval as_val=\$$as_ac_Header 7273if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
7259 if test "x$as_val" = x""yes; then :
7260 cat >>confdefs.h <<_ACEOF 7274 cat >>confdefs.h <<_ACEOF
7261#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 7275#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
7262_ACEOF 7276_ACEOF
@@ -7779,11 +7793,11 @@ else
7779 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 7793 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
7780 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 7794 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
7781 -e 's:$: $lt_compiler_flag:'` 7795 -e 's:$: $lt_compiler_flag:'`
7782 (eval echo "\"\$as_me:7782: $lt_compile\"" >&5) 7796 (eval echo "\"\$as_me:7796: $lt_compile\"" >&5)
7783 (eval "$lt_compile" 2>conftest.err) 7797 (eval "$lt_compile" 2>conftest.err)
7784 ac_status=$? 7798 ac_status=$?
7785 cat conftest.err >&5 7799 cat conftest.err >&5
7786 echo "$as_me:7786: \$? = $ac_status" >&5 7800 echo "$as_me:7800: \$? = $ac_status" >&5
7787 if (exit $ac_status) && test -s "$ac_outfile"; then 7801 if (exit $ac_status) && test -s "$ac_outfile"; then
7788 # The compiler can only warn and ignore the option if not recognized 7802 # The compiler can only warn and ignore the option if not recognized
7789 # So say no if there are warnings other than the usual output. 7803 # So say no if there are warnings other than the usual output.
@@ -8118,11 +8132,11 @@ else
8118 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 8132 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
8119 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8133 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
8120 -e 's:$: $lt_compiler_flag:'` 8134 -e 's:$: $lt_compiler_flag:'`
8121 (eval echo "\"\$as_me:8121: $lt_compile\"" >&5) 8135 (eval echo "\"\$as_me:8135: $lt_compile\"" >&5)
8122 (eval "$lt_compile" 2>conftest.err) 8136 (eval "$lt_compile" 2>conftest.err)
8123 ac_status=$? 8137 ac_status=$?
8124 cat conftest.err >&5 8138 cat conftest.err >&5
8125 echo "$as_me:8125: \$? = $ac_status" >&5 8139 echo "$as_me:8139: \$? = $ac_status" >&5
8126 if (exit $ac_status) && test -s "$ac_outfile"; then 8140 if (exit $ac_status) && test -s "$ac_outfile"; then
8127 # The compiler can only warn and ignore the option if not recognized 8141 # The compiler can only warn and ignore the option if not recognized
8128 # So say no if there are warnings other than the usual output. 8142 # So say no if there are warnings other than the usual output.
@@ -8223,11 +8237,11 @@ else
8223 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 8237 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
8224 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8238 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
8225 -e 's:$: $lt_compiler_flag:'` 8239 -e 's:$: $lt_compiler_flag:'`
8226 (eval echo "\"\$as_me:8226: $lt_compile\"" >&5) 8240 (eval echo "\"\$as_me:8240: $lt_compile\"" >&5)
8227 (eval "$lt_compile" 2>out/conftest.err) 8241 (eval "$lt_compile" 2>out/conftest.err)
8228 ac_status=$? 8242 ac_status=$?
8229 cat out/conftest.err >&5 8243 cat out/conftest.err >&5
8230 echo "$as_me:8230: \$? = $ac_status" >&5 8244 echo "$as_me:8244: \$? = $ac_status" >&5
8231 if (exit $ac_status) && test -s out/conftest2.$ac_objext 8245 if (exit $ac_status) && test -s out/conftest2.$ac_objext
8232 then 8246 then
8233 # The compiler can only warn and ignore the option if not recognized 8247 # The compiler can only warn and ignore the option if not recognized
@@ -8278,11 +8292,11 @@ else
8278 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 8292 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
8279 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8293 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
8280 -e 's:$: $lt_compiler_flag:'` 8294 -e 's:$: $lt_compiler_flag:'`
8281 (eval echo "\"\$as_me:8281: $lt_compile\"" >&5) 8295 (eval echo "\"\$as_me:8295: $lt_compile\"" >&5)
8282 (eval "$lt_compile" 2>out/conftest.err) 8296 (eval "$lt_compile" 2>out/conftest.err)
8283 ac_status=$? 8297 ac_status=$?
8284 cat out/conftest.err >&5 8298 cat out/conftest.err >&5
8285 echo "$as_me:8285: \$? = $ac_status" >&5 8299 echo "$as_me:8299: \$? = $ac_status" >&5
8286 if (exit $ac_status) && test -s out/conftest2.$ac_objext 8300 if (exit $ac_status) && test -s out/conftest2.$ac_objext
8287 then 8301 then
8288 # The compiler can only warn and ignore the option if not recognized 8302 # The compiler can only warn and ignore the option if not recognized
@@ -10662,7 +10676,7 @@ else
10662 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 10676 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10663 lt_status=$lt_dlunknown 10677 lt_status=$lt_dlunknown
10664 cat > conftest.$ac_ext <<_LT_EOF 10678 cat > conftest.$ac_ext <<_LT_EOF
10665#line 10665 "configure" 10679#line 10679 "configure"
10666#include "confdefs.h" 10680#include "confdefs.h"
10667 10681
10668#if HAVE_DLFCN_H 10682#if HAVE_DLFCN_H
@@ -10758,7 +10772,7 @@ else
10758 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 10772 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10759 lt_status=$lt_dlunknown 10773 lt_status=$lt_dlunknown
10760 cat > conftest.$ac_ext <<_LT_EOF 10774 cat > conftest.$ac_ext <<_LT_EOF
10761#line 10761 "configure" 10775#line 10775 "configure"
10762#include "confdefs.h" 10776#include "confdefs.h"
10763 10777
10764#if HAVE_DLFCN_H 10778#if HAVE_DLFCN_H
@@ -10997,20 +11011,20 @@ _ACEOF
10997 11011
10998 11012
10999cat >>confdefs.h <<_ACEOF 11013cat >>confdefs.h <<_ACEOF
11000#define VMIN 1 11014#define VMIN 2
11001_ACEOF 11015_ACEOF
11002 11016
11003 11017
11004cat >>confdefs.h <<_ACEOF 11018cat >>confdefs.h <<_ACEOF
11005#define VMIC 99 11019#define VMIC 0
11006_ACEOF 11020_ACEOF
11007 11021
11008 11022
11009cat >>confdefs.h <<_ACEOF 11023cat >>confdefs.h <<_ACEOF
11010#define VREV 67344 11024#define VREV 0
11011_ACEOF 11025_ACEOF
11012 11026
11013version_info="2:99:1" 11027version_info="3:0:2"
11014release_info="" 11028release_info=""
11015 11029
11016 11030
@@ -11079,6 +11093,29 @@ fi
11079 11093
11080 11094
11081 11095
11096
11097
11098# Check whether --with-edje-cc was given.
11099if test "${with_edje_cc+set}" = set; then :
11100 withval=$with_edje_cc; _efl_with_binary=${withval}
11101else
11102 _efl_with_binary=$(pkg-config --variable=prefix edje)/bin/edje_cc
11103fi
11104
11105
11106edje_cc=${_efl_with_binary}
11107{ $as_echo "$as_me:${as_lineno-$LINENO}: edje_cc set to ${_efl_with_binary}" >&5
11108$as_echo "$as_me: edje_cc set to ${_efl_with_binary}" >&6;}
11109
11110with_binary_edje_cc=${_efl_with_binary}
11111
11112
11113
11114
11115
11116
11117
11118
11082have_edje_cc="yes" 11119have_edje_cc="yes"
11083 11120
11084 11121
@@ -11748,8 +11785,8 @@ fi
11748 11785
11749test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 11786test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
11750$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 11787$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
11751as_fn_error "no acceptable C compiler found in \$PATH 11788as_fn_error $? "no acceptable C compiler found in \$PATH
11752See \`config.log' for more details." "$LINENO" 5; } 11789See \`config.log' for more details" "$LINENO" 5 ; }
11753 11790
11754# Provide some information about the compiler. 11791# Provide some information about the compiler.
11755$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 11792$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -12303,7 +12340,7 @@ sys.exit(sys.hexversion < minverhex)"
12303 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 12340 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
12304$as_echo "yes" >&6; } 12341$as_echo "yes" >&6; }
12305else 12342else
12306 as_fn_error "too old" "$LINENO" 5 12343 as_fn_error $? "too old" "$LINENO" 5
12307fi 12344fi
12308 am_display_PYTHON=$PYTHON 12345 am_display_PYTHON=$PYTHON
12309 else 12346 else
@@ -12315,7 +12352,7 @@ if test "${am_cv_pathless_PYTHON+set}" = set; then :
12315 $as_echo_n "(cached) " >&6 12352 $as_echo_n "(cached) " >&6
12316else 12353else
12317 12354
12318 for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do 12355 for am_cv_pathless_PYTHON in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
12319 test "$am_cv_pathless_PYTHON" = none && break 12356 test "$am_cv_pathless_PYTHON" = none && break
12320 prog="import sys 12357 prog="import sys
12321# split strings by '.' and convert to numeric. Append some zeros 12358# split strings by '.' and convert to numeric. Append some zeros
@@ -12517,6 +12554,10 @@ fi
12517 12554
12518 12555
12519 12556
12557
12558
12559
12560
12520if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then 12561if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
12521 if test -n "$ac_tool_prefix"; then 12562 if test -n "$ac_tool_prefix"; then
12522 # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. 12563 # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -12629,7 +12670,6 @@ $as_echo "yes" >&6; }
12629$as_echo "no" >&6; } 12670$as_echo "no" >&6; }
12630 PKG_CONFIG="" 12671 PKG_CONFIG=""
12631 fi 12672 fi
12632
12633fi 12673fi
12634 12674
12635# Check whether pkg-config supports Requires.private 12675# Check whether pkg-config supports Requires.private
@@ -12654,11 +12694,10 @@ pkg_failed=no
12654{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVIL" >&5 12694{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVIL" >&5
12655$as_echo_n "checking for EVIL... " >&6; } 12695$as_echo_n "checking for EVIL... " >&6; }
12656 12696
12657if test -n "$PKG_CONFIG"; then 12697if test -n "$EVIL_CFLAGS"; then
12658 if test -n "$EVIL_CFLAGS"; then 12698 pkg_cv_EVIL_CFLAGS="$EVIL_CFLAGS"
12659 pkg_cv_EVIL_CFLAGS="$EVIL_CFLAGS" 12699 elif test -n "$PKG_CONFIG"; then
12660 else 12700 if test -n "$PKG_CONFIG" && \
12661 if test -n "$PKG_CONFIG" && \
12662 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.0.0\""; } >&5 12701 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.0.0\""; } >&5
12663 ($PKG_CONFIG --exists --print-errors "evil >= 1.0.0") 2>&5 12702 ($PKG_CONFIG --exists --print-errors "evil >= 1.0.0") 2>&5
12664 ac_status=$? 12703 ac_status=$?
@@ -12668,15 +12707,13 @@ if test -n "$PKG_CONFIG"; then
12668else 12707else
12669 pkg_failed=yes 12708 pkg_failed=yes
12670fi 12709fi
12671 fi 12710 else
12672else 12711 pkg_failed=untried
12673 pkg_failed=untried
12674fi 12712fi
12675if test -n "$PKG_CONFIG"; then 12713if test -n "$EVIL_LIBS"; then
12676 if test -n "$EVIL_LIBS"; then 12714 pkg_cv_EVIL_LIBS="$EVIL_LIBS"
12677 pkg_cv_EVIL_LIBS="$EVIL_LIBS" 12715 elif test -n "$PKG_CONFIG"; then
12678 else 12716 if test -n "$PKG_CONFIG" && \
12679 if test -n "$PKG_CONFIG" && \
12680 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.0.0\""; } >&5 12717 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.0.0\""; } >&5
12681 ($PKG_CONFIG --exists --print-errors "evil >= 1.0.0") 2>&5 12718 ($PKG_CONFIG --exists --print-errors "evil >= 1.0.0") 2>&5
12682 ac_status=$? 12719 ac_status=$?
@@ -12686,14 +12723,15 @@ if test -n "$PKG_CONFIG"; then
12686else 12723else
12687 pkg_failed=yes 12724 pkg_failed=yes
12688fi 12725fi
12689 fi 12726 else
12690else 12727 pkg_failed=untried
12691 pkg_failed=untried
12692fi 12728fi
12693 12729
12694 12730
12695 12731
12696if test $pkg_failed = yes; then 12732if test $pkg_failed = yes; then
12733 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12734$as_echo "no" >&6; }
12697 12735
12698if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 12736if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
12699 _pkg_short_errors_supported=yes 12737 _pkg_short_errors_supported=yes
@@ -12701,14 +12739,14 @@ else
12701 _pkg_short_errors_supported=no 12739 _pkg_short_errors_supported=no
12702fi 12740fi
12703 if test $_pkg_short_errors_supported = yes; then 12741 if test $_pkg_short_errors_supported = yes; then
12704 EVIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "evil >= 1.0.0"` 12742 EVIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "evil >= 1.0.0" 2>&1`
12705 else 12743 else
12706 EVIL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evil >= 1.0.0"` 12744 EVIL_PKG_ERRORS=`$PKG_CONFIG --print-errors "evil >= 1.0.0" 2>&1`
12707 fi 12745 fi
12708 # Put the nasty error message in config.log where it belongs 12746 # Put the nasty error message in config.log where it belongs
12709 echo "$EVIL_PKG_ERRORS" >&5 12747 echo "$EVIL_PKG_ERRORS" >&5
12710 12748
12711 as_fn_error "Package requirements (evil >= 1.0.0) were not met: 12749 as_fn_error $? "Package requirements (evil >= 1.0.0) were not met:
12712 12750
12713$EVIL_PKG_ERRORS 12751$EVIL_PKG_ERRORS
12714 12752
@@ -12717,12 +12755,13 @@ installed software in a non-standard prefix.
12717 12755
12718Alternatively, you may set the environment variables EVIL_CFLAGS 12756Alternatively, you may set the environment variables EVIL_CFLAGS
12719and EVIL_LIBS to avoid the need to call pkg-config. 12757and EVIL_LIBS to avoid the need to call pkg-config.
12720See the pkg-config man page for more details. 12758See the pkg-config man page for more details." "$LINENO" 5
12721" "$LINENO" 5
12722elif test $pkg_failed = untried; then 12759elif test $pkg_failed = untried; then
12760 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12761$as_echo "no" >&6; }
12723 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 12762 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
12724$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 12763$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
12725as_fn_error "The pkg-config script could not be found or is too old. Make sure it 12764as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
12726is in your PATH or set the PKG_CONFIG environment variable to the full 12765is in your PATH or set the PKG_CONFIG environment variable to the full
12727path to pkg-config. 12766path to pkg-config.
12728 12767
@@ -12731,13 +12770,13 @@ and EVIL_LIBS to avoid the need to call pkg-config.
12731See the pkg-config man page for more details. 12770See the pkg-config man page for more details.
12732 12771
12733To get pkg-config, see <http://pkg-config.freedesktop.org/>. 12772To get pkg-config, see <http://pkg-config.freedesktop.org/>.
12734See \`config.log' for more details." "$LINENO" 5; } 12773See \`config.log' for more details" "$LINENO" 5 ; }
12735else 12774else
12736 EVIL_CFLAGS=$pkg_cv_EVIL_CFLAGS 12775 EVIL_CFLAGS=$pkg_cv_EVIL_CFLAGS
12737 EVIL_LIBS=$pkg_cv_EVIL_LIBS 12776 EVIL_LIBS=$pkg_cv_EVIL_LIBS
12738 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 12777 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
12739$as_echo "yes" >&6; } 12778$as_echo "yes" >&6; }
12740 : 12779
12741fi 12780fi
12742 12781
12743$as_echo "#define HAVE_EVIL 1" >>confdefs.h 12782$as_echo "#define HAVE_EVIL 1" >>confdefs.h
@@ -12759,11 +12798,10 @@ pkg_failed=no
12759{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 12798{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
12760$as_echo_n "checking for LUA... " >&6; } 12799$as_echo_n "checking for LUA... " >&6; }
12761 12800
12762if test -n "$PKG_CONFIG"; then 12801if test -n "$LUA_CFLAGS"; then
12763 if test -n "$LUA_CFLAGS"; then 12802 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
12764 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 12803 elif test -n "$PKG_CONFIG"; then
12765 else 12804 if test -n "$PKG_CONFIG" && \
12766 if test -n "$PKG_CONFIG" && \
12767 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1.0\""; } >&5 12805 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1.0\""; } >&5
12768 ($PKG_CONFIG --exists --print-errors "lua >= 5.1.0") 2>&5 12806 ($PKG_CONFIG --exists --print-errors "lua >= 5.1.0") 2>&5
12769 ac_status=$? 12807 ac_status=$?
@@ -12773,15 +12811,13 @@ if test -n "$PKG_CONFIG"; then
12773else 12811else
12774 pkg_failed=yes 12812 pkg_failed=yes
12775fi 12813fi
12776 fi 12814 else
12777else 12815 pkg_failed=untried
12778 pkg_failed=untried
12779fi 12816fi
12780if test -n "$PKG_CONFIG"; then 12817if test -n "$LUA_LIBS"; then
12781 if test -n "$LUA_LIBS"; then 12818 pkg_cv_LUA_LIBS="$LUA_LIBS"
12782 pkg_cv_LUA_LIBS="$LUA_LIBS" 12819 elif test -n "$PKG_CONFIG"; then
12783 else 12820 if test -n "$PKG_CONFIG" && \
12784 if test -n "$PKG_CONFIG" && \
12785 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1.0\""; } >&5 12821 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1.0\""; } >&5
12786 ($PKG_CONFIG --exists --print-errors "lua >= 5.1.0") 2>&5 12822 ($PKG_CONFIG --exists --print-errors "lua >= 5.1.0") 2>&5
12787 ac_status=$? 12823 ac_status=$?
@@ -12791,14 +12827,15 @@ if test -n "$PKG_CONFIG"; then
12791else 12827else
12792 pkg_failed=yes 12828 pkg_failed=yes
12793fi 12829fi
12794 fi 12830 else
12795else 12831 pkg_failed=untried
12796 pkg_failed=untried
12797fi 12832fi
12798 12833
12799 12834
12800 12835
12801if test $pkg_failed = yes; then 12836if test $pkg_failed = yes; then
12837 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12838$as_echo "no" >&6; }
12802 12839
12803if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 12840if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
12804 _pkg_short_errors_supported=yes 12841 _pkg_short_errors_supported=yes
@@ -12806,25 +12843,22 @@ else
12806 _pkg_short_errors_supported=no 12843 _pkg_short_errors_supported=no
12807fi 12844fi
12808 if test $_pkg_short_errors_supported = yes; then 12845 if test $_pkg_short_errors_supported = yes; then
12809 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua >= 5.1.0"` 12846 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua >= 5.1.0" 2>&1`
12810 else 12847 else
12811 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua >= 5.1.0"` 12848 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua >= 5.1.0" 2>&1`
12812 fi 12849 fi
12813 # Put the nasty error message in config.log where it belongs 12850 # Put the nasty error message in config.log where it belongs
12814 echo "$LUA_PKG_ERRORS" >&5 12851 echo "$LUA_PKG_ERRORS" >&5
12815 12852
12816 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12817$as_echo "no" >&6; }
12818 12853
12819pkg_failed=no 12854pkg_failed=no
12820{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 12855{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
12821$as_echo_n "checking for LUA... " >&6; } 12856$as_echo_n "checking for LUA... " >&6; }
12822 12857
12823if test -n "$PKG_CONFIG"; then 12858if test -n "$LUA_CFLAGS"; then
12824 if test -n "$LUA_CFLAGS"; then 12859 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
12825 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 12860 elif test -n "$PKG_CONFIG"; then
12826 else 12861 if test -n "$PKG_CONFIG" && \
12827 if test -n "$PKG_CONFIG" && \
12828 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1.0\""; } >&5 12862 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1.0\""; } >&5
12829 ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1.0") 2>&5 12863 ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1.0") 2>&5
12830 ac_status=$? 12864 ac_status=$?
@@ -12834,15 +12868,13 @@ if test -n "$PKG_CONFIG"; then
12834else 12868else
12835 pkg_failed=yes 12869 pkg_failed=yes
12836fi 12870fi
12837 fi 12871 else
12838else 12872 pkg_failed=untried
12839 pkg_failed=untried
12840fi 12873fi
12841if test -n "$PKG_CONFIG"; then 12874if test -n "$LUA_LIBS"; then
12842 if test -n "$LUA_LIBS"; then 12875 pkg_cv_LUA_LIBS="$LUA_LIBS"
12843 pkg_cv_LUA_LIBS="$LUA_LIBS" 12876 elif test -n "$PKG_CONFIG"; then
12844 else 12877 if test -n "$PKG_CONFIG" && \
12845 if test -n "$PKG_CONFIG" && \
12846 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1.0\""; } >&5 12878 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1.0\""; } >&5
12847 ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1.0") 2>&5 12879 ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1.0") 2>&5
12848 ac_status=$? 12880 ac_status=$?
@@ -12852,14 +12884,15 @@ if test -n "$PKG_CONFIG"; then
12852else 12884else
12853 pkg_failed=yes 12885 pkg_failed=yes
12854fi 12886fi
12855 fi 12887 else
12856else 12888 pkg_failed=untried
12857 pkg_failed=untried
12858fi 12889fi
12859 12890
12860 12891
12861 12892
12862if test $pkg_failed = yes; then 12893if test $pkg_failed = yes; then
12894 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12895$as_echo "no" >&6; }
12863 12896
12864if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 12897if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
12865 _pkg_short_errors_supported=yes 12898 _pkg_short_errors_supported=yes
@@ -12867,25 +12900,22 @@ else
12867 _pkg_short_errors_supported=no 12900 _pkg_short_errors_supported=no
12868fi 12901fi
12869 if test $_pkg_short_errors_supported = yes; then 12902 if test $_pkg_short_errors_supported = yes; then
12870 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1 >= 5.1.0"` 12903 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua5.1 >= 5.1.0" 2>&1`
12871 else 12904 else
12872 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1 >= 5.1.0"` 12905 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua5.1 >= 5.1.0" 2>&1`
12873 fi 12906 fi
12874 # Put the nasty error message in config.log where it belongs 12907 # Put the nasty error message in config.log where it belongs
12875 echo "$LUA_PKG_ERRORS" >&5 12908 echo "$LUA_PKG_ERRORS" >&5
12876 12909
12877 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12878$as_echo "no" >&6; }
12879 12910
12880pkg_failed=no 12911pkg_failed=no
12881{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 12912{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
12882$as_echo_n "checking for LUA... " >&6; } 12913$as_echo_n "checking for LUA... " >&6; }
12883 12914
12884if test -n "$PKG_CONFIG"; then 12915if test -n "$LUA_CFLAGS"; then
12885 if test -n "$LUA_CFLAGS"; then 12916 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
12886 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 12917 elif test -n "$PKG_CONFIG"; then
12887 else 12918 if test -n "$PKG_CONFIG" && \
12888 if test -n "$PKG_CONFIG" && \
12889 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5 12919 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5
12890 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5 12920 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5
12891 ac_status=$? 12921 ac_status=$?
@@ -12895,15 +12925,13 @@ if test -n "$PKG_CONFIG"; then
12895else 12925else
12896 pkg_failed=yes 12926 pkg_failed=yes
12897fi 12927fi
12898 fi 12928 else
12899else 12929 pkg_failed=untried
12900 pkg_failed=untried
12901fi 12930fi
12902if test -n "$PKG_CONFIG"; then 12931if test -n "$LUA_LIBS"; then
12903 if test -n "$LUA_LIBS"; then 12932 pkg_cv_LUA_LIBS="$LUA_LIBS"
12904 pkg_cv_LUA_LIBS="$LUA_LIBS" 12933 elif test -n "$PKG_CONFIG"; then
12905 else 12934 if test -n "$PKG_CONFIG" && \
12906 if test -n "$PKG_CONFIG" && \
12907 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5 12935 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5
12908 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5 12936 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5
12909 ac_status=$? 12937 ac_status=$?
@@ -12913,14 +12941,15 @@ if test -n "$PKG_CONFIG"; then
12913else 12941else
12914 pkg_failed=yes 12942 pkg_failed=yes
12915fi 12943fi
12916 fi 12944 else
12917else 12945 pkg_failed=untried
12918 pkg_failed=untried
12919fi 12946fi
12920 12947
12921 12948
12922 12949
12923if test $pkg_failed = yes; then 12950if test $pkg_failed = yes; then
12951 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12952$as_echo "no" >&6; }
12924 12953
12925if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 12954if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
12926 _pkg_short_errors_supported=yes 12955 _pkg_short_errors_supported=yes
@@ -12928,25 +12957,22 @@ else
12928 _pkg_short_errors_supported=no 12957 _pkg_short_errors_supported=no
12929fi 12958fi
12930 if test $_pkg_short_errors_supported = yes; then 12959 if test $_pkg_short_errors_supported = yes; then
12931 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.1 >= 5.1.0"` 12960 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua-5.1 >= 5.1.0" 2>&1`
12932 else 12961 else
12933 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.1 >= 5.1.0"` 12962 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua-5.1 >= 5.1.0" 2>&1`
12934 fi 12963 fi
12935 # Put the nasty error message in config.log where it belongs 12964 # Put the nasty error message in config.log where it belongs
12936 echo "$LUA_PKG_ERRORS" >&5 12965 echo "$LUA_PKG_ERRORS" >&5
12937 12966
12938 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12939$as_echo "no" >&6; }
12940 12967
12941pkg_failed=no 12968pkg_failed=no
12942{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 12969{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
12943$as_echo_n "checking for LUA... " >&6; } 12970$as_echo_n "checking for LUA... " >&6; }
12944 12971
12945if test -n "$PKG_CONFIG"; then 12972if test -n "$LUA_CFLAGS"; then
12946 if test -n "$LUA_CFLAGS"; then 12973 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
12947 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 12974 elif test -n "$PKG_CONFIG"; then
12948 else 12975 if test -n "$PKG_CONFIG" && \
12949 if test -n "$PKG_CONFIG" && \
12950 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 12976 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
12951 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 12977 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
12952 ac_status=$? 12978 ac_status=$?
@@ -12956,15 +12982,13 @@ if test -n "$PKG_CONFIG"; then
12956else 12982else
12957 pkg_failed=yes 12983 pkg_failed=yes
12958fi 12984fi
12959 fi 12985 else
12960else 12986 pkg_failed=untried
12961 pkg_failed=untried
12962fi 12987fi
12963if test -n "$PKG_CONFIG"; then 12988if test -n "$LUA_LIBS"; then
12964 if test -n "$LUA_LIBS"; then 12989 pkg_cv_LUA_LIBS="$LUA_LIBS"
12965 pkg_cv_LUA_LIBS="$LUA_LIBS" 12990 elif test -n "$PKG_CONFIG"; then
12966 else 12991 if test -n "$PKG_CONFIG" && \
12967 if test -n "$PKG_CONFIG" && \
12968 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 12992 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
12969 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 12993 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
12970 ac_status=$? 12994 ac_status=$?
@@ -12974,14 +12998,15 @@ if test -n "$PKG_CONFIG"; then
12974else 12998else
12975 pkg_failed=yes 12999 pkg_failed=yes
12976fi 13000fi
12977 fi 13001 else
12978else 13002 pkg_failed=untried
12979 pkg_failed=untried
12980fi 13003fi
12981 13004
12982 13005
12983 13006
12984if test $pkg_failed = yes; then 13007if test $pkg_failed = yes; then
13008 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13009$as_echo "no" >&6; }
12985 13010
12986if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 13011if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
12987 _pkg_short_errors_supported=yes 13012 _pkg_short_errors_supported=yes
@@ -12989,17 +13014,17 @@ else
12989 _pkg_short_errors_supported=no 13014 _pkg_short_errors_supported=no
12990fi 13015fi
12991 if test $_pkg_short_errors_supported = yes; then 13016 if test $_pkg_short_errors_supported = yes; then
12992 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua51 >= 5.1.0"` 13017 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1`
12993 else 13018 else
12994 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua51 >= 5.1.0"` 13019 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1`
12995 fi 13020 fi
12996 # Put the nasty error message in config.log where it belongs 13021 # Put the nasty error message in config.log where it belongs
12997 echo "$LUA_PKG_ERRORS" >&5 13022 echo "$LUA_PKG_ERRORS" >&5
12998 13023
12999 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 13024 have_lua="no"
13000$as_echo "no" >&6; }
13001 have_lua="no"
13002elif test $pkg_failed = untried; then 13025elif test $pkg_failed = untried; then
13026 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13027$as_echo "no" >&6; }
13003 have_lua="no" 13028 have_lua="no"
13004else 13029else
13005 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS 13030 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
@@ -13009,16 +13034,17 @@ $as_echo "yes" >&6; }
13009 requirement_lua="lua51" 13034 requirement_lua="lua51"
13010fi 13035fi
13011elif test $pkg_failed = untried; then 13036elif test $pkg_failed = untried; then
13037 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13038$as_echo "no" >&6; }
13012 13039
13013pkg_failed=no 13040pkg_failed=no
13014{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 13041{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
13015$as_echo_n "checking for LUA... " >&6; } 13042$as_echo_n "checking for LUA... " >&6; }
13016 13043
13017if test -n "$PKG_CONFIG"; then 13044if test -n "$LUA_CFLAGS"; then
13018 if test -n "$LUA_CFLAGS"; then 13045 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
13019 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 13046 elif test -n "$PKG_CONFIG"; then
13020 else 13047 if test -n "$PKG_CONFIG" && \
13021 if test -n "$PKG_CONFIG" && \
13022 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 13048 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
13023 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 13049 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
13024 ac_status=$? 13050 ac_status=$?
@@ -13028,15 +13054,13 @@ if test -n "$PKG_CONFIG"; then
13028else 13054else
13029 pkg_failed=yes 13055 pkg_failed=yes
13030fi 13056fi
13031 fi 13057 else
13032else 13058 pkg_failed=untried
13033 pkg_failed=untried
13034fi 13059fi
13035if test -n "$PKG_CONFIG"; then 13060if test -n "$LUA_LIBS"; then
13036 if test -n "$LUA_LIBS"; then 13061 pkg_cv_LUA_LIBS="$LUA_LIBS"
13037 pkg_cv_LUA_LIBS="$LUA_LIBS" 13062 elif test -n "$PKG_CONFIG"; then
13038 else 13063 if test -n "$PKG_CONFIG" && \
13039 if test -n "$PKG_CONFIG" && \
13040 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 13064 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
13041 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 13065 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
13042 ac_status=$? 13066 ac_status=$?
@@ -13046,14 +13070,15 @@ if test -n "$PKG_CONFIG"; then
13046else 13070else
13047 pkg_failed=yes 13071 pkg_failed=yes
13048fi 13072fi
13049 fi 13073 else
13050else 13074 pkg_failed=untried
13051 pkg_failed=untried
13052fi 13075fi
13053 13076
13054 13077
13055 13078
13056if test $pkg_failed = yes; then 13079if test $pkg_failed = yes; then
13080 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13081$as_echo "no" >&6; }
13057 13082
13058if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 13083if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13059 _pkg_short_errors_supported=yes 13084 _pkg_short_errors_supported=yes
@@ -13061,17 +13086,17 @@ else
13061 _pkg_short_errors_supported=no 13086 _pkg_short_errors_supported=no
13062fi 13087fi
13063 if test $_pkg_short_errors_supported = yes; then 13088 if test $_pkg_short_errors_supported = yes; then
13064 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua51 >= 5.1.0"` 13089 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1`
13065 else 13090 else
13066 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua51 >= 5.1.0"` 13091 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1`
13067 fi 13092 fi
13068 # Put the nasty error message in config.log where it belongs 13093 # Put the nasty error message in config.log where it belongs
13069 echo "$LUA_PKG_ERRORS" >&5 13094 echo "$LUA_PKG_ERRORS" >&5
13070 13095
13071 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 13096 have_lua="no"
13072$as_echo "no" >&6; }
13073 have_lua="no"
13074elif test $pkg_failed = untried; then 13097elif test $pkg_failed = untried; then
13098 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13099$as_echo "no" >&6; }
13075 have_lua="no" 13100 have_lua="no"
13076else 13101else
13077 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS 13102 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
@@ -13088,16 +13113,17 @@ $as_echo "yes" >&6; }
13088 requirement_lua="lua-5.1" 13113 requirement_lua="lua-5.1"
13089fi 13114fi
13090elif test $pkg_failed = untried; then 13115elif test $pkg_failed = untried; then
13116 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13117$as_echo "no" >&6; }
13091 13118
13092pkg_failed=no 13119pkg_failed=no
13093{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 13120{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
13094$as_echo_n "checking for LUA... " >&6; } 13121$as_echo_n "checking for LUA... " >&6; }
13095 13122
13096if test -n "$PKG_CONFIG"; then 13123if test -n "$LUA_CFLAGS"; then
13097 if test -n "$LUA_CFLAGS"; then 13124 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
13098 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 13125 elif test -n "$PKG_CONFIG"; then
13099 else 13126 if test -n "$PKG_CONFIG" && \
13100 if test -n "$PKG_CONFIG" && \
13101 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5 13127 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5
13102 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5 13128 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5
13103 ac_status=$? 13129 ac_status=$?
@@ -13107,15 +13133,13 @@ if test -n "$PKG_CONFIG"; then
13107else 13133else
13108 pkg_failed=yes 13134 pkg_failed=yes
13109fi 13135fi
13110 fi 13136 else
13111else 13137 pkg_failed=untried
13112 pkg_failed=untried
13113fi 13138fi
13114if test -n "$PKG_CONFIG"; then 13139if test -n "$LUA_LIBS"; then
13115 if test -n "$LUA_LIBS"; then 13140 pkg_cv_LUA_LIBS="$LUA_LIBS"
13116 pkg_cv_LUA_LIBS="$LUA_LIBS" 13141 elif test -n "$PKG_CONFIG"; then
13117 else 13142 if test -n "$PKG_CONFIG" && \
13118 if test -n "$PKG_CONFIG" && \
13119 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5 13143 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5
13120 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5 13144 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5
13121 ac_status=$? 13145 ac_status=$?
@@ -13125,14 +13149,15 @@ if test -n "$PKG_CONFIG"; then
13125else 13149else
13126 pkg_failed=yes 13150 pkg_failed=yes
13127fi 13151fi
13128 fi 13152 else
13129else 13153 pkg_failed=untried
13130 pkg_failed=untried
13131fi 13154fi
13132 13155
13133 13156
13134 13157
13135if test $pkg_failed = yes; then 13158if test $pkg_failed = yes; then
13159 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13160$as_echo "no" >&6; }
13136 13161
13137if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 13162if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13138 _pkg_short_errors_supported=yes 13163 _pkg_short_errors_supported=yes
@@ -13140,25 +13165,22 @@ else
13140 _pkg_short_errors_supported=no 13165 _pkg_short_errors_supported=no
13141fi 13166fi
13142 if test $_pkg_short_errors_supported = yes; then 13167 if test $_pkg_short_errors_supported = yes; then
13143 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.1 >= 5.1.0"` 13168 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua-5.1 >= 5.1.0" 2>&1`
13144 else 13169 else
13145 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.1 >= 5.1.0"` 13170 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua-5.1 >= 5.1.0" 2>&1`
13146 fi 13171 fi
13147 # Put the nasty error message in config.log where it belongs 13172 # Put the nasty error message in config.log where it belongs
13148 echo "$LUA_PKG_ERRORS" >&5 13173 echo "$LUA_PKG_ERRORS" >&5
13149 13174
13150 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13151$as_echo "no" >&6; }
13152 13175
13153pkg_failed=no 13176pkg_failed=no
13154{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 13177{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
13155$as_echo_n "checking for LUA... " >&6; } 13178$as_echo_n "checking for LUA... " >&6; }
13156 13179
13157if test -n "$PKG_CONFIG"; then 13180if test -n "$LUA_CFLAGS"; then
13158 if test -n "$LUA_CFLAGS"; then 13181 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
13159 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 13182 elif test -n "$PKG_CONFIG"; then
13160 else 13183 if test -n "$PKG_CONFIG" && \
13161 if test -n "$PKG_CONFIG" && \
13162 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 13184 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
13163 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 13185 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
13164 ac_status=$? 13186 ac_status=$?
@@ -13168,15 +13190,13 @@ if test -n "$PKG_CONFIG"; then
13168else 13190else
13169 pkg_failed=yes 13191 pkg_failed=yes
13170fi 13192fi
13171 fi 13193 else
13172else 13194 pkg_failed=untried
13173 pkg_failed=untried
13174fi 13195fi
13175if test -n "$PKG_CONFIG"; then 13196if test -n "$LUA_LIBS"; then
13176 if test -n "$LUA_LIBS"; then 13197 pkg_cv_LUA_LIBS="$LUA_LIBS"
13177 pkg_cv_LUA_LIBS="$LUA_LIBS" 13198 elif test -n "$PKG_CONFIG"; then
13178 else 13199 if test -n "$PKG_CONFIG" && \
13179 if test -n "$PKG_CONFIG" && \
13180 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 13200 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
13181 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 13201 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
13182 ac_status=$? 13202 ac_status=$?
@@ -13186,14 +13206,15 @@ if test -n "$PKG_CONFIG"; then
13186else 13206else
13187 pkg_failed=yes 13207 pkg_failed=yes
13188fi 13208fi
13189 fi 13209 else
13190else 13210 pkg_failed=untried
13191 pkg_failed=untried
13192fi 13211fi
13193 13212
13194 13213
13195 13214
13196if test $pkg_failed = yes; then 13215if test $pkg_failed = yes; then
13216 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13217$as_echo "no" >&6; }
13197 13218
13198if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 13219if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13199 _pkg_short_errors_supported=yes 13220 _pkg_short_errors_supported=yes
@@ -13201,17 +13222,17 @@ else
13201 _pkg_short_errors_supported=no 13222 _pkg_short_errors_supported=no
13202fi 13223fi
13203 if test $_pkg_short_errors_supported = yes; then 13224 if test $_pkg_short_errors_supported = yes; then
13204 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua51 >= 5.1.0"` 13225 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1`
13205 else 13226 else
13206 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua51 >= 5.1.0"` 13227 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1`
13207 fi 13228 fi
13208 # Put the nasty error message in config.log where it belongs 13229 # Put the nasty error message in config.log where it belongs
13209 echo "$LUA_PKG_ERRORS" >&5 13230 echo "$LUA_PKG_ERRORS" >&5
13210 13231
13211 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 13232 have_lua="no"
13212$as_echo "no" >&6; }
13213 have_lua="no"
13214elif test $pkg_failed = untried; then 13233elif test $pkg_failed = untried; then
13234 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13235$as_echo "no" >&6; }
13215 have_lua="no" 13236 have_lua="no"
13216else 13237else
13217 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS 13238 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
@@ -13221,16 +13242,17 @@ $as_echo "yes" >&6; }
13221 requirement_lua="lua51" 13242 requirement_lua="lua51"
13222fi 13243fi
13223elif test $pkg_failed = untried; then 13244elif test $pkg_failed = untried; then
13245 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13246$as_echo "no" >&6; }
13224 13247
13225pkg_failed=no 13248pkg_failed=no
13226{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 13249{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
13227$as_echo_n "checking for LUA... " >&6; } 13250$as_echo_n "checking for LUA... " >&6; }
13228 13251
13229if test -n "$PKG_CONFIG"; then 13252if test -n "$LUA_CFLAGS"; then
13230 if test -n "$LUA_CFLAGS"; then 13253 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
13231 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 13254 elif test -n "$PKG_CONFIG"; then
13232 else 13255 if test -n "$PKG_CONFIG" && \
13233 if test -n "$PKG_CONFIG" && \
13234 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 13256 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
13235 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 13257 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
13236 ac_status=$? 13258 ac_status=$?
@@ -13240,15 +13262,13 @@ if test -n "$PKG_CONFIG"; then
13240else 13262else
13241 pkg_failed=yes 13263 pkg_failed=yes
13242fi 13264fi
13243 fi 13265 else
13244else 13266 pkg_failed=untried
13245 pkg_failed=untried
13246fi 13267fi
13247if test -n "$PKG_CONFIG"; then 13268if test -n "$LUA_LIBS"; then
13248 if test -n "$LUA_LIBS"; then 13269 pkg_cv_LUA_LIBS="$LUA_LIBS"
13249 pkg_cv_LUA_LIBS="$LUA_LIBS" 13270 elif test -n "$PKG_CONFIG"; then
13250 else 13271 if test -n "$PKG_CONFIG" && \
13251 if test -n "$PKG_CONFIG" && \
13252 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 13272 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
13253 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 13273 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
13254 ac_status=$? 13274 ac_status=$?
@@ -13258,14 +13278,15 @@ if test -n "$PKG_CONFIG"; then
13258else 13278else
13259 pkg_failed=yes 13279 pkg_failed=yes
13260fi 13280fi
13261 fi 13281 else
13262else 13282 pkg_failed=untried
13263 pkg_failed=untried
13264fi 13283fi
13265 13284
13266 13285
13267 13286
13268if test $pkg_failed = yes; then 13287if test $pkg_failed = yes; then
13288 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13289$as_echo "no" >&6; }
13269 13290
13270if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 13291if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13271 _pkg_short_errors_supported=yes 13292 _pkg_short_errors_supported=yes
@@ -13273,17 +13294,17 @@ else
13273 _pkg_short_errors_supported=no 13294 _pkg_short_errors_supported=no
13274fi 13295fi
13275 if test $_pkg_short_errors_supported = yes; then 13296 if test $_pkg_short_errors_supported = yes; then
13276 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua51 >= 5.1.0"` 13297 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1`
13277 else 13298 else
13278 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua51 >= 5.1.0"` 13299 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1`
13279 fi 13300 fi
13280 # Put the nasty error message in config.log where it belongs 13301 # Put the nasty error message in config.log where it belongs
13281 echo "$LUA_PKG_ERRORS" >&5 13302 echo "$LUA_PKG_ERRORS" >&5
13282 13303
13283 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 13304 have_lua="no"
13284$as_echo "no" >&6; }
13285 have_lua="no"
13286elif test $pkg_failed = untried; then 13305elif test $pkg_failed = untried; then
13306 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13307$as_echo "no" >&6; }
13287 have_lua="no" 13308 have_lua="no"
13288else 13309else
13289 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS 13310 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
@@ -13307,16 +13328,17 @@ $as_echo "yes" >&6; }
13307 requirement_lua="lua5.1" 13328 requirement_lua="lua5.1"
13308fi 13329fi
13309elif test $pkg_failed = untried; then 13330elif test $pkg_failed = untried; then
13331 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13332$as_echo "no" >&6; }
13310 13333
13311pkg_failed=no 13334pkg_failed=no
13312{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 13335{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
13313$as_echo_n "checking for LUA... " >&6; } 13336$as_echo_n "checking for LUA... " >&6; }
13314 13337
13315if test -n "$PKG_CONFIG"; then 13338if test -n "$LUA_CFLAGS"; then
13316 if test -n "$LUA_CFLAGS"; then 13339 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
13317 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 13340 elif test -n "$PKG_CONFIG"; then
13318 else 13341 if test -n "$PKG_CONFIG" && \
13319 if test -n "$PKG_CONFIG" && \
13320 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1.0\""; } >&5 13342 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1.0\""; } >&5
13321 ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1.0") 2>&5 13343 ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1.0") 2>&5
13322 ac_status=$? 13344 ac_status=$?
@@ -13326,15 +13348,13 @@ if test -n "$PKG_CONFIG"; then
13326else 13348else
13327 pkg_failed=yes 13349 pkg_failed=yes
13328fi 13350fi
13329 fi 13351 else
13330else 13352 pkg_failed=untried
13331 pkg_failed=untried
13332fi 13353fi
13333if test -n "$PKG_CONFIG"; then 13354if test -n "$LUA_LIBS"; then
13334 if test -n "$LUA_LIBS"; then 13355 pkg_cv_LUA_LIBS="$LUA_LIBS"
13335 pkg_cv_LUA_LIBS="$LUA_LIBS" 13356 elif test -n "$PKG_CONFIG"; then
13336 else 13357 if test -n "$PKG_CONFIG" && \
13337 if test -n "$PKG_CONFIG" && \
13338 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1.0\""; } >&5 13358 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1.0\""; } >&5
13339 ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1.0") 2>&5 13359 ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1.0") 2>&5
13340 ac_status=$? 13360 ac_status=$?
@@ -13344,14 +13364,15 @@ if test -n "$PKG_CONFIG"; then
13344else 13364else
13345 pkg_failed=yes 13365 pkg_failed=yes
13346fi 13366fi
13347 fi 13367 else
13348else 13368 pkg_failed=untried
13349 pkg_failed=untried
13350fi 13369fi
13351 13370
13352 13371
13353 13372
13354if test $pkg_failed = yes; then 13373if test $pkg_failed = yes; then
13374 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13375$as_echo "no" >&6; }
13355 13376
13356if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 13377if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13357 _pkg_short_errors_supported=yes 13378 _pkg_short_errors_supported=yes
@@ -13359,25 +13380,22 @@ else
13359 _pkg_short_errors_supported=no 13380 _pkg_short_errors_supported=no
13360fi 13381fi
13361 if test $_pkg_short_errors_supported = yes; then 13382 if test $_pkg_short_errors_supported = yes; then
13362 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1 >= 5.1.0"` 13383 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua5.1 >= 5.1.0" 2>&1`
13363 else 13384 else
13364 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1 >= 5.1.0"` 13385 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua5.1 >= 5.1.0" 2>&1`
13365 fi 13386 fi
13366 # Put the nasty error message in config.log where it belongs 13387 # Put the nasty error message in config.log where it belongs
13367 echo "$LUA_PKG_ERRORS" >&5 13388 echo "$LUA_PKG_ERRORS" >&5
13368 13389
13369 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13370$as_echo "no" >&6; }
13371 13390
13372pkg_failed=no 13391pkg_failed=no
13373{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 13392{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
13374$as_echo_n "checking for LUA... " >&6; } 13393$as_echo_n "checking for LUA... " >&6; }
13375 13394
13376if test -n "$PKG_CONFIG"; then 13395if test -n "$LUA_CFLAGS"; then
13377 if test -n "$LUA_CFLAGS"; then 13396 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
13378 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 13397 elif test -n "$PKG_CONFIG"; then
13379 else 13398 if test -n "$PKG_CONFIG" && \
13380 if test -n "$PKG_CONFIG" && \
13381 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5 13399 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5
13382 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5 13400 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5
13383 ac_status=$? 13401 ac_status=$?
@@ -13387,15 +13405,13 @@ if test -n "$PKG_CONFIG"; then
13387else 13405else
13388 pkg_failed=yes 13406 pkg_failed=yes
13389fi 13407fi
13390 fi 13408 else
13391else 13409 pkg_failed=untried
13392 pkg_failed=untried
13393fi 13410fi
13394if test -n "$PKG_CONFIG"; then 13411if test -n "$LUA_LIBS"; then
13395 if test -n "$LUA_LIBS"; then 13412 pkg_cv_LUA_LIBS="$LUA_LIBS"
13396 pkg_cv_LUA_LIBS="$LUA_LIBS" 13413 elif test -n "$PKG_CONFIG"; then
13397 else 13414 if test -n "$PKG_CONFIG" && \
13398 if test -n "$PKG_CONFIG" && \
13399 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5 13415 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5
13400 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5 13416 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5
13401 ac_status=$? 13417 ac_status=$?
@@ -13405,14 +13421,15 @@ if test -n "$PKG_CONFIG"; then
13405else 13421else
13406 pkg_failed=yes 13422 pkg_failed=yes
13407fi 13423fi
13408 fi 13424 else
13409else 13425 pkg_failed=untried
13410 pkg_failed=untried
13411fi 13426fi
13412 13427
13413 13428
13414 13429
13415if test $pkg_failed = yes; then 13430if test $pkg_failed = yes; then
13431 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13432$as_echo "no" >&6; }
13416 13433
13417if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 13434if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13418 _pkg_short_errors_supported=yes 13435 _pkg_short_errors_supported=yes
@@ -13420,25 +13437,22 @@ else
13420 _pkg_short_errors_supported=no 13437 _pkg_short_errors_supported=no
13421fi 13438fi
13422 if test $_pkg_short_errors_supported = yes; then 13439 if test $_pkg_short_errors_supported = yes; then
13423 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.1 >= 5.1.0"` 13440 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua-5.1 >= 5.1.0" 2>&1`
13424 else 13441 else
13425 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.1 >= 5.1.0"` 13442 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua-5.1 >= 5.1.0" 2>&1`
13426 fi 13443 fi
13427 # Put the nasty error message in config.log where it belongs 13444 # Put the nasty error message in config.log where it belongs
13428 echo "$LUA_PKG_ERRORS" >&5 13445 echo "$LUA_PKG_ERRORS" >&5
13429 13446
13430 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13431$as_echo "no" >&6; }
13432 13447
13433pkg_failed=no 13448pkg_failed=no
13434{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 13449{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
13435$as_echo_n "checking for LUA... " >&6; } 13450$as_echo_n "checking for LUA... " >&6; }
13436 13451
13437if test -n "$PKG_CONFIG"; then 13452if test -n "$LUA_CFLAGS"; then
13438 if test -n "$LUA_CFLAGS"; then 13453 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
13439 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 13454 elif test -n "$PKG_CONFIG"; then
13440 else 13455 if test -n "$PKG_CONFIG" && \
13441 if test -n "$PKG_CONFIG" && \
13442 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 13456 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
13443 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 13457 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
13444 ac_status=$? 13458 ac_status=$?
@@ -13448,15 +13462,13 @@ if test -n "$PKG_CONFIG"; then
13448else 13462else
13449 pkg_failed=yes 13463 pkg_failed=yes
13450fi 13464fi
13451 fi 13465 else
13452else 13466 pkg_failed=untried
13453 pkg_failed=untried
13454fi 13467fi
13455if test -n "$PKG_CONFIG"; then 13468if test -n "$LUA_LIBS"; then
13456 if test -n "$LUA_LIBS"; then 13469 pkg_cv_LUA_LIBS="$LUA_LIBS"
13457 pkg_cv_LUA_LIBS="$LUA_LIBS" 13470 elif test -n "$PKG_CONFIG"; then
13458 else 13471 if test -n "$PKG_CONFIG" && \
13459 if test -n "$PKG_CONFIG" && \
13460 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 13472 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
13461 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 13473 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
13462 ac_status=$? 13474 ac_status=$?
@@ -13466,14 +13478,15 @@ if test -n "$PKG_CONFIG"; then
13466else 13478else
13467 pkg_failed=yes 13479 pkg_failed=yes
13468fi 13480fi
13469 fi 13481 else
13470else 13482 pkg_failed=untried
13471 pkg_failed=untried
13472fi 13483fi
13473 13484
13474 13485
13475 13486
13476if test $pkg_failed = yes; then 13487if test $pkg_failed = yes; then
13488 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13489$as_echo "no" >&6; }
13477 13490
13478if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 13491if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13479 _pkg_short_errors_supported=yes 13492 _pkg_short_errors_supported=yes
@@ -13481,17 +13494,17 @@ else
13481 _pkg_short_errors_supported=no 13494 _pkg_short_errors_supported=no
13482fi 13495fi
13483 if test $_pkg_short_errors_supported = yes; then 13496 if test $_pkg_short_errors_supported = yes; then
13484 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua51 >= 5.1.0"` 13497 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1`
13485 else 13498 else
13486 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua51 >= 5.1.0"` 13499 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1`
13487 fi 13500 fi
13488 # Put the nasty error message in config.log where it belongs 13501 # Put the nasty error message in config.log where it belongs
13489 echo "$LUA_PKG_ERRORS" >&5 13502 echo "$LUA_PKG_ERRORS" >&5
13490 13503
13491 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 13504 have_lua="no"
13492$as_echo "no" >&6; }
13493 have_lua="no"
13494elif test $pkg_failed = untried; then 13505elif test $pkg_failed = untried; then
13506 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13507$as_echo "no" >&6; }
13495 have_lua="no" 13508 have_lua="no"
13496else 13509else
13497 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS 13510 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
@@ -13501,16 +13514,17 @@ $as_echo "yes" >&6; }
13501 requirement_lua="lua51" 13514 requirement_lua="lua51"
13502fi 13515fi
13503elif test $pkg_failed = untried; then 13516elif test $pkg_failed = untried; then
13517 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13518$as_echo "no" >&6; }
13504 13519
13505pkg_failed=no 13520pkg_failed=no
13506{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 13521{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
13507$as_echo_n "checking for LUA... " >&6; } 13522$as_echo_n "checking for LUA... " >&6; }
13508 13523
13509if test -n "$PKG_CONFIG"; then 13524if test -n "$LUA_CFLAGS"; then
13510 if test -n "$LUA_CFLAGS"; then 13525 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
13511 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 13526 elif test -n "$PKG_CONFIG"; then
13512 else 13527 if test -n "$PKG_CONFIG" && \
13513 if test -n "$PKG_CONFIG" && \
13514 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 13528 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
13515 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 13529 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
13516 ac_status=$? 13530 ac_status=$?
@@ -13520,15 +13534,13 @@ if test -n "$PKG_CONFIG"; then
13520else 13534else
13521 pkg_failed=yes 13535 pkg_failed=yes
13522fi 13536fi
13523 fi 13537 else
13524else 13538 pkg_failed=untried
13525 pkg_failed=untried
13526fi 13539fi
13527if test -n "$PKG_CONFIG"; then 13540if test -n "$LUA_LIBS"; then
13528 if test -n "$LUA_LIBS"; then 13541 pkg_cv_LUA_LIBS="$LUA_LIBS"
13529 pkg_cv_LUA_LIBS="$LUA_LIBS" 13542 elif test -n "$PKG_CONFIG"; then
13530 else 13543 if test -n "$PKG_CONFIG" && \
13531 if test -n "$PKG_CONFIG" && \
13532 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 13544 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
13533 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 13545 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
13534 ac_status=$? 13546 ac_status=$?
@@ -13538,14 +13550,15 @@ if test -n "$PKG_CONFIG"; then
13538else 13550else
13539 pkg_failed=yes 13551 pkg_failed=yes
13540fi 13552fi
13541 fi 13553 else
13542else 13554 pkg_failed=untried
13543 pkg_failed=untried
13544fi 13555fi
13545 13556
13546 13557
13547 13558
13548if test $pkg_failed = yes; then 13559if test $pkg_failed = yes; then
13560 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13561$as_echo "no" >&6; }
13549 13562
13550if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 13563if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13551 _pkg_short_errors_supported=yes 13564 _pkg_short_errors_supported=yes
@@ -13553,17 +13566,17 @@ else
13553 _pkg_short_errors_supported=no 13566 _pkg_short_errors_supported=no
13554fi 13567fi
13555 if test $_pkg_short_errors_supported = yes; then 13568 if test $_pkg_short_errors_supported = yes; then
13556 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua51 >= 5.1.0"` 13569 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1`
13557 else 13570 else
13558 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua51 >= 5.1.0"` 13571 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1`
13559 fi 13572 fi
13560 # Put the nasty error message in config.log where it belongs 13573 # Put the nasty error message in config.log where it belongs
13561 echo "$LUA_PKG_ERRORS" >&5 13574 echo "$LUA_PKG_ERRORS" >&5
13562 13575
13563 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 13576 have_lua="no"
13564$as_echo "no" >&6; }
13565 have_lua="no"
13566elif test $pkg_failed = untried; then 13577elif test $pkg_failed = untried; then
13578 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13579$as_echo "no" >&6; }
13567 have_lua="no" 13580 have_lua="no"
13568else 13581else
13569 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS 13582 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
@@ -13580,16 +13593,17 @@ $as_echo "yes" >&6; }
13580 requirement_lua="lua-5.1" 13593 requirement_lua="lua-5.1"
13581fi 13594fi
13582elif test $pkg_failed = untried; then 13595elif test $pkg_failed = untried; then
13596 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13597$as_echo "no" >&6; }
13583 13598
13584pkg_failed=no 13599pkg_failed=no
13585{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 13600{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
13586$as_echo_n "checking for LUA... " >&6; } 13601$as_echo_n "checking for LUA... " >&6; }
13587 13602
13588if test -n "$PKG_CONFIG"; then 13603if test -n "$LUA_CFLAGS"; then
13589 if test -n "$LUA_CFLAGS"; then 13604 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
13590 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 13605 elif test -n "$PKG_CONFIG"; then
13591 else 13606 if test -n "$PKG_CONFIG" && \
13592 if test -n "$PKG_CONFIG" && \
13593 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5 13607 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5
13594 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5 13608 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5
13595 ac_status=$? 13609 ac_status=$?
@@ -13599,15 +13613,13 @@ if test -n "$PKG_CONFIG"; then
13599else 13613else
13600 pkg_failed=yes 13614 pkg_failed=yes
13601fi 13615fi
13602 fi 13616 else
13603else 13617 pkg_failed=untried
13604 pkg_failed=untried
13605fi 13618fi
13606if test -n "$PKG_CONFIG"; then 13619if test -n "$LUA_LIBS"; then
13607 if test -n "$LUA_LIBS"; then 13620 pkg_cv_LUA_LIBS="$LUA_LIBS"
13608 pkg_cv_LUA_LIBS="$LUA_LIBS" 13621 elif test -n "$PKG_CONFIG"; then
13609 else 13622 if test -n "$PKG_CONFIG" && \
13610 if test -n "$PKG_CONFIG" && \
13611 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5 13623 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5
13612 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5 13624 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5
13613 ac_status=$? 13625 ac_status=$?
@@ -13617,14 +13629,15 @@ if test -n "$PKG_CONFIG"; then
13617else 13629else
13618 pkg_failed=yes 13630 pkg_failed=yes
13619fi 13631fi
13620 fi 13632 else
13621else 13633 pkg_failed=untried
13622 pkg_failed=untried
13623fi 13634fi
13624 13635
13625 13636
13626 13637
13627if test $pkg_failed = yes; then 13638if test $pkg_failed = yes; then
13639 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13640$as_echo "no" >&6; }
13628 13641
13629if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 13642if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13630 _pkg_short_errors_supported=yes 13643 _pkg_short_errors_supported=yes
@@ -13632,25 +13645,22 @@ else
13632 _pkg_short_errors_supported=no 13645 _pkg_short_errors_supported=no
13633fi 13646fi
13634 if test $_pkg_short_errors_supported = yes; then 13647 if test $_pkg_short_errors_supported = yes; then
13635 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.1 >= 5.1.0"` 13648 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua-5.1 >= 5.1.0" 2>&1`
13636 else 13649 else
13637 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.1 >= 5.1.0"` 13650 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua-5.1 >= 5.1.0" 2>&1`
13638 fi 13651 fi
13639 # Put the nasty error message in config.log where it belongs 13652 # Put the nasty error message in config.log where it belongs
13640 echo "$LUA_PKG_ERRORS" >&5 13653 echo "$LUA_PKG_ERRORS" >&5
13641 13654
13642 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13643$as_echo "no" >&6; }
13644 13655
13645pkg_failed=no 13656pkg_failed=no
13646{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 13657{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
13647$as_echo_n "checking for LUA... " >&6; } 13658$as_echo_n "checking for LUA... " >&6; }
13648 13659
13649if test -n "$PKG_CONFIG"; then 13660if test -n "$LUA_CFLAGS"; then
13650 if test -n "$LUA_CFLAGS"; then 13661 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
13651 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 13662 elif test -n "$PKG_CONFIG"; then
13652 else 13663 if test -n "$PKG_CONFIG" && \
13653 if test -n "$PKG_CONFIG" && \
13654 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 13664 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
13655 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 13665 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
13656 ac_status=$? 13666 ac_status=$?
@@ -13660,15 +13670,13 @@ if test -n "$PKG_CONFIG"; then
13660else 13670else
13661 pkg_failed=yes 13671 pkg_failed=yes
13662fi 13672fi
13663 fi 13673 else
13664else 13674 pkg_failed=untried
13665 pkg_failed=untried
13666fi 13675fi
13667if test -n "$PKG_CONFIG"; then 13676if test -n "$LUA_LIBS"; then
13668 if test -n "$LUA_LIBS"; then 13677 pkg_cv_LUA_LIBS="$LUA_LIBS"
13669 pkg_cv_LUA_LIBS="$LUA_LIBS" 13678 elif test -n "$PKG_CONFIG"; then
13670 else 13679 if test -n "$PKG_CONFIG" && \
13671 if test -n "$PKG_CONFIG" && \
13672 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 13680 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
13673 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 13681 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
13674 ac_status=$? 13682 ac_status=$?
@@ -13678,14 +13686,15 @@ if test -n "$PKG_CONFIG"; then
13678else 13686else
13679 pkg_failed=yes 13687 pkg_failed=yes
13680fi 13688fi
13681 fi 13689 else
13682else 13690 pkg_failed=untried
13683 pkg_failed=untried
13684fi 13691fi
13685 13692
13686 13693
13687 13694
13688if test $pkg_failed = yes; then 13695if test $pkg_failed = yes; then
13696 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13697$as_echo "no" >&6; }
13689 13698
13690if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 13699if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13691 _pkg_short_errors_supported=yes 13700 _pkg_short_errors_supported=yes
@@ -13693,17 +13702,17 @@ else
13693 _pkg_short_errors_supported=no 13702 _pkg_short_errors_supported=no
13694fi 13703fi
13695 if test $_pkg_short_errors_supported = yes; then 13704 if test $_pkg_short_errors_supported = yes; then
13696 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua51 >= 5.1.0"` 13705 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1`
13697 else 13706 else
13698 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua51 >= 5.1.0"` 13707 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1`
13699 fi 13708 fi
13700 # Put the nasty error message in config.log where it belongs 13709 # Put the nasty error message in config.log where it belongs
13701 echo "$LUA_PKG_ERRORS" >&5 13710 echo "$LUA_PKG_ERRORS" >&5
13702 13711
13703 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 13712 have_lua="no"
13704$as_echo "no" >&6; }
13705 have_lua="no"
13706elif test $pkg_failed = untried; then 13713elif test $pkg_failed = untried; then
13714 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13715$as_echo "no" >&6; }
13707 have_lua="no" 13716 have_lua="no"
13708else 13717else
13709 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS 13718 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
@@ -13713,16 +13722,17 @@ $as_echo "yes" >&6; }
13713 requirement_lua="lua51" 13722 requirement_lua="lua51"
13714fi 13723fi
13715elif test $pkg_failed = untried; then 13724elif test $pkg_failed = untried; then
13725 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13726$as_echo "no" >&6; }
13716 13727
13717pkg_failed=no 13728pkg_failed=no
13718{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 13729{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
13719$as_echo_n "checking for LUA... " >&6; } 13730$as_echo_n "checking for LUA... " >&6; }
13720 13731
13721if test -n "$PKG_CONFIG"; then 13732if test -n "$LUA_CFLAGS"; then
13722 if test -n "$LUA_CFLAGS"; then 13733 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
13723 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 13734 elif test -n "$PKG_CONFIG"; then
13724 else 13735 if test -n "$PKG_CONFIG" && \
13725 if test -n "$PKG_CONFIG" && \
13726 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 13736 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
13727 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 13737 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
13728 ac_status=$? 13738 ac_status=$?
@@ -13732,15 +13742,13 @@ if test -n "$PKG_CONFIG"; then
13732else 13742else
13733 pkg_failed=yes 13743 pkg_failed=yes
13734fi 13744fi
13735 fi 13745 else
13736else 13746 pkg_failed=untried
13737 pkg_failed=untried
13738fi 13747fi
13739if test -n "$PKG_CONFIG"; then 13748if test -n "$LUA_LIBS"; then
13740 if test -n "$LUA_LIBS"; then 13749 pkg_cv_LUA_LIBS="$LUA_LIBS"
13741 pkg_cv_LUA_LIBS="$LUA_LIBS" 13750 elif test -n "$PKG_CONFIG"; then
13742 else 13751 if test -n "$PKG_CONFIG" && \
13743 if test -n "$PKG_CONFIG" && \
13744 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 13752 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
13745 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 13753 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
13746 ac_status=$? 13754 ac_status=$?
@@ -13750,14 +13758,15 @@ if test -n "$PKG_CONFIG"; then
13750else 13758else
13751 pkg_failed=yes 13759 pkg_failed=yes
13752fi 13760fi
13753 fi 13761 else
13754else 13762 pkg_failed=untried
13755 pkg_failed=untried
13756fi 13763fi
13757 13764
13758 13765
13759 13766
13760if test $pkg_failed = yes; then 13767if test $pkg_failed = yes; then
13768 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13769$as_echo "no" >&6; }
13761 13770
13762if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 13771if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13763 _pkg_short_errors_supported=yes 13772 _pkg_short_errors_supported=yes
@@ -13765,17 +13774,17 @@ else
13765 _pkg_short_errors_supported=no 13774 _pkg_short_errors_supported=no
13766fi 13775fi
13767 if test $_pkg_short_errors_supported = yes; then 13776 if test $_pkg_short_errors_supported = yes; then
13768 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua51 >= 5.1.0"` 13777 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1`
13769 else 13778 else
13770 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua51 >= 5.1.0"` 13779 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1`
13771 fi 13780 fi
13772 # Put the nasty error message in config.log where it belongs 13781 # Put the nasty error message in config.log where it belongs
13773 echo "$LUA_PKG_ERRORS" >&5 13782 echo "$LUA_PKG_ERRORS" >&5
13774 13783
13775 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 13784 have_lua="no"
13776$as_echo "no" >&6; }
13777 have_lua="no"
13778elif test $pkg_failed = untried; then 13785elif test $pkg_failed = untried; then
13786 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13787$as_echo "no" >&6; }
13779 have_lua="no" 13788 have_lua="no"
13780else 13789else
13781 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS 13790 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
@@ -13860,7 +13869,7 @@ fi
13860 13869
13861 13870
13862if test "x${have_lua}" = "xno" ; then 13871if test "x${have_lua}" = "xno" ; then
13863 as_fn_error "Cannot find lua library. Be sure that you have installed it and set CFLAGS and LDFLAGS correctly" "$LINENO" 5 13872 as_fn_error $? "Cannot find lua library. Be sure that you have installed it and set CFLAGS and LDFLAGS correctly" "$LINENO" 5
13864fi 13873fi
13865 13874
13866 13875
@@ -13868,64 +13877,62 @@ pkg_failed=no
13868{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MINIMAL" >&5 13877{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MINIMAL" >&5
13869$as_echo_n "checking for MINIMAL... " >&6; } 13878$as_echo_n "checking for MINIMAL... " >&6; }
13870 13879
13871if test -n "$PKG_CONFIG"; then 13880if test -n "$MINIMAL_CFLAGS"; then
13872 if test -n "$MINIMAL_CFLAGS"; then 13881 pkg_cv_MINIMAL_CFLAGS="$MINIMAL_CFLAGS"
13873 pkg_cv_MINIMAL_CFLAGS="$MINIMAL_CFLAGS" 13882 elif test -n "$PKG_CONFIG"; then
13874 else 13883 if test -n "$PKG_CONFIG" && \
13875 if test -n "$PKG_CONFIG" && \
13876 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" 13884 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
13877 eina >= 1.1.0 13885 eina >= 1.2.0
13878 eet >= 1.5.0 13886 eet >= 1.6.0
13879 \""; } >&5 13887 \""; } >&5
13880 ($PKG_CONFIG --exists --print-errors " 13888 ($PKG_CONFIG --exists --print-errors "
13881 eina >= 1.1.0 13889 eina >= 1.2.0
13882 eet >= 1.5.0 13890 eet >= 1.6.0
13883 ") 2>&5 13891 ") 2>&5
13884 ac_status=$? 13892 ac_status=$?
13885 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 13893 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13886 test $ac_status = 0; }; then 13894 test $ac_status = 0; }; then
13887 pkg_cv_MINIMAL_CFLAGS=`$PKG_CONFIG --cflags " 13895 pkg_cv_MINIMAL_CFLAGS=`$PKG_CONFIG --cflags "
13888 eina >= 1.1.0 13896 eina >= 1.2.0
13889 eet >= 1.5.0 13897 eet >= 1.6.0
13890 " 2>/dev/null` 13898 " 2>/dev/null`
13891else 13899else
13892 pkg_failed=yes 13900 pkg_failed=yes
13893fi 13901fi
13894 fi 13902 else
13895else 13903 pkg_failed=untried
13896 pkg_failed=untried
13897fi 13904fi
13898if test -n "$PKG_CONFIG"; then 13905if test -n "$MINIMAL_LIBS"; then
13899 if test -n "$MINIMAL_LIBS"; then 13906 pkg_cv_MINIMAL_LIBS="$MINIMAL_LIBS"
13900 pkg_cv_MINIMAL_LIBS="$MINIMAL_LIBS" 13907 elif test -n "$PKG_CONFIG"; then
13901 else 13908 if test -n "$PKG_CONFIG" && \
13902 if test -n "$PKG_CONFIG" && \
13903 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" 13909 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
13904 eina >= 1.1.0 13910 eina >= 1.2.0
13905 eet >= 1.5.0 13911 eet >= 1.6.0
13906 \""; } >&5 13912 \""; } >&5
13907 ($PKG_CONFIG --exists --print-errors " 13913 ($PKG_CONFIG --exists --print-errors "
13908 eina >= 1.1.0 13914 eina >= 1.2.0
13909 eet >= 1.5.0 13915 eet >= 1.6.0
13910 ") 2>&5 13916 ") 2>&5
13911 ac_status=$? 13917 ac_status=$?
13912 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 13918 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13913 test $ac_status = 0; }; then 13919 test $ac_status = 0; }; then
13914 pkg_cv_MINIMAL_LIBS=`$PKG_CONFIG --libs " 13920 pkg_cv_MINIMAL_LIBS=`$PKG_CONFIG --libs "
13915 eina >= 1.1.0 13921 eina >= 1.2.0
13916 eet >= 1.5.0 13922 eet >= 1.6.0
13917 " 2>/dev/null` 13923 " 2>/dev/null`
13918else 13924else
13919 pkg_failed=yes 13925 pkg_failed=yes
13920fi 13926fi
13921 fi 13927 else
13922else 13928 pkg_failed=untried
13923 pkg_failed=untried
13924fi 13929fi
13925 13930
13926 13931
13927 13932
13928if test $pkg_failed = yes; then 13933if test $pkg_failed = yes; then
13934 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13935$as_echo "no" >&6; }
13929 13936
13930if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 13937if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13931 _pkg_short_errors_supported=yes 13938 _pkg_short_errors_supported=yes
@@ -13933,22 +13940,22 @@ else
13933 _pkg_short_errors_supported=no 13940 _pkg_short_errors_supported=no
13934fi 13941fi
13935 if test $_pkg_short_errors_supported = yes; then 13942 if test $_pkg_short_errors_supported = yes; then
13936 MINIMAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " 13943 MINIMAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
13937 eina >= 1.1.0 13944 eina >= 1.2.0
13938 eet >= 1.5.0 13945 eet >= 1.6.0
13939 "` 13946 " 2>&1`
13940 else 13947 else
13941 MINIMAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " 13948 MINIMAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "
13942 eina >= 1.1.0 13949 eina >= 1.2.0
13943 eet >= 1.5.0 13950 eet >= 1.6.0
13944 "` 13951 " 2>&1`
13945 fi 13952 fi
13946 # Put the nasty error message in config.log where it belongs 13953 # Put the nasty error message in config.log where it belongs
13947 echo "$MINIMAL_PKG_ERRORS" >&5 13954 echo "$MINIMAL_PKG_ERRORS" >&5
13948 13955
13949 as_fn_error "Package requirements ( 13956 as_fn_error $? "Package requirements (
13950 eina >= 1.1.0 13957 eina >= 1.2.0
13951 eet >= 1.5.0 13958 eet >= 1.6.0
13952 ) were not met: 13959 ) were not met:
13953 13960
13954$MINIMAL_PKG_ERRORS 13961$MINIMAL_PKG_ERRORS
@@ -13958,12 +13965,13 @@ installed software in a non-standard prefix.
13958 13965
13959Alternatively, you may set the environment variables MINIMAL_CFLAGS 13966Alternatively, you may set the environment variables MINIMAL_CFLAGS
13960and MINIMAL_LIBS to avoid the need to call pkg-config. 13967and MINIMAL_LIBS to avoid the need to call pkg-config.
13961See the pkg-config man page for more details. 13968See the pkg-config man page for more details." "$LINENO" 5
13962" "$LINENO" 5
13963elif test $pkg_failed = untried; then 13969elif test $pkg_failed = untried; then
13970 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13971$as_echo "no" >&6; }
13964 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 13972 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
13965$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 13973$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
13966as_fn_error "The pkg-config script could not be found or is too old. Make sure it 13974as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
13967is in your PATH or set the PKG_CONFIG environment variable to the full 13975is in your PATH or set the PKG_CONFIG environment variable to the full
13968path to pkg-config. 13976path to pkg-config.
13969 13977
@@ -13972,13 +13980,13 @@ and MINIMAL_LIBS to avoid the need to call pkg-config.
13972See the pkg-config man page for more details. 13980See the pkg-config man page for more details.
13973 13981
13974To get pkg-config, see <http://pkg-config.freedesktop.org/>. 13982To get pkg-config, see <http://pkg-config.freedesktop.org/>.
13975See \`config.log' for more details." "$LINENO" 5; } 13983See \`config.log' for more details" "$LINENO" 5 ; }
13976else 13984else
13977 MINIMAL_CFLAGS=$pkg_cv_MINIMAL_CFLAGS 13985 MINIMAL_CFLAGS=$pkg_cv_MINIMAL_CFLAGS
13978 MINIMAL_LIBS=$pkg_cv_MINIMAL_LIBS 13986 MINIMAL_LIBS=$pkg_cv_MINIMAL_LIBS
13979 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 13987 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
13980$as_echo "yes" >&6; } 13988$as_echo "yes" >&6; }
13981 : 13989
13982fi 13990fi
13983 13991
13984 13992
@@ -13986,94 +13994,92 @@ pkg_failed=no
13986{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE" >&5 13994{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE" >&5
13987$as_echo_n "checking for EDJE... " >&6; } 13995$as_echo_n "checking for EDJE... " >&6; }
13988 13996
13989if test -n "$PKG_CONFIG"; then 13997if test -n "$EDJE_CFLAGS"; then
13990 if test -n "$EDJE_CFLAGS"; then 13998 pkg_cv_EDJE_CFLAGS="$EDJE_CFLAGS"
13991 pkg_cv_EDJE_CFLAGS="$EDJE_CFLAGS" 13999 elif test -n "$PKG_CONFIG"; then
13992 else 14000 if test -n "$PKG_CONFIG" && \
13993 if test -n "$PKG_CONFIG" && \
13994 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" 14001 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
13995 eina >= 1.1.0 14002 eina >= 1.2.0
13996 eet >= 1.5.0 14003 eet >= 1.6.0
13997 evas >= 1.1.0 14004 evas >= 1.2.0
13998 ecore >= 1.1.0 14005 ecore >= 1.2.0
13999 ecore-evas >= 1.1.0 14006 ecore-evas >= 1.2.0
14000 ecore-file >= 1.1.0 14007 ecore-file >= 1.2.0
14001 embryo >= 1.1.0 14008 embryo >= 1.2.0
14002 \""; } >&5 14009 \""; } >&5
14003 ($PKG_CONFIG --exists --print-errors " 14010 ($PKG_CONFIG --exists --print-errors "
14004 eina >= 1.1.0 14011 eina >= 1.2.0
14005 eet >= 1.5.0 14012 eet >= 1.6.0
14006 evas >= 1.1.0 14013 evas >= 1.2.0
14007 ecore >= 1.1.0 14014 ecore >= 1.2.0
14008 ecore-evas >= 1.1.0 14015 ecore-evas >= 1.2.0
14009 ecore-file >= 1.1.0 14016 ecore-file >= 1.2.0
14010 embryo >= 1.1.0 14017 embryo >= 1.2.0
14011 ") 2>&5 14018 ") 2>&5
14012 ac_status=$? 14019 ac_status=$?
14013 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 14020 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14014 test $ac_status = 0; }; then 14021 test $ac_status = 0; }; then
14015 pkg_cv_EDJE_CFLAGS=`$PKG_CONFIG --cflags " 14022 pkg_cv_EDJE_CFLAGS=`$PKG_CONFIG --cflags "
14016 eina >= 1.1.0 14023 eina >= 1.2.0
14017 eet >= 1.5.0 14024 eet >= 1.6.0
14018 evas >= 1.1.0 14025 evas >= 1.2.0
14019 ecore >= 1.1.0 14026 ecore >= 1.2.0
14020 ecore-evas >= 1.1.0 14027 ecore-evas >= 1.2.0
14021 ecore-file >= 1.1.0 14028 ecore-file >= 1.2.0
14022 embryo >= 1.1.0 14029 embryo >= 1.2.0
14023 " 2>/dev/null` 14030 " 2>/dev/null`
14024else 14031else
14025 pkg_failed=yes 14032 pkg_failed=yes
14026fi 14033fi
14027 fi 14034 else
14028else 14035 pkg_failed=untried
14029 pkg_failed=untried
14030fi 14036fi
14031if test -n "$PKG_CONFIG"; then 14037if test -n "$EDJE_LIBS"; then
14032 if test -n "$EDJE_LIBS"; then 14038 pkg_cv_EDJE_LIBS="$EDJE_LIBS"
14033 pkg_cv_EDJE_LIBS="$EDJE_LIBS" 14039 elif test -n "$PKG_CONFIG"; then
14034 else 14040 if test -n "$PKG_CONFIG" && \
14035 if test -n "$PKG_CONFIG" && \
14036 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" 14041 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
14037 eina >= 1.1.0 14042 eina >= 1.2.0
14038 eet >= 1.5.0 14043 eet >= 1.6.0
14039 evas >= 1.1.0 14044 evas >= 1.2.0
14040 ecore >= 1.1.0 14045 ecore >= 1.2.0
14041 ecore-evas >= 1.1.0 14046 ecore-evas >= 1.2.0
14042 ecore-file >= 1.1.0 14047 ecore-file >= 1.2.0
14043 embryo >= 1.1.0 14048 embryo >= 1.2.0
14044 \""; } >&5 14049 \""; } >&5
14045 ($PKG_CONFIG --exists --print-errors " 14050 ($PKG_CONFIG --exists --print-errors "
14046 eina >= 1.1.0 14051 eina >= 1.2.0
14047 eet >= 1.5.0 14052 eet >= 1.6.0
14048 evas >= 1.1.0 14053 evas >= 1.2.0
14049 ecore >= 1.1.0 14054 ecore >= 1.2.0
14050 ecore-evas >= 1.1.0 14055 ecore-evas >= 1.2.0
14051 ecore-file >= 1.1.0 14056 ecore-file >= 1.2.0
14052 embryo >= 1.1.0 14057 embryo >= 1.2.0
14053 ") 2>&5 14058 ") 2>&5
14054 ac_status=$? 14059 ac_status=$?
14055 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 14060 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14056 test $ac_status = 0; }; then 14061 test $ac_status = 0; }; then
14057 pkg_cv_EDJE_LIBS=`$PKG_CONFIG --libs " 14062 pkg_cv_EDJE_LIBS=`$PKG_CONFIG --libs "
14058 eina >= 1.1.0 14063 eina >= 1.2.0
14059 eet >= 1.5.0 14064 eet >= 1.6.0
14060 evas >= 1.1.0 14065 evas >= 1.2.0
14061 ecore >= 1.1.0 14066 ecore >= 1.2.0
14062 ecore-evas >= 1.1.0 14067 ecore-evas >= 1.2.0
14063 ecore-file >= 1.1.0 14068 ecore-file >= 1.2.0
14064 embryo >= 1.1.0 14069 embryo >= 1.2.0
14065 " 2>/dev/null` 14070 " 2>/dev/null`
14066else 14071else
14067 pkg_failed=yes 14072 pkg_failed=yes
14068fi 14073fi
14069 fi 14074 else
14070else 14075 pkg_failed=untried
14071 pkg_failed=untried
14072fi 14076fi
14073 14077
14074 14078
14075 14079
14076if test $pkg_failed = yes; then 14080if test $pkg_failed = yes; then
14081 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14082$as_echo "no" >&6; }
14077 14083
14078if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 14084if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14079 _pkg_short_errors_supported=yes 14085 _pkg_short_errors_supported=yes
@@ -14081,37 +14087,37 @@ else
14081 _pkg_short_errors_supported=no 14087 _pkg_short_errors_supported=no
14082fi 14088fi
14083 if test $_pkg_short_errors_supported = yes; then 14089 if test $_pkg_short_errors_supported = yes; then
14084 EDJE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " 14090 EDJE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
14085 eina >= 1.1.0 14091 eina >= 1.2.0
14086 eet >= 1.5.0 14092 eet >= 1.6.0
14087 evas >= 1.1.0 14093 evas >= 1.2.0
14088 ecore >= 1.1.0 14094 ecore >= 1.2.0
14089 ecore-evas >= 1.1.0 14095 ecore-evas >= 1.2.0
14090 ecore-file >= 1.1.0 14096 ecore-file >= 1.2.0
14091 embryo >= 1.1.0 14097 embryo >= 1.2.0
14092 "` 14098 " 2>&1`
14093 else 14099 else
14094 EDJE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " 14100 EDJE_PKG_ERRORS=`$PKG_CONFIG --print-errors "
14095 eina >= 1.1.0 14101 eina >= 1.2.0
14096 eet >= 1.5.0 14102 eet >= 1.6.0
14097 evas >= 1.1.0 14103 evas >= 1.2.0
14098 ecore >= 1.1.0 14104 ecore >= 1.2.0
14099 ecore-evas >= 1.1.0 14105 ecore-evas >= 1.2.0
14100 ecore-file >= 1.1.0 14106 ecore-file >= 1.2.0
14101 embryo >= 1.1.0 14107 embryo >= 1.2.0
14102 "` 14108 " 2>&1`
14103 fi 14109 fi
14104 # Put the nasty error message in config.log where it belongs 14110 # Put the nasty error message in config.log where it belongs
14105 echo "$EDJE_PKG_ERRORS" >&5 14111 echo "$EDJE_PKG_ERRORS" >&5
14106 14112
14107 as_fn_error "Package requirements ( 14113 as_fn_error $? "Package requirements (
14108 eina >= 1.1.0 14114 eina >= 1.2.0
14109 eet >= 1.5.0 14115 eet >= 1.6.0
14110 evas >= 1.1.0 14116 evas >= 1.2.0
14111 ecore >= 1.1.0 14117 ecore >= 1.2.0
14112 ecore-evas >= 1.1.0 14118 ecore-evas >= 1.2.0
14113 ecore-file >= 1.1.0 14119 ecore-file >= 1.2.0
14114 embryo >= 1.1.0 14120 embryo >= 1.2.0
14115 ) were not met: 14121 ) were not met:
14116 14122
14117$EDJE_PKG_ERRORS 14123$EDJE_PKG_ERRORS
@@ -14121,12 +14127,13 @@ installed software in a non-standard prefix.
14121 14127
14122Alternatively, you may set the environment variables EDJE_CFLAGS 14128Alternatively, you may set the environment variables EDJE_CFLAGS
14123and EDJE_LIBS to avoid the need to call pkg-config. 14129and EDJE_LIBS to avoid the need to call pkg-config.
14124See the pkg-config man page for more details. 14130See the pkg-config man page for more details." "$LINENO" 5
14125" "$LINENO" 5
14126elif test $pkg_failed = untried; then 14131elif test $pkg_failed = untried; then
14132 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14133$as_echo "no" >&6; }
14127 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 14134 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
14128$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 14135$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
14129as_fn_error "The pkg-config script could not be found or is too old. Make sure it 14136as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
14130is in your PATH or set the PKG_CONFIG environment variable to the full 14137is in your PATH or set the PKG_CONFIG environment variable to the full
14131path to pkg-config. 14138path to pkg-config.
14132 14139
@@ -14135,19 +14142,19 @@ and EDJE_LIBS to avoid the need to call pkg-config.
14135See the pkg-config man page for more details. 14142See the pkg-config man page for more details.
14136 14143
14137To get pkg-config, see <http://pkg-config.freedesktop.org/>. 14144To get pkg-config, see <http://pkg-config.freedesktop.org/>.
14138See \`config.log' for more details." "$LINENO" 5; } 14145See \`config.log' for more details" "$LINENO" 5 ; }
14139else 14146else
14140 EDJE_CFLAGS=$pkg_cv_EDJE_CFLAGS 14147 EDJE_CFLAGS=$pkg_cv_EDJE_CFLAGS
14141 EDJE_LIBS=$pkg_cv_EDJE_LIBS 14148 EDJE_LIBS=$pkg_cv_EDJE_LIBS
14142 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 14149 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14143$as_echo "yes" >&6; } 14150$as_echo "yes" >&6; }
14144 : 14151
14145fi 14152fi
14146 14153
14147EDJE_LIBS="${EDJE_LIBS} ${LUA_LIBS} ${lua_libs}" 14154EDJE_LIBS="${EDJE_LIBS} ${LUA_LIBS} ${lua_libs}"
14148EDJE_CFLAGS="${EDJE_CFLAGS} ${LUA_CFLAGS}" 14155EDJE_CFLAGS="${EDJE_CFLAGS} ${LUA_CFLAGS}"
14149 14156
14150requirement_edje="embryo >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0 ${requirement_edje}" 14157requirement_edje="embryo >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0 ${requirement_edje}"
14151requirement_edje="${requirement_lua} ${requirement_edje}" 14158requirement_edje="${requirement_lua} ${requirement_edje}"
14152 14159
14153have_ecore_imf="no" 14160have_ecore_imf="no"
@@ -14156,64 +14163,62 @@ pkg_failed=no
14156{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ECORE_IMF" >&5 14163{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ECORE_IMF" >&5
14157$as_echo_n "checking for ECORE_IMF... " >&6; } 14164$as_echo_n "checking for ECORE_IMF... " >&6; }
14158 14165
14159if test -n "$PKG_CONFIG"; then 14166if test -n "$ECORE_IMF_CFLAGS"; then
14160 if test -n "$ECORE_IMF_CFLAGS"; then 14167 pkg_cv_ECORE_IMF_CFLAGS="$ECORE_IMF_CFLAGS"
14161 pkg_cv_ECORE_IMF_CFLAGS="$ECORE_IMF_CFLAGS" 14168 elif test -n "$PKG_CONFIG"; then
14162 else 14169 if test -n "$PKG_CONFIG" && \
14163 if test -n "$PKG_CONFIG" && \
14164 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" 14170 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
14165 ecore-imf >= 1.1.0 14171 ecore-imf >= 1.2.0
14166 ecore-imf-evas >= 1.1.0 14172 ecore-imf-evas >= 1.2.0
14167 \""; } >&5 14173 \""; } >&5
14168 ($PKG_CONFIG --exists --print-errors " 14174 ($PKG_CONFIG --exists --print-errors "
14169 ecore-imf >= 1.1.0 14175 ecore-imf >= 1.2.0
14170 ecore-imf-evas >= 1.1.0 14176 ecore-imf-evas >= 1.2.0
14171 ") 2>&5 14177 ") 2>&5
14172 ac_status=$? 14178 ac_status=$?
14173 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 14179 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14174 test $ac_status = 0; }; then 14180 test $ac_status = 0; }; then
14175 pkg_cv_ECORE_IMF_CFLAGS=`$PKG_CONFIG --cflags " 14181 pkg_cv_ECORE_IMF_CFLAGS=`$PKG_CONFIG --cflags "
14176 ecore-imf >= 1.1.0 14182 ecore-imf >= 1.2.0
14177 ecore-imf-evas >= 1.1.0 14183 ecore-imf-evas >= 1.2.0
14178 " 2>/dev/null` 14184 " 2>/dev/null`
14179else 14185else
14180 pkg_failed=yes 14186 pkg_failed=yes
14181fi 14187fi
14182 fi 14188 else
14183else 14189 pkg_failed=untried
14184 pkg_failed=untried
14185fi 14190fi
14186if test -n "$PKG_CONFIG"; then 14191if test -n "$ECORE_IMF_LIBS"; then
14187 if test -n "$ECORE_IMF_LIBS"; then 14192 pkg_cv_ECORE_IMF_LIBS="$ECORE_IMF_LIBS"
14188 pkg_cv_ECORE_IMF_LIBS="$ECORE_IMF_LIBS" 14193 elif test -n "$PKG_CONFIG"; then
14189 else 14194 if test -n "$PKG_CONFIG" && \
14190 if test -n "$PKG_CONFIG" && \
14191 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" 14195 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
14192 ecore-imf >= 1.1.0 14196 ecore-imf >= 1.2.0
14193 ecore-imf-evas >= 1.1.0 14197 ecore-imf-evas >= 1.2.0
14194 \""; } >&5 14198 \""; } >&5
14195 ($PKG_CONFIG --exists --print-errors " 14199 ($PKG_CONFIG --exists --print-errors "
14196 ecore-imf >= 1.1.0 14200 ecore-imf >= 1.2.0
14197 ecore-imf-evas >= 1.1.0 14201 ecore-imf-evas >= 1.2.0
14198 ") 2>&5 14202 ") 2>&5
14199 ac_status=$? 14203 ac_status=$?
14200 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 14204 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14201 test $ac_status = 0; }; then 14205 test $ac_status = 0; }; then
14202 pkg_cv_ECORE_IMF_LIBS=`$PKG_CONFIG --libs " 14206 pkg_cv_ECORE_IMF_LIBS=`$PKG_CONFIG --libs "
14203 ecore-imf >= 1.1.0 14207 ecore-imf >= 1.2.0
14204 ecore-imf-evas >= 1.1.0 14208 ecore-imf-evas >= 1.2.0
14205 " 2>/dev/null` 14209 " 2>/dev/null`
14206else 14210else
14207 pkg_failed=yes 14211 pkg_failed=yes
14208fi 14212fi
14209 fi 14213 else
14210else 14214 pkg_failed=untried
14211 pkg_failed=untried
14212fi 14215fi
14213 14216
14214 14217
14215 14218
14216if test $pkg_failed = yes; then 14219if test $pkg_failed = yes; then
14220 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14221$as_echo "no" >&6; }
14217 14222
14218if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 14223if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14219 _pkg_short_errors_supported=yes 14224 _pkg_short_errors_supported=yes
@@ -14221,23 +14226,23 @@ else
14221 _pkg_short_errors_supported=no 14226 _pkg_short_errors_supported=no
14222fi 14227fi
14223 if test $_pkg_short_errors_supported = yes; then 14228 if test $_pkg_short_errors_supported = yes; then
14224 ECORE_IMF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " 14229 ECORE_IMF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
14225 ecore-imf >= 1.1.0 14230 ecore-imf >= 1.2.0
14226 ecore-imf-evas >= 1.1.0 14231 ecore-imf-evas >= 1.2.0
14227 "` 14232 " 2>&1`
14228 else 14233 else
14229 ECORE_IMF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " 14234 ECORE_IMF_PKG_ERRORS=`$PKG_CONFIG --print-errors "
14230 ecore-imf >= 1.1.0 14235 ecore-imf >= 1.2.0
14231 ecore-imf-evas >= 1.1.0 14236 ecore-imf-evas >= 1.2.0
14232 "` 14237 " 2>&1`
14233 fi 14238 fi
14234 # Put the nasty error message in config.log where it belongs 14239 # Put the nasty error message in config.log where it belongs
14235 echo "$ECORE_IMF_PKG_ERRORS" >&5 14240 echo "$ECORE_IMF_PKG_ERRORS" >&5
14236 14241
14237 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 14242 have_ecore_imf="no"
14238$as_echo "no" >&6; }
14239 have_ecore_imf="no"
14240elif test $pkg_failed = untried; then 14243elif test $pkg_failed = untried; then
14244 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14245$as_echo "no" >&6; }
14241 have_ecore_imf="no" 14246 have_ecore_imf="no"
14242else 14247else
14243 ECORE_IMF_CFLAGS=$pkg_cv_ECORE_IMF_CFLAGS 14248 ECORE_IMF_CFLAGS=$pkg_cv_ECORE_IMF_CFLAGS
@@ -14249,7 +14254,7 @@ $as_echo "yes" >&6; }
14249$as_echo "#define HAVE_ECORE_IMF 1" >>confdefs.h 14254$as_echo "#define HAVE_ECORE_IMF 1" >>confdefs.h
14250 14255
14251 have_ecore_imf="yes" 14256 have_ecore_imf="yes"
14252 requirement_edje="ecore-imf-evas >= 1.1.0 ecore-imf >= 1.1.0 ${requirement_edje}" 14257 requirement_edje="ecore-imf-evas >= 1.2.0 ecore-imf >= 1.2.0 ${requirement_edje}"
14253 14258
14254fi 14259fi
14255 14260
@@ -14286,11 +14291,10 @@ pkg_failed=no
14286{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SNDFILE" >&5 14291{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SNDFILE" >&5
14287$as_echo_n "checking for SNDFILE... " >&6; } 14292$as_echo_n "checking for SNDFILE... " >&6; }
14288 14293
14289if test -n "$PKG_CONFIG"; then 14294if test -n "$SNDFILE_CFLAGS"; then
14290 if test -n "$SNDFILE_CFLAGS"; then 14295 pkg_cv_SNDFILE_CFLAGS="$SNDFILE_CFLAGS"
14291 pkg_cv_SNDFILE_CFLAGS="$SNDFILE_CFLAGS" 14296 elif test -n "$PKG_CONFIG"; then
14292 else 14297 if test -n "$PKG_CONFIG" && \
14293 if test -n "$PKG_CONFIG" && \
14294 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndfile >= 1.0.21\""; } >&5 14298 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndfile >= 1.0.21\""; } >&5
14295 ($PKG_CONFIG --exists --print-errors "sndfile >= 1.0.21") 2>&5 14299 ($PKG_CONFIG --exists --print-errors "sndfile >= 1.0.21") 2>&5
14296 ac_status=$? 14300 ac_status=$?
@@ -14300,15 +14304,13 @@ if test -n "$PKG_CONFIG"; then
14300else 14304else
14301 pkg_failed=yes 14305 pkg_failed=yes
14302fi 14306fi
14303 fi 14307 else
14304else 14308 pkg_failed=untried
14305 pkg_failed=untried
14306fi 14309fi
14307if test -n "$PKG_CONFIG"; then 14310if test -n "$SNDFILE_LIBS"; then
14308 if test -n "$SNDFILE_LIBS"; then 14311 pkg_cv_SNDFILE_LIBS="$SNDFILE_LIBS"
14309 pkg_cv_SNDFILE_LIBS="$SNDFILE_LIBS" 14312 elif test -n "$PKG_CONFIG"; then
14310 else 14313 if test -n "$PKG_CONFIG" && \
14311 if test -n "$PKG_CONFIG" && \
14312 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndfile >= 1.0.21\""; } >&5 14314 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndfile >= 1.0.21\""; } >&5
14313 ($PKG_CONFIG --exists --print-errors "sndfile >= 1.0.21") 2>&5 14315 ($PKG_CONFIG --exists --print-errors "sndfile >= 1.0.21") 2>&5
14314 ac_status=$? 14316 ac_status=$?
@@ -14318,14 +14320,15 @@ if test -n "$PKG_CONFIG"; then
14318else 14320else
14319 pkg_failed=yes 14321 pkg_failed=yes
14320fi 14322fi
14321 fi 14323 else
14322else 14324 pkg_failed=untried
14323 pkg_failed=untried
14324fi 14325fi
14325 14326
14326 14327
14327 14328
14328if test $pkg_failed = yes; then 14329if test $pkg_failed = yes; then
14330 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14331$as_echo "no" >&6; }
14329 14332
14330if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 14333if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14331 _pkg_short_errors_supported=yes 14334 _pkg_short_errors_supported=yes
@@ -14333,18 +14336,18 @@ else
14333 _pkg_short_errors_supported=no 14336 _pkg_short_errors_supported=no
14334fi 14337fi
14335 if test $_pkg_short_errors_supported = yes; then 14338 if test $_pkg_short_errors_supported = yes; then
14336 SNDFILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sndfile >= 1.0.21"` 14339 SNDFILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sndfile >= 1.0.21" 2>&1`
14337 else 14340 else
14338 SNDFILE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sndfile >= 1.0.21"` 14341 SNDFILE_PKG_ERRORS=`$PKG_CONFIG --print-errors "sndfile >= 1.0.21" 2>&1`
14339 fi 14342 fi
14340 # Put the nasty error message in config.log where it belongs 14343 # Put the nasty error message in config.log where it belongs
14341 echo "$SNDFILE_PKG_ERRORS" >&5 14344 echo "$SNDFILE_PKG_ERRORS" >&5
14342 14345
14343 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 14346 have_sndfile="no"; want_multisense="no"
14344$as_echo "no" >&6; }
14345 have_sndfile="no"; want_multisense="no"
14346 14347
14347elif test $pkg_failed = untried; then 14348elif test $pkg_failed = untried; then
14349 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14350$as_echo "no" >&6; }
14348 have_sndfile="no"; want_multisense="no" 14351 have_sndfile="no"; want_multisense="no"
14349 14352
14350else 14353else
@@ -14362,7 +14365,7 @@ $as_echo "#define HAVE_LIBSNDFILE 1" >>confdefs.h
14362fi 14365fi
14363 14366
14364 if test "x$want_sndfile" = "xyes" -a "x$have_sndfile" = "xno"; then 14367 if test "x$want_sndfile" = "xyes" -a "x$have_sndfile" = "xno"; then
14365 as_fn_error "sndfile support requested, but not found by pkg-config." "$LINENO" 5 14368 as_fn_error $? "sndfile support requested, but not found by pkg-config." "$LINENO" 5
14366 fi 14369 fi
14367fi 14370fi
14368 if test "x${have_sndfile}" = "xyes"; then 14371 if test "x${have_sndfile}" = "xyes"; then
@@ -14389,11 +14392,10 @@ pkg_failed=no
14389{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for REMIX" >&5 14392{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for REMIX" >&5
14390$as_echo_n "checking for REMIX... " >&6; } 14393$as_echo_n "checking for REMIX... " >&6; }
14391 14394
14392if test -n "$PKG_CONFIG"; then 14395if test -n "$REMIX_CFLAGS"; then
14393 if test -n "$REMIX_CFLAGS"; then 14396 pkg_cv_REMIX_CFLAGS="$REMIX_CFLAGS"
14394 pkg_cv_REMIX_CFLAGS="$REMIX_CFLAGS" 14397 elif test -n "$PKG_CONFIG"; then
14395 else 14398 if test -n "$PKG_CONFIG" && \
14396 if test -n "$PKG_CONFIG" && \
14397 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"remix >= 0.2.4\""; } >&5 14399 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"remix >= 0.2.4\""; } >&5
14398 ($PKG_CONFIG --exists --print-errors "remix >= 0.2.4") 2>&5 14400 ($PKG_CONFIG --exists --print-errors "remix >= 0.2.4") 2>&5
14399 ac_status=$? 14401 ac_status=$?
@@ -14403,15 +14405,13 @@ if test -n "$PKG_CONFIG"; then
14403else 14405else
14404 pkg_failed=yes 14406 pkg_failed=yes
14405fi 14407fi
14406 fi 14408 else
14407else 14409 pkg_failed=untried
14408 pkg_failed=untried
14409fi 14410fi
14410if test -n "$PKG_CONFIG"; then 14411if test -n "$REMIX_LIBS"; then
14411 if test -n "$REMIX_LIBS"; then 14412 pkg_cv_REMIX_LIBS="$REMIX_LIBS"
14412 pkg_cv_REMIX_LIBS="$REMIX_LIBS" 14413 elif test -n "$PKG_CONFIG"; then
14413 else 14414 if test -n "$PKG_CONFIG" && \
14414 if test -n "$PKG_CONFIG" && \
14415 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"remix >= 0.2.4\""; } >&5 14415 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"remix >= 0.2.4\""; } >&5
14416 ($PKG_CONFIG --exists --print-errors "remix >= 0.2.4") 2>&5 14416 ($PKG_CONFIG --exists --print-errors "remix >= 0.2.4") 2>&5
14417 ac_status=$? 14417 ac_status=$?
@@ -14421,14 +14421,15 @@ if test -n "$PKG_CONFIG"; then
14421else 14421else
14422 pkg_failed=yes 14422 pkg_failed=yes
14423fi 14423fi
14424 fi 14424 else
14425else 14425 pkg_failed=untried
14426 pkg_failed=untried
14427fi 14426fi
14428 14427
14429 14428
14430 14429
14431if test $pkg_failed = yes; then 14430if test $pkg_failed = yes; then
14431 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14432$as_echo "no" >&6; }
14432 14433
14433if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 14434if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14434 _pkg_short_errors_supported=yes 14435 _pkg_short_errors_supported=yes
@@ -14436,18 +14437,18 @@ else
14436 _pkg_short_errors_supported=no 14437 _pkg_short_errors_supported=no
14437fi 14438fi
14438 if test $_pkg_short_errors_supported = yes; then 14439 if test $_pkg_short_errors_supported = yes; then
14439 REMIX_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "remix >= 0.2.4"` 14440 REMIX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "remix >= 0.2.4" 2>&1`
14440 else 14441 else
14441 REMIX_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "remix >= 0.2.4"` 14442 REMIX_PKG_ERRORS=`$PKG_CONFIG --print-errors "remix >= 0.2.4" 2>&1`
14442 fi 14443 fi
14443 # Put the nasty error message in config.log where it belongs 14444 # Put the nasty error message in config.log where it belongs
14444 echo "$REMIX_PKG_ERRORS" >&5 14445 echo "$REMIX_PKG_ERRORS" >&5
14445 14446
14446 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 14447 have_libremix="no"; want_multisense="no"
14447$as_echo "no" >&6; }
14448 have_libremix="no"; want_multisense="no"
14449 14448
14450elif test $pkg_failed = untried; then 14449elif test $pkg_failed = untried; then
14450 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14451$as_echo "no" >&6; }
14451 have_libremix="no"; want_multisense="no" 14452 have_libremix="no"; want_multisense="no"
14452 14453
14453else 14454else
@@ -14475,7 +14476,7 @@ _ACEOF
14475fi 14476fi
14476 14477
14477 if test "x$want_libremix" = "xyes" -a "x$have_libremix" = "xno"; then 14478 if test "x$want_libremix" = "xyes" -a "x$have_libremix" = "xno"; then
14478 as_fn_error "remix support requested, but not found by pkg-config." "$LINENO" 5 14479 as_fn_error $? "remix support requested, but not found by pkg-config." "$LINENO" 5
14479 fi 14480 fi
14480fi 14481fi
14481 if test "x${have_libremix}" = "xyes"; then 14482 if test "x${have_libremix}" = "xyes"; then
@@ -14502,11 +14503,10 @@ pkg_failed=no
14502{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VORBISENC" >&5 14503{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VORBISENC" >&5
14503$as_echo_n "checking for VORBISENC... " >&6; } 14504$as_echo_n "checking for VORBISENC... " >&6; }
14504 14505
14505if test -n "$PKG_CONFIG"; then 14506if test -n "$VORBISENC_CFLAGS"; then
14506 if test -n "$VORBISENC_CFLAGS"; then 14507 pkg_cv_VORBISENC_CFLAGS="$VORBISENC_CFLAGS"
14507 pkg_cv_VORBISENC_CFLAGS="$VORBISENC_CFLAGS" 14508 elif test -n "$PKG_CONFIG"; then
14508 else 14509 if test -n "$PKG_CONFIG" && \
14509 if test -n "$PKG_CONFIG" && \
14510 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" 14510 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
14511 ogg >= 1.1.4 14511 ogg >= 1.1.4
14512 vorbis >= 1.2.3 14512 vorbis >= 1.2.3
@@ -14528,15 +14528,13 @@ if test -n "$PKG_CONFIG"; then
14528else 14528else
14529 pkg_failed=yes 14529 pkg_failed=yes
14530fi 14530fi
14531 fi 14531 else
14532else 14532 pkg_failed=untried
14533 pkg_failed=untried
14534fi 14533fi
14535if test -n "$PKG_CONFIG"; then 14534if test -n "$VORBISENC_LIBS"; then
14536 if test -n "$VORBISENC_LIBS"; then 14535 pkg_cv_VORBISENC_LIBS="$VORBISENC_LIBS"
14537 pkg_cv_VORBISENC_LIBS="$VORBISENC_LIBS" 14536 elif test -n "$PKG_CONFIG"; then
14538 else 14537 if test -n "$PKG_CONFIG" && \
14539 if test -n "$PKG_CONFIG" && \
14540 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" 14538 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
14541 ogg >= 1.1.4 14539 ogg >= 1.1.4
14542 vorbis >= 1.2.3 14540 vorbis >= 1.2.3
@@ -14558,14 +14556,15 @@ if test -n "$PKG_CONFIG"; then
14558else 14556else
14559 pkg_failed=yes 14557 pkg_failed=yes
14560fi 14558fi
14561 fi 14559 else
14562else 14560 pkg_failed=untried
14563 pkg_failed=untried
14564fi 14561fi
14565 14562
14566 14563
14567 14564
14568if test $pkg_failed = yes; then 14565if test $pkg_failed = yes; then
14566 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14567$as_echo "no" >&6; }
14569 14568
14570if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 14569if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14571 _pkg_short_errors_supported=yes 14570 _pkg_short_errors_supported=yes
@@ -14573,26 +14572,26 @@ else
14573 _pkg_short_errors_supported=no 14572 _pkg_short_errors_supported=no
14574fi 14573fi
14575 if test $_pkg_short_errors_supported = yes; then 14574 if test $_pkg_short_errors_supported = yes; then
14576 VORBISENC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " 14575 VORBISENC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
14577 ogg >= 1.1.4 14576 ogg >= 1.1.4
14578 vorbis >= 1.2.3 14577 vorbis >= 1.2.3
14579 vorbisenc >= 1.2.3 14578 vorbisenc >= 1.2.3
14580 "` 14579 " 2>&1`
14581 else 14580 else
14582 VORBISENC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " 14581 VORBISENC_PKG_ERRORS=`$PKG_CONFIG --print-errors "
14583 ogg >= 1.1.4 14582 ogg >= 1.1.4
14584 vorbis >= 1.2.3 14583 vorbis >= 1.2.3
14585 vorbisenc >= 1.2.3 14584 vorbisenc >= 1.2.3
14586 "` 14585 " 2>&1`
14587 fi 14586 fi
14588 # Put the nasty error message in config.log where it belongs 14587 # Put the nasty error message in config.log where it belongs
14589 echo "$VORBISENC_PKG_ERRORS" >&5 14588 echo "$VORBISENC_PKG_ERRORS" >&5
14590 14589
14591 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 14590 have_vorbis="no"; want_multisense="no"
14592$as_echo "no" >&6; }
14593 have_vorbis="no"; want_multisense="no"
14594 14591
14595elif test $pkg_failed = untried; then 14592elif test $pkg_failed = untried; then
14593 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14594$as_echo "no" >&6; }
14596 have_vorbis="no"; want_multisense="no" 14595 have_vorbis="no"; want_multisense="no"
14597 14596
14598else 14597else
@@ -14610,7 +14609,7 @@ $as_echo "#define HAVE_VORBIS 1" >>confdefs.h
14610fi 14609fi
14611 14610
14612 if test "x$want_vorbis" = "xyes" -a "x$have_vorbis" = "xno"; then 14611 if test "x$want_vorbis" = "xyes" -a "x$have_vorbis" = "xno"; then
14613 as_fn_error "vorbisenc support requested, but not found by pkg-config." "$LINENO" 5 14612 as_fn_error $? "vorbisenc support requested, but not found by pkg-config." "$LINENO" 5
14614 fi 14613 fi
14615fi 14614fi
14616 14615
@@ -14629,11 +14628,10 @@ pkg_failed=no
14629{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5 14628{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5
14630$as_echo_n "checking for ALSA... " >&6; } 14629$as_echo_n "checking for ALSA... " >&6; }
14631 14630
14632if test -n "$PKG_CONFIG"; then 14631if test -n "$ALSA_CFLAGS"; then
14633 if test -n "$ALSA_CFLAGS"; then 14632 pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"
14634 pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS" 14633 elif test -n "$PKG_CONFIG"; then
14635 else 14634 if test -n "$PKG_CONFIG" && \
14636 if test -n "$PKG_CONFIG" && \
14637 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" 14635 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
14638 alsa >= 1.0.21 14636 alsa >= 1.0.21
14639 \""; } >&5 14637 \""; } >&5
@@ -14649,15 +14647,13 @@ if test -n "$PKG_CONFIG"; then
14649else 14647else
14650 pkg_failed=yes 14648 pkg_failed=yes
14651fi 14649fi
14652 fi 14650 else
14653else 14651 pkg_failed=untried
14654 pkg_failed=untried
14655fi 14652fi
14656if test -n "$PKG_CONFIG"; then 14653if test -n "$ALSA_LIBS"; then
14657 if test -n "$ALSA_LIBS"; then 14654 pkg_cv_ALSA_LIBS="$ALSA_LIBS"
14658 pkg_cv_ALSA_LIBS="$ALSA_LIBS" 14655 elif test -n "$PKG_CONFIG"; then
14659 else 14656 if test -n "$PKG_CONFIG" && \
14660 if test -n "$PKG_CONFIG" && \
14661 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" 14657 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
14662 alsa >= 1.0.21 14658 alsa >= 1.0.21
14663 \""; } >&5 14659 \""; } >&5
@@ -14673,14 +14669,15 @@ if test -n "$PKG_CONFIG"; then
14673else 14669else
14674 pkg_failed=yes 14670 pkg_failed=yes
14675fi 14671fi
14676 fi 14672 else
14677else 14673 pkg_failed=untried
14678 pkg_failed=untried
14679fi 14674fi
14680 14675
14681 14676
14682 14677
14683if test $pkg_failed = yes; then 14678if test $pkg_failed = yes; then
14679 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14680$as_echo "no" >&6; }
14684 14681
14685if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 14682if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14686 _pkg_short_errors_supported=yes 14683 _pkg_short_errors_supported=yes
@@ -14688,22 +14685,22 @@ else
14688 _pkg_short_errors_supported=no 14685 _pkg_short_errors_supported=no
14689fi 14686fi
14690 if test $_pkg_short_errors_supported = yes; then 14687 if test $_pkg_short_errors_supported = yes; then
14691 ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " 14688 ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
14692 alsa >= 1.0.21 14689 alsa >= 1.0.21
14693 "` 14690 " 2>&1`
14694 else 14691 else
14695 ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " 14692 ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors "
14696 alsa >= 1.0.21 14693 alsa >= 1.0.21
14697 "` 14694 " 2>&1`
14698 fi 14695 fi
14699 # Put the nasty error message in config.log where it belongs 14696 # Put the nasty error message in config.log where it belongs
14700 echo "$ALSA_PKG_ERRORS" >&5 14697 echo "$ALSA_PKG_ERRORS" >&5
14701 14698
14702 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 14699 have_alsa_lib="no"; want_multisense="no"
14703$as_echo "no" >&6; }
14704 have_alsa_lib="no"; want_multisense="no"
14705 14700
14706elif test $pkg_failed = untried; then 14701elif test $pkg_failed = untried; then
14702 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14703$as_echo "no" >&6; }
14707 have_alsa_lib="no"; want_multisense="no" 14704 have_alsa_lib="no"; want_multisense="no"
14708 14705
14709else 14706else
@@ -14721,7 +14718,7 @@ $as_echo "#define HAVE_LIBALSA 1" >>confdefs.h
14721fi 14718fi
14722 14719
14723 if test "x$want_alsa_lib" = "xyes" -a "x$have_alsa_lib" = "xno"; then 14720 if test "x$want_alsa_lib" = "xyes" -a "x$have_alsa_lib" = "xno"; then
14724 as_fn_error "alsa support requested, but not found by pkg-config." "$LINENO" 5 14721 as_fn_error $? "alsa support requested, but not found by pkg-config." "$LINENO" 5
14725 fi 14722 fi
14726fi 14723fi
14727 if test "x${have_alsa_lib}" = "xyes"; then 14724 if test "x${have_alsa_lib}" = "xyes"; then
@@ -14749,11 +14746,10 @@ pkg_failed=no
14749{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLAC" >&5 14746{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLAC" >&5
14750$as_echo_n "checking for FLAC... " >&6; } 14747$as_echo_n "checking for FLAC... " >&6; }
14751 14748
14752if test -n "$PKG_CONFIG"; then 14749if test -n "$FLAC_CFLAGS"; then
14753 if test -n "$FLAC_CFLAGS"; then 14750 pkg_cv_FLAC_CFLAGS="$FLAC_CFLAGS"
14754 pkg_cv_FLAC_CFLAGS="$FLAC_CFLAGS" 14751 elif test -n "$PKG_CONFIG"; then
14755 else 14752 if test -n "$PKG_CONFIG" && \
14756 if test -n "$PKG_CONFIG" && \
14757 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" 14753 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
14758 flac >= 1.2.1 14754 flac >= 1.2.1
14759 \""; } >&5 14755 \""; } >&5
@@ -14769,15 +14765,13 @@ if test -n "$PKG_CONFIG"; then
14769else 14765else
14770 pkg_failed=yes 14766 pkg_failed=yes
14771fi 14767fi
14772 fi 14768 else
14773else 14769 pkg_failed=untried
14774 pkg_failed=untried
14775fi 14770fi
14776if test -n "$PKG_CONFIG"; then 14771if test -n "$FLAC_LIBS"; then
14777 if test -n "$FLAC_LIBS"; then 14772 pkg_cv_FLAC_LIBS="$FLAC_LIBS"
14778 pkg_cv_FLAC_LIBS="$FLAC_LIBS" 14773 elif test -n "$PKG_CONFIG"; then
14779 else 14774 if test -n "$PKG_CONFIG" && \
14780 if test -n "$PKG_CONFIG" && \
14781 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" 14775 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
14782 flac >= 1.2.1 14776 flac >= 1.2.1
14783 \""; } >&5 14777 \""; } >&5
@@ -14793,14 +14787,15 @@ if test -n "$PKG_CONFIG"; then
14793else 14787else
14794 pkg_failed=yes 14788 pkg_failed=yes
14795fi 14789fi
14796 fi 14790 else
14797else 14791 pkg_failed=untried
14798 pkg_failed=untried
14799fi 14792fi
14800 14793
14801 14794
14802 14795
14803if test $pkg_failed = yes; then 14796if test $pkg_failed = yes; then
14797 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14798$as_echo "no" >&6; }
14804 14799
14805if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 14800if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14806 _pkg_short_errors_supported=yes 14801 _pkg_short_errors_supported=yes
@@ -14808,22 +14803,22 @@ else
14808 _pkg_short_errors_supported=no 14803 _pkg_short_errors_supported=no
14809fi 14804fi
14810 if test $_pkg_short_errors_supported = yes; then 14805 if test $_pkg_short_errors_supported = yes; then
14811 FLAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " 14806 FLAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
14812 flac >= 1.2.1 14807 flac >= 1.2.1
14813 "` 14808 " 2>&1`
14814 else 14809 else
14815 FLAC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " 14810 FLAC_PKG_ERRORS=`$PKG_CONFIG --print-errors "
14816 flac >= 1.2.1 14811 flac >= 1.2.1
14817 "` 14812 " 2>&1`
14818 fi 14813 fi
14819 # Put the nasty error message in config.log where it belongs 14814 # Put the nasty error message in config.log where it belongs
14820 echo "$FLAC_PKG_ERRORS" >&5 14815 echo "$FLAC_PKG_ERRORS" >&5
14821 14816
14822 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 14817 have_flac_lib="no"; want_multisense="no"
14823$as_echo "no" >&6; }
14824 have_flac_lib="no"; want_multisense="no"
14825 14818
14826elif test $pkg_failed = untried; then 14819elif test $pkg_failed = untried; then
14820 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14821$as_echo "no" >&6; }
14827 have_flac_lib="no"; want_multisense="no" 14822 have_flac_lib="no"; want_multisense="no"
14828 14823
14829else 14824else
@@ -14844,7 +14839,7 @@ $as_echo "#define HAVE_LIBFLAC 1" >>confdefs.h
14844 14839
14845fi 14840fi
14846 if test "x$want_flac_lib" = "xyes" -a "x$have_flac_lib" = "xno"; then 14841 if test "x$want_flac_lib" = "xyes" -a "x$have_flac_lib" = "xno"; then
14847 as_fn_error "flac support requested, but not found by pkg-config." "$LINENO" 5 14842 as_fn_error $? "flac support requested, but not found by pkg-config." "$LINENO" 5
14848 fi 14843 fi
14849fi 14844fi
14850 14845
@@ -14862,46 +14857,44 @@ pkg_failed=no
14862{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE_CC" >&5 14857{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE_CC" >&5
14863$as_echo_n "checking for EDJE_CC... " >&6; } 14858$as_echo_n "checking for EDJE_CC... " >&6; }
14864 14859
14865if test -n "$PKG_CONFIG"; then 14860if test -n "$EDJE_CC_CFLAGS"; then
14866 if test -n "$EDJE_CC_CFLAGS"; then 14861 pkg_cv_EDJE_CC_CFLAGS="$EDJE_CC_CFLAGS"
14867 pkg_cv_EDJE_CC_CFLAGS="$EDJE_CC_CFLAGS" 14862 elif test -n "$PKG_CONFIG"; then
14868 else 14863 if test -n "$PKG_CONFIG" && \
14869 if test -n "$PKG_CONFIG" && \ 14864 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0\""; } >&5
14870 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0\""; } >&5 14865 ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0") 2>&5
14871 ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0") 2>&5
14872 ac_status=$? 14866 ac_status=$?
14873 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 14867 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14874 test $ac_status = 0; }; then 14868 test $ac_status = 0; }; then
14875 pkg_cv_EDJE_CC_CFLAGS=`$PKG_CONFIG --cflags "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0" 2>/dev/null` 14869 pkg_cv_EDJE_CC_CFLAGS=`$PKG_CONFIG --cflags "ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0" 2>/dev/null`
14876else 14870else
14877 pkg_failed=yes 14871 pkg_failed=yes
14878fi 14872fi
14879 fi 14873 else
14880else 14874 pkg_failed=untried
14881 pkg_failed=untried
14882fi 14875fi
14883if test -n "$PKG_CONFIG"; then 14876if test -n "$EDJE_CC_LIBS"; then
14884 if test -n "$EDJE_CC_LIBS"; then 14877 pkg_cv_EDJE_CC_LIBS="$EDJE_CC_LIBS"
14885 pkg_cv_EDJE_CC_LIBS="$EDJE_CC_LIBS" 14878 elif test -n "$PKG_CONFIG"; then
14886 else 14879 if test -n "$PKG_CONFIG" && \
14887 if test -n "$PKG_CONFIG" && \ 14880 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0\""; } >&5
14888 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0\""; } >&5 14881 ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0") 2>&5
14889 ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0") 2>&5
14890 ac_status=$? 14882 ac_status=$?
14891 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 14883 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14892 test $ac_status = 0; }; then 14884 test $ac_status = 0; }; then
14893 pkg_cv_EDJE_CC_LIBS=`$PKG_CONFIG --libs "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0" 2>/dev/null` 14885 pkg_cv_EDJE_CC_LIBS=`$PKG_CONFIG --libs "ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0" 2>/dev/null`
14894else 14886else
14895 pkg_failed=yes 14887 pkg_failed=yes
14896fi 14888fi
14897 fi 14889 else
14898else 14890 pkg_failed=untried
14899 pkg_failed=untried
14900fi 14891fi
14901 14892
14902 14893
14903 14894
14904if test $pkg_failed = yes; then 14895if test $pkg_failed = yes; then
14896 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14897$as_echo "no" >&6; }
14905 14898
14906if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 14899if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14907 _pkg_short_errors_supported=yes 14900 _pkg_short_errors_supported=yes
@@ -14909,14 +14902,14 @@ else
14909 _pkg_short_errors_supported=no 14902 _pkg_short_errors_supported=no
14910fi 14903fi
14911 if test $_pkg_short_errors_supported = yes; then 14904 if test $_pkg_short_errors_supported = yes; then
14912 EDJE_CC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0"` 14905 EDJE_CC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0" 2>&1`
14913 else 14906 else
14914 EDJE_CC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0"` 14907 EDJE_CC_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0" 2>&1`
14915 fi 14908 fi
14916 # Put the nasty error message in config.log where it belongs 14909 # Put the nasty error message in config.log where it belongs
14917 echo "$EDJE_CC_PKG_ERRORS" >&5 14910 echo "$EDJE_CC_PKG_ERRORS" >&5
14918 14911
14919 as_fn_error "Package requirements (ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0) were not met: 14912 as_fn_error $? "Package requirements (ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0) were not met:
14920 14913
14921$EDJE_CC_PKG_ERRORS 14914$EDJE_CC_PKG_ERRORS
14922 14915
@@ -14925,12 +14918,13 @@ installed software in a non-standard prefix.
14925 14918
14926Alternatively, you may set the environment variables EDJE_CC_CFLAGS 14919Alternatively, you may set the environment variables EDJE_CC_CFLAGS
14927and EDJE_CC_LIBS to avoid the need to call pkg-config. 14920and EDJE_CC_LIBS to avoid the need to call pkg-config.
14928See the pkg-config man page for more details. 14921See the pkg-config man page for more details." "$LINENO" 5
14929" "$LINENO" 5
14930elif test $pkg_failed = untried; then 14922elif test $pkg_failed = untried; then
14923 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14924$as_echo "no" >&6; }
14931 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 14925 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
14932$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 14926$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
14933as_fn_error "The pkg-config script could not be found or is too old. Make sure it 14927as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
14934is in your PATH or set the PKG_CONFIG environment variable to the full 14928is in your PATH or set the PKG_CONFIG environment variable to the full
14935path to pkg-config. 14929path to pkg-config.
14936 14930
@@ -14939,13 +14933,13 @@ and EDJE_CC_LIBS to avoid the need to call pkg-config.
14939See the pkg-config man page for more details. 14933See the pkg-config man page for more details.
14940 14934
14941To get pkg-config, see <http://pkg-config.freedesktop.org/>. 14935To get pkg-config, see <http://pkg-config.freedesktop.org/>.
14942See \`config.log' for more details." "$LINENO" 5; } 14936See \`config.log' for more details" "$LINENO" 5 ; }
14943else 14937else
14944 EDJE_CC_CFLAGS=$pkg_cv_EDJE_CC_CFLAGS 14938 EDJE_CC_CFLAGS=$pkg_cv_EDJE_CC_CFLAGS
14945 EDJE_CC_LIBS=$pkg_cv_EDJE_CC_LIBS 14939 EDJE_CC_LIBS=$pkg_cv_EDJE_CC_LIBS
14946 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 14940 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14947$as_echo "yes" >&6; } 14941$as_echo "yes" >&6; }
14948 : 14942
14949fi 14943fi
14950 EDJE_CC_LIBS="${EDJE_CC_LIBS} ${LUA_LIBS} ${lua_libs}" 14944 EDJE_CC_LIBS="${EDJE_CC_LIBS} ${LUA_LIBS} ${lua_libs}"
14951fi 14945fi
@@ -14965,46 +14959,44 @@ pkg_failed=no
14965{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE_DECC" >&5 14959{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE_DECC" >&5
14966$as_echo_n "checking for EDJE_DECC... " >&6; } 14960$as_echo_n "checking for EDJE_DECC... " >&6; }
14967 14961
14968if test -n "$PKG_CONFIG"; then 14962if test -n "$EDJE_DECC_CFLAGS"; then
14969 if test -n "$EDJE_DECC_CFLAGS"; then 14963 pkg_cv_EDJE_DECC_CFLAGS="$EDJE_DECC_CFLAGS"
14970 pkg_cv_EDJE_DECC_CFLAGS="$EDJE_DECC_CFLAGS" 14964 elif test -n "$PKG_CONFIG"; then
14971 else 14965 if test -n "$PKG_CONFIG" && \
14972 if test -n "$PKG_CONFIG" && \ 14966 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0\""; } >&5
14973 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0\""; } >&5 14967 ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0") 2>&5
14974 ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0") 2>&5
14975 ac_status=$? 14968 ac_status=$?
14976 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 14969 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14977 test $ac_status = 0; }; then 14970 test $ac_status = 0; }; then
14978 pkg_cv_EDJE_DECC_CFLAGS=`$PKG_CONFIG --cflags "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0" 2>/dev/null` 14971 pkg_cv_EDJE_DECC_CFLAGS=`$PKG_CONFIG --cflags "ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0" 2>/dev/null`
14979else 14972else
14980 pkg_failed=yes 14973 pkg_failed=yes
14981fi 14974fi
14982 fi 14975 else
14983else 14976 pkg_failed=untried
14984 pkg_failed=untried
14985fi 14977fi
14986if test -n "$PKG_CONFIG"; then 14978if test -n "$EDJE_DECC_LIBS"; then
14987 if test -n "$EDJE_DECC_LIBS"; then 14979 pkg_cv_EDJE_DECC_LIBS="$EDJE_DECC_LIBS"
14988 pkg_cv_EDJE_DECC_LIBS="$EDJE_DECC_LIBS" 14980 elif test -n "$PKG_CONFIG"; then
14989 else 14981 if test -n "$PKG_CONFIG" && \
14990 if test -n "$PKG_CONFIG" && \ 14982 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0\""; } >&5
14991 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0\""; } >&5 14983 ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0") 2>&5
14992 ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0") 2>&5
14993 ac_status=$? 14984 ac_status=$?
14994 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 14985 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14995 test $ac_status = 0; }; then 14986 test $ac_status = 0; }; then
14996 pkg_cv_EDJE_DECC_LIBS=`$PKG_CONFIG --libs "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0" 2>/dev/null` 14987 pkg_cv_EDJE_DECC_LIBS=`$PKG_CONFIG --libs "ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0" 2>/dev/null`
14997else 14988else
14998 pkg_failed=yes 14989 pkg_failed=yes
14999fi 14990fi
15000 fi 14991 else
15001else 14992 pkg_failed=untried
15002 pkg_failed=untried
15003fi 14993fi
15004 14994
15005 14995
15006 14996
15007if test $pkg_failed = yes; then 14997if test $pkg_failed = yes; then
14998 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14999$as_echo "no" >&6; }
15008 15000
15009if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 15001if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
15010 _pkg_short_errors_supported=yes 15002 _pkg_short_errors_supported=yes
@@ -15012,14 +15004,14 @@ else
15012 _pkg_short_errors_supported=no 15004 _pkg_short_errors_supported=no
15013fi 15005fi
15014 if test $_pkg_short_errors_supported = yes; then 15006 if test $_pkg_short_errors_supported = yes; then
15015 EDJE_DECC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0"` 15007 EDJE_DECC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0" 2>&1`
15016 else 15008 else
15017 EDJE_DECC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0"` 15009 EDJE_DECC_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0" 2>&1`
15018 fi 15010 fi
15019 # Put the nasty error message in config.log where it belongs 15011 # Put the nasty error message in config.log where it belongs
15020 echo "$EDJE_DECC_PKG_ERRORS" >&5 15012 echo "$EDJE_DECC_PKG_ERRORS" >&5
15021 15013
15022 as_fn_error "Package requirements (ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0) were not met: 15014 as_fn_error $? "Package requirements (ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0) were not met:
15023 15015
15024$EDJE_DECC_PKG_ERRORS 15016$EDJE_DECC_PKG_ERRORS
15025 15017
@@ -15028,12 +15020,13 @@ installed software in a non-standard prefix.
15028 15020
15029Alternatively, you may set the environment variables EDJE_DECC_CFLAGS 15021Alternatively, you may set the environment variables EDJE_DECC_CFLAGS
15030and EDJE_DECC_LIBS to avoid the need to call pkg-config. 15022and EDJE_DECC_LIBS to avoid the need to call pkg-config.
15031See the pkg-config man page for more details. 15023See the pkg-config man page for more details." "$LINENO" 5
15032" "$LINENO" 5
15033elif test $pkg_failed = untried; then 15024elif test $pkg_failed = untried; then
15025 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15026$as_echo "no" >&6; }
15034 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 15027 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
15035$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 15028$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
15036as_fn_error "The pkg-config script could not be found or is too old. Make sure it 15029as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
15037is in your PATH or set the PKG_CONFIG environment variable to the full 15030is in your PATH or set the PKG_CONFIG environment variable to the full
15038path to pkg-config. 15031path to pkg-config.
15039 15032
@@ -15042,13 +15035,13 @@ and EDJE_DECC_LIBS to avoid the need to call pkg-config.
15042See the pkg-config man page for more details. 15035See the pkg-config man page for more details.
15043 15036
15044To get pkg-config, see <http://pkg-config.freedesktop.org/>. 15037To get pkg-config, see <http://pkg-config.freedesktop.org/>.
15045See \`config.log' for more details." "$LINENO" 5; } 15038See \`config.log' for more details" "$LINENO" 5 ; }
15046else 15039else
15047 EDJE_DECC_CFLAGS=$pkg_cv_EDJE_DECC_CFLAGS 15040 EDJE_DECC_CFLAGS=$pkg_cv_EDJE_DECC_CFLAGS
15048 EDJE_DECC_LIBS=$pkg_cv_EDJE_DECC_LIBS 15041 EDJE_DECC_LIBS=$pkg_cv_EDJE_DECC_LIBS
15049 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 15042 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
15050$as_echo "yes" >&6; } 15043$as_echo "yes" >&6; }
15051 : 15044
15052fi 15045fi
15053fi 15046fi
15054 15047
@@ -15058,46 +15051,44 @@ pkg_failed=no
15058{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE_PLAYER" >&5 15051{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE_PLAYER" >&5
15059$as_echo_n "checking for EDJE_PLAYER... " >&6; } 15052$as_echo_n "checking for EDJE_PLAYER... " >&6; }
15060 15053
15061if test -n "$PKG_CONFIG"; then 15054if test -n "$EDJE_PLAYER_CFLAGS"; then
15062 if test -n "$EDJE_PLAYER_CFLAGS"; then 15055 pkg_cv_EDJE_PLAYER_CFLAGS="$EDJE_PLAYER_CFLAGS"
15063 pkg_cv_EDJE_PLAYER_CFLAGS="$EDJE_PLAYER_CFLAGS" 15056 elif test -n "$PKG_CONFIG"; then
15064 else 15057 if test -n "$PKG_CONFIG" && \
15065 if test -n "$PKG_CONFIG" && \ 15058 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0\""; } >&5
15066 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0\""; } >&5 15059 ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0") 2>&5
15067 ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0") 2>&5
15068 ac_status=$? 15060 ac_status=$?
15069 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 15061 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
15070 test $ac_status = 0; }; then 15062 test $ac_status = 0; }; then
15071 pkg_cv_EDJE_PLAYER_CFLAGS=`$PKG_CONFIG --cflags "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0" 2>/dev/null` 15063 pkg_cv_EDJE_PLAYER_CFLAGS=`$PKG_CONFIG --cflags "ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0" 2>/dev/null`
15072else 15064else
15073 pkg_failed=yes 15065 pkg_failed=yes
15074fi 15066fi
15075 fi 15067 else
15076else 15068 pkg_failed=untried
15077 pkg_failed=untried
15078fi 15069fi
15079if test -n "$PKG_CONFIG"; then 15070if test -n "$EDJE_PLAYER_LIBS"; then
15080 if test -n "$EDJE_PLAYER_LIBS"; then 15071 pkg_cv_EDJE_PLAYER_LIBS="$EDJE_PLAYER_LIBS"
15081 pkg_cv_EDJE_PLAYER_LIBS="$EDJE_PLAYER_LIBS" 15072 elif test -n "$PKG_CONFIG"; then
15082 else 15073 if test -n "$PKG_CONFIG" && \
15083 if test -n "$PKG_CONFIG" && \ 15074 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0\""; } >&5
15084 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0\""; } >&5 15075 ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0") 2>&5
15085 ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0") 2>&5
15086 ac_status=$? 15076 ac_status=$?
15087 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 15077 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
15088 test $ac_status = 0; }; then 15078 test $ac_status = 0; }; then
15089 pkg_cv_EDJE_PLAYER_LIBS=`$PKG_CONFIG --libs "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0" 2>/dev/null` 15079 pkg_cv_EDJE_PLAYER_LIBS=`$PKG_CONFIG --libs "ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0" 2>/dev/null`
15090else 15080else
15091 pkg_failed=yes 15081 pkg_failed=yes
15092fi 15082fi
15093 fi 15083 else
15094else 15084 pkg_failed=untried
15095 pkg_failed=untried
15096fi 15085fi
15097 15086
15098 15087
15099 15088
15100if test $pkg_failed = yes; then 15089if test $pkg_failed = yes; then
15090 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15091$as_echo "no" >&6; }
15101 15092
15102if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 15093if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
15103 _pkg_short_errors_supported=yes 15094 _pkg_short_errors_supported=yes
@@ -15105,14 +15096,14 @@ else
15105 _pkg_short_errors_supported=no 15096 _pkg_short_errors_supported=no
15106fi 15097fi
15107 if test $_pkg_short_errors_supported = yes; then 15098 if test $_pkg_short_errors_supported = yes; then
15108 EDJE_PLAYER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0"` 15099 EDJE_PLAYER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0" 2>&1`
15109 else 15100 else
15110 EDJE_PLAYER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0"` 15101 EDJE_PLAYER_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0" 2>&1`
15111 fi 15102 fi
15112 # Put the nasty error message in config.log where it belongs 15103 # Put the nasty error message in config.log where it belongs
15113 echo "$EDJE_PLAYER_PKG_ERRORS" >&5 15104 echo "$EDJE_PLAYER_PKG_ERRORS" >&5
15114 15105
15115 as_fn_error "Package requirements (ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0) were not met: 15106 as_fn_error $? "Package requirements (ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0) were not met:
15116 15107
15117$EDJE_PLAYER_PKG_ERRORS 15108$EDJE_PLAYER_PKG_ERRORS
15118 15109
@@ -15121,12 +15112,13 @@ installed software in a non-standard prefix.
15121 15112
15122Alternatively, you may set the environment variables EDJE_PLAYER_CFLAGS 15113Alternatively, you may set the environment variables EDJE_PLAYER_CFLAGS
15123and EDJE_PLAYER_LIBS to avoid the need to call pkg-config. 15114and EDJE_PLAYER_LIBS to avoid the need to call pkg-config.
15124See the pkg-config man page for more details. 15115See the pkg-config man page for more details." "$LINENO" 5
15125" "$LINENO" 5
15126elif test $pkg_failed = untried; then 15116elif test $pkg_failed = untried; then
15117 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15118$as_echo "no" >&6; }
15127 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 15119 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
15128$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 15120$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
15129as_fn_error "The pkg-config script could not be found or is too old. Make sure it 15121as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
15130is in your PATH or set the PKG_CONFIG environment variable to the full 15122is in your PATH or set the PKG_CONFIG environment variable to the full
15131path to pkg-config. 15123path to pkg-config.
15132 15124
@@ -15135,13 +15127,13 @@ and EDJE_PLAYER_LIBS to avoid the need to call pkg-config.
15135See the pkg-config man page for more details. 15127See the pkg-config man page for more details.
15136 15128
15137To get pkg-config, see <http://pkg-config.freedesktop.org/>. 15129To get pkg-config, see <http://pkg-config.freedesktop.org/>.
15138See \`config.log' for more details." "$LINENO" 5; } 15130See \`config.log' for more details" "$LINENO" 5 ; }
15139else 15131else
15140 EDJE_PLAYER_CFLAGS=$pkg_cv_EDJE_PLAYER_CFLAGS 15132 EDJE_PLAYER_CFLAGS=$pkg_cv_EDJE_PLAYER_CFLAGS
15141 EDJE_PLAYER_LIBS=$pkg_cv_EDJE_PLAYER_LIBS 15133 EDJE_PLAYER_LIBS=$pkg_cv_EDJE_PLAYER_LIBS
15142 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 15134 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
15143$as_echo "yes" >&6; } 15135$as_echo "yes" >&6; }
15144 : 15136
15145fi 15137fi
15146fi 15138fi
15147 15139
@@ -15151,46 +15143,44 @@ pkg_failed=no
15151{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE_INSPECTOR" >&5 15143{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE_INSPECTOR" >&5
15152$as_echo_n "checking for EDJE_INSPECTOR... " >&6; } 15144$as_echo_n "checking for EDJE_INSPECTOR... " >&6; }
15153 15145
15154if test -n "$PKG_CONFIG"; then 15146if test -n "$EDJE_INSPECTOR_CFLAGS"; then
15155 if test -n "$EDJE_INSPECTOR_CFLAGS"; then 15147 pkg_cv_EDJE_INSPECTOR_CFLAGS="$EDJE_INSPECTOR_CFLAGS"
15156 pkg_cv_EDJE_INSPECTOR_CFLAGS="$EDJE_INSPECTOR_CFLAGS" 15148 elif test -n "$PKG_CONFIG"; then
15157 else 15149 if test -n "$PKG_CONFIG" && \
15158 if test -n "$PKG_CONFIG" && \ 15150 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0\""; } >&5
15159 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0\""; } >&5 15151 ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0") 2>&5
15160 ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0") 2>&5
15161 ac_status=$? 15152 ac_status=$?
15162 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 15153 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
15163 test $ac_status = 0; }; then 15154 test $ac_status = 0; }; then
15164 pkg_cv_EDJE_INSPECTOR_CFLAGS=`$PKG_CONFIG --cflags "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0" 2>/dev/null` 15155 pkg_cv_EDJE_INSPECTOR_CFLAGS=`$PKG_CONFIG --cflags "ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0" 2>/dev/null`
15165else 15156else
15166 pkg_failed=yes 15157 pkg_failed=yes
15167fi 15158fi
15168 fi 15159 else
15169else 15160 pkg_failed=untried
15170 pkg_failed=untried
15171fi 15161fi
15172if test -n "$PKG_CONFIG"; then 15162if test -n "$EDJE_INSPECTOR_LIBS"; then
15173 if test -n "$EDJE_INSPECTOR_LIBS"; then 15163 pkg_cv_EDJE_INSPECTOR_LIBS="$EDJE_INSPECTOR_LIBS"
15174 pkg_cv_EDJE_INSPECTOR_LIBS="$EDJE_INSPECTOR_LIBS" 15164 elif test -n "$PKG_CONFIG"; then
15175 else 15165 if test -n "$PKG_CONFIG" && \
15176 if test -n "$PKG_CONFIG" && \ 15166 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0\""; } >&5
15177 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0\""; } >&5 15167 ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0") 2>&5
15178 ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0") 2>&5
15179 ac_status=$? 15168 ac_status=$?
15180 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 15169 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
15181 test $ac_status = 0; }; then 15170 test $ac_status = 0; }; then
15182 pkg_cv_EDJE_INSPECTOR_LIBS=`$PKG_CONFIG --libs "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0" 2>/dev/null` 15171 pkg_cv_EDJE_INSPECTOR_LIBS=`$PKG_CONFIG --libs "ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0" 2>/dev/null`
15183else 15172else
15184 pkg_failed=yes 15173 pkg_failed=yes
15185fi 15174fi
15186 fi 15175 else
15187else 15176 pkg_failed=untried
15188 pkg_failed=untried
15189fi 15177fi
15190 15178
15191 15179
15192 15180
15193if test $pkg_failed = yes; then 15181if test $pkg_failed = yes; then
15182 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15183$as_echo "no" >&6; }
15194 15184
15195if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 15185if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
15196 _pkg_short_errors_supported=yes 15186 _pkg_short_errors_supported=yes
@@ -15198,14 +15188,14 @@ else
15198 _pkg_short_errors_supported=no 15188 _pkg_short_errors_supported=no
15199fi 15189fi
15200 if test $_pkg_short_errors_supported = yes; then 15190 if test $_pkg_short_errors_supported = yes; then
15201 EDJE_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0"` 15191 EDJE_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0" 2>&1`
15202 else 15192 else
15203 EDJE_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0"` 15193 EDJE_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0" 2>&1`
15204 fi 15194 fi
15205 # Put the nasty error message in config.log where it belongs 15195 # Put the nasty error message in config.log where it belongs
15206 echo "$EDJE_INSPECTOR_PKG_ERRORS" >&5 15196 echo "$EDJE_INSPECTOR_PKG_ERRORS" >&5
15207 15197
15208 as_fn_error "Package requirements (ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0) were not met: 15198 as_fn_error $? "Package requirements (ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0) were not met:
15209 15199
15210$EDJE_INSPECTOR_PKG_ERRORS 15200$EDJE_INSPECTOR_PKG_ERRORS
15211 15201
@@ -15214,12 +15204,13 @@ installed software in a non-standard prefix.
15214 15204
15215Alternatively, you may set the environment variables EDJE_INSPECTOR_CFLAGS 15205Alternatively, you may set the environment variables EDJE_INSPECTOR_CFLAGS
15216and EDJE_INSPECTOR_LIBS to avoid the need to call pkg-config. 15206and EDJE_INSPECTOR_LIBS to avoid the need to call pkg-config.
15217See the pkg-config man page for more details. 15207See the pkg-config man page for more details." "$LINENO" 5
15218" "$LINENO" 5
15219elif test $pkg_failed = untried; then 15208elif test $pkg_failed = untried; then
15209 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15210$as_echo "no" >&6; }
15220 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 15211 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
15221$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 15212$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
15222as_fn_error "The pkg-config script could not be found or is too old. Make sure it 15213as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
15223is in your PATH or set the PKG_CONFIG environment variable to the full 15214is in your PATH or set the PKG_CONFIG environment variable to the full
15224path to pkg-config. 15215path to pkg-config.
15225 15216
@@ -15228,13 +15219,13 @@ and EDJE_INSPECTOR_LIBS to avoid the need to call pkg-config.
15228See the pkg-config man page for more details. 15219See the pkg-config man page for more details.
15229 15220
15230To get pkg-config, see <http://pkg-config.freedesktop.org/>. 15221To get pkg-config, see <http://pkg-config.freedesktop.org/>.
15231See \`config.log' for more details." "$LINENO" 5; } 15222See \`config.log' for more details" "$LINENO" 5 ; }
15232else 15223else
15233 EDJE_INSPECTOR_CFLAGS=$pkg_cv_EDJE_INSPECTOR_CFLAGS 15224 EDJE_INSPECTOR_CFLAGS=$pkg_cv_EDJE_INSPECTOR_CFLAGS
15234 EDJE_INSPECTOR_LIBS=$pkg_cv_EDJE_INSPECTOR_LIBS 15225 EDJE_INSPECTOR_LIBS=$pkg_cv_EDJE_INSPECTOR_LIBS
15235 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 15226 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
15236$as_echo "yes" >&6; } 15227$as_echo "yes" >&6; }
15237 : 15228
15238fi 15229fi
15239fi 15230fi
15240 15231
@@ -15244,46 +15235,44 @@ pkg_failed=no
15244{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE_EXTERNAL_INSPECTOR" >&5 15235{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE_EXTERNAL_INSPECTOR" >&5
15245$as_echo_n "checking for EDJE_EXTERNAL_INSPECTOR... " >&6; } 15236$as_echo_n "checking for EDJE_EXTERNAL_INSPECTOR... " >&6; }
15246 15237
15247if test -n "$PKG_CONFIG"; then 15238if test -n "$EDJE_EXTERNAL_INSPECTOR_CFLAGS"; then
15248 if test -n "$EDJE_EXTERNAL_INSPECTOR_CFLAGS"; then 15239 pkg_cv_EDJE_EXTERNAL_INSPECTOR_CFLAGS="$EDJE_EXTERNAL_INSPECTOR_CFLAGS"
15249 pkg_cv_EDJE_EXTERNAL_INSPECTOR_CFLAGS="$EDJE_EXTERNAL_INSPECTOR_CFLAGS" 15240 elif test -n "$PKG_CONFIG"; then
15250 else 15241 if test -n "$PKG_CONFIG" && \
15251 if test -n "$PKG_CONFIG" && \ 15242 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0\""; } >&5
15252 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0\""; } >&5 15243 ($PKG_CONFIG --exists --print-errors "ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0") 2>&5
15253 ($PKG_CONFIG --exists --print-errors "ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0") 2>&5
15254 ac_status=$? 15244 ac_status=$?
15255 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 15245 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
15256 test $ac_status = 0; }; then 15246 test $ac_status = 0; }; then
15257 pkg_cv_EDJE_EXTERNAL_INSPECTOR_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0" 2>/dev/null` 15247 pkg_cv_EDJE_EXTERNAL_INSPECTOR_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0" 2>/dev/null`
15258else 15248else
15259 pkg_failed=yes 15249 pkg_failed=yes
15260fi 15250fi
15261 fi 15251 else
15262else 15252 pkg_failed=untried
15263 pkg_failed=untried
15264fi 15253fi
15265if test -n "$PKG_CONFIG"; then 15254if test -n "$EDJE_EXTERNAL_INSPECTOR_LIBS"; then
15266 if test -n "$EDJE_EXTERNAL_INSPECTOR_LIBS"; then 15255 pkg_cv_EDJE_EXTERNAL_INSPECTOR_LIBS="$EDJE_EXTERNAL_INSPECTOR_LIBS"
15267 pkg_cv_EDJE_EXTERNAL_INSPECTOR_LIBS="$EDJE_EXTERNAL_INSPECTOR_LIBS" 15256 elif test -n "$PKG_CONFIG"; then
15268 else 15257 if test -n "$PKG_CONFIG" && \
15269 if test -n "$PKG_CONFIG" && \ 15258 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0\""; } >&5
15270 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0\""; } >&5 15259 ($PKG_CONFIG --exists --print-errors "ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0") 2>&5
15271 ($PKG_CONFIG --exists --print-errors "ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0") 2>&5
15272 ac_status=$? 15260 ac_status=$?
15273 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 15261 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
15274 test $ac_status = 0; }; then 15262 test $ac_status = 0; }; then
15275 pkg_cv_EDJE_EXTERNAL_INSPECTOR_LIBS=`$PKG_CONFIG --libs "ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0" 2>/dev/null` 15263 pkg_cv_EDJE_EXTERNAL_INSPECTOR_LIBS=`$PKG_CONFIG --libs "ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0" 2>/dev/null`
15276else 15264else
15277 pkg_failed=yes 15265 pkg_failed=yes
15278fi 15266fi
15279 fi 15267 else
15280else 15268 pkg_failed=untried
15281 pkg_failed=untried
15282fi 15269fi
15283 15270
15284 15271
15285 15272
15286if test $pkg_failed = yes; then 15273if test $pkg_failed = yes; then
15274 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15275$as_echo "no" >&6; }
15287 15276
15288if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 15277if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
15289 _pkg_short_errors_supported=yes 15278 _pkg_short_errors_supported=yes
@@ -15291,14 +15280,14 @@ else
15291 _pkg_short_errors_supported=no 15280 _pkg_short_errors_supported=no
15292fi 15281fi
15293 if test $_pkg_short_errors_supported = yes; then 15282 if test $_pkg_short_errors_supported = yes; then
15294 EDJE_EXTERNAL_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0"` 15283 EDJE_EXTERNAL_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0" 2>&1`
15295 else 15284 else
15296 EDJE_EXTERNAL_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0"` 15285 EDJE_EXTERNAL_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0" 2>&1`
15297 fi 15286 fi
15298 # Put the nasty error message in config.log where it belongs 15287 # Put the nasty error message in config.log where it belongs
15299 echo "$EDJE_EXTERNAL_INSPECTOR_PKG_ERRORS" >&5 15288 echo "$EDJE_EXTERNAL_INSPECTOR_PKG_ERRORS" >&5
15300 15289
15301 as_fn_error "Package requirements (ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0) were not met: 15290 as_fn_error $? "Package requirements (ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0) were not met:
15302 15291
15303$EDJE_EXTERNAL_INSPECTOR_PKG_ERRORS 15292$EDJE_EXTERNAL_INSPECTOR_PKG_ERRORS
15304 15293
@@ -15307,12 +15296,13 @@ installed software in a non-standard prefix.
15307 15296
15308Alternatively, you may set the environment variables EDJE_EXTERNAL_INSPECTOR_CFLAGS 15297Alternatively, you may set the environment variables EDJE_EXTERNAL_INSPECTOR_CFLAGS
15309and EDJE_EXTERNAL_INSPECTOR_LIBS to avoid the need to call pkg-config. 15298and EDJE_EXTERNAL_INSPECTOR_LIBS to avoid the need to call pkg-config.
15310See the pkg-config man page for more details. 15299See the pkg-config man page for more details." "$LINENO" 5
15311" "$LINENO" 5
15312elif test $pkg_failed = untried; then 15300elif test $pkg_failed = untried; then
15301 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15302$as_echo "no" >&6; }
15313 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 15303 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
15314$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 15304$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
15315as_fn_error "The pkg-config script could not be found or is too old. Make sure it 15305as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
15316is in your PATH or set the PKG_CONFIG environment variable to the full 15306is in your PATH or set the PKG_CONFIG environment variable to the full
15317path to pkg-config. 15307path to pkg-config.
15318 15308
@@ -15321,13 +15311,13 @@ and EDJE_EXTERNAL_INSPECTOR_LIBS to avoid the need to call pkg-config.
15321See the pkg-config man page for more details. 15311See the pkg-config man page for more details.
15322 15312
15323To get pkg-config, see <http://pkg-config.freedesktop.org/>. 15313To get pkg-config, see <http://pkg-config.freedesktop.org/>.
15324See \`config.log' for more details." "$LINENO" 5; } 15314See \`config.log' for more details" "$LINENO" 5 ; }
15325else 15315else
15326 EDJE_EXTERNAL_INSPECTOR_CFLAGS=$pkg_cv_EDJE_EXTERNAL_INSPECTOR_CFLAGS 15316 EDJE_EXTERNAL_INSPECTOR_CFLAGS=$pkg_cv_EDJE_EXTERNAL_INSPECTOR_CFLAGS
15327 EDJE_EXTERNAL_INSPECTOR_LIBS=$pkg_cv_EDJE_EXTERNAL_INSPECTOR_LIBS 15317 EDJE_EXTERNAL_INSPECTOR_LIBS=$pkg_cv_EDJE_EXTERNAL_INSPECTOR_LIBS
15328 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 15318 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
15329$as_echo "yes" >&6; } 15319$as_echo "yes" >&6; }
15330 : 15320
15331fi 15321fi
15332fi 15322fi
15333 15323
@@ -15337,8 +15327,7 @@ for ac_header in locale.h sys/resource.h
15337do : 15327do :
15338 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 15328 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
15339ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" 15329ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
15340eval as_val=\$$as_ac_Header 15330if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
15341 if test "x$as_val" = x""yes; then :
15342 cat >>confdefs.h <<_ACEOF 15331 cat >>confdefs.h <<_ACEOF
15343#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 15332#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
15344_ACEOF 15333_ACEOF
@@ -15417,7 +15406,7 @@ $as_echo_n "checking whether cc understands -c and -o together... " >&6; }
15417fi 15406fi
15418set dummy $CC; ac_cc=`$as_echo "$2" | 15407set dummy $CC; ac_cc=`$as_echo "$2" |
15419 sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` 15408 sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
15420if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then : 15409if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :
15421 $as_echo_n "(cached) " >&6 15410 $as_echo_n "(cached) " >&6
15422else 15411else
15423 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 15412 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16281,8 +16270,7 @@ if test $ac_cv_os_cray = yes; then
16281 for ac_func in _getb67 GETB67 getb67; do 16270 for ac_func in _getb67 GETB67 getb67; do
16282 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 16271 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
16283ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 16272ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
16284eval as_val=\$$as_ac_var 16273if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
16285 if test "x$as_val" = x""yes; then :
16286 16274
16287cat >>confdefs.h <<_ACEOF 16275cat >>confdefs.h <<_ACEOF
16288#define CRAY_STACKSEG_END $ac_func 16276#define CRAY_STACKSEG_END $ac_func
@@ -16398,11 +16386,10 @@ pkg_failed=no
16398{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHECK" >&5 16386{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHECK" >&5
16399$as_echo_n "checking for CHECK... " >&6; } 16387$as_echo_n "checking for CHECK... " >&6; }
16400 16388
16401if test -n "$PKG_CONFIG"; then 16389if test -n "$CHECK_CFLAGS"; then
16402 if test -n "$CHECK_CFLAGS"; then 16390 pkg_cv_CHECK_CFLAGS="$CHECK_CFLAGS"
16403 pkg_cv_CHECK_CFLAGS="$CHECK_CFLAGS" 16391 elif test -n "$PKG_CONFIG"; then
16404 else 16392 if test -n "$PKG_CONFIG" && \
16405 if test -n "$PKG_CONFIG" && \
16406 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.5\""; } >&5 16393 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.5\""; } >&5
16407 ($PKG_CONFIG --exists --print-errors "check >= 0.9.5") 2>&5 16394 ($PKG_CONFIG --exists --print-errors "check >= 0.9.5") 2>&5
16408 ac_status=$? 16395 ac_status=$?
@@ -16412,15 +16399,13 @@ if test -n "$PKG_CONFIG"; then
16412else 16399else
16413 pkg_failed=yes 16400 pkg_failed=yes
16414fi 16401fi
16415 fi 16402 else
16416else 16403 pkg_failed=untried
16417 pkg_failed=untried
16418fi 16404fi
16419if test -n "$PKG_CONFIG"; then 16405if test -n "$CHECK_LIBS"; then
16420 if test -n "$CHECK_LIBS"; then 16406 pkg_cv_CHECK_LIBS="$CHECK_LIBS"
16421 pkg_cv_CHECK_LIBS="$CHECK_LIBS" 16407 elif test -n "$PKG_CONFIG"; then
16422 else 16408 if test -n "$PKG_CONFIG" && \
16423 if test -n "$PKG_CONFIG" && \
16424 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.5\""; } >&5 16409 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.5\""; } >&5
16425 ($PKG_CONFIG --exists --print-errors "check >= 0.9.5") 2>&5 16410 ($PKG_CONFIG --exists --print-errors "check >= 0.9.5") 2>&5
16426 ac_status=$? 16411 ac_status=$?
@@ -16430,14 +16415,15 @@ if test -n "$PKG_CONFIG"; then
16430else 16415else
16431 pkg_failed=yes 16416 pkg_failed=yes
16432fi 16417fi
16433 fi 16418 else
16434else 16419 pkg_failed=untried
16435 pkg_failed=untried
16436fi 16420fi
16437 16421
16438 16422
16439 16423
16440if test $pkg_failed = yes; then 16424if test $pkg_failed = yes; then
16425 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16426$as_echo "no" >&6; }
16441 16427
16442if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 16428if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
16443 _pkg_short_errors_supported=yes 16429 _pkg_short_errors_supported=yes
@@ -16445,17 +16431,17 @@ else
16445 _pkg_short_errors_supported=no 16431 _pkg_short_errors_supported=no
16446fi 16432fi
16447 if test $_pkg_short_errors_supported = yes; then 16433 if test $_pkg_short_errors_supported = yes; then
16448 CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "check >= 0.9.5"` 16434 CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "check >= 0.9.5" 2>&1`
16449 else 16435 else
16450 CHECK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "check >= 0.9.5"` 16436 CHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors "check >= 0.9.5" 2>&1`
16451 fi 16437 fi
16452 # Put the nasty error message in config.log where it belongs 16438 # Put the nasty error message in config.log where it belongs
16453 echo "$CHECK_PKG_ERRORS" >&5 16439 echo "$CHECK_PKG_ERRORS" >&5
16454 16440
16455 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 16441 _efl_enable_tests="no"
16456$as_echo "no" >&6; }
16457 _efl_enable_tests="no"
16458elif test $pkg_failed = untried; then 16442elif test $pkg_failed = untried; then
16443 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16444$as_echo "no" >&6; }
16459 _efl_enable_tests="no" 16445 _efl_enable_tests="no"
16460else 16446else
16461 CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS 16447 CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS
@@ -16596,11 +16582,6 @@ if test "${enable_build_examples+set}" = set; then :
16596 enableval=$enable_build_examples; 16582 enableval=$enable_build_examples;
16597 if test "x${enableval}" = "xyes" ; then 16583 if test "x${enableval}" = "xyes" ; then
16598 build_examples="yes" 16584 build_examples="yes"
16599 edje_cc=$($PKG_CONFIG --variable=prefix edje)/bin/edje_cc
16600 # put in here the dependencies for Edje' examples. They are
16601 # meant to be 'real world' usage examples, thus one will be
16602 # using higher level libraries on these programs
16603
16604 else 16585 else
16605 build_examples="no" 16586 build_examples="no"
16606 fi 16587 fi
@@ -16705,6 +16686,7 @@ DEFS=-DHAVE_CONFIG_H
16705 16686
16706ac_libobjs= 16687ac_libobjs=
16707ac_ltlibobjs= 16688ac_ltlibobjs=
16689U=
16708for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue 16690for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
16709 # 1. Remove the extension, and $U if already installed. 16691 # 1. Remove the extension, and $U if already installed.
16710 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' 16692 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -16728,95 +16710,95 @@ else
16728fi 16710fi
16729 16711
16730if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then 16712if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
16731 as_fn_error "conditional \"AMDEP\" was never defined. 16713 as_fn_error $? "conditional \"AMDEP\" was never defined.
16732Usually this means the macro was only invoked conditionally." "$LINENO" 5 16714Usually this means the macro was only invoked conditionally." "$LINENO" 5
16733fi 16715fi
16734if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then 16716if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
16735 as_fn_error "conditional \"am__fastdepCC\" was never defined. 16717 as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
16736Usually this means the macro was only invoked conditionally." "$LINENO" 5 16718Usually this means the macro was only invoked conditionally." "$LINENO" 5
16737fi 16719fi
16738if test -z "${EDJE_AMALGAMATION_TRUE}" && test -z "${EDJE_AMALGAMATION_FALSE}"; then 16720if test -z "${EDJE_AMALGAMATION_TRUE}" && test -z "${EDJE_AMALGAMATION_FALSE}"; then
16739 as_fn_error "conditional \"EDJE_AMALGAMATION\" was never defined. 16721 as_fn_error $? "conditional \"EDJE_AMALGAMATION\" was never defined.
16740Usually this means the macro was only invoked conditionally." "$LINENO" 5 16722Usually this means the macro was only invoked conditionally." "$LINENO" 5
16741fi 16723fi
16742if test -z "${BUILD_EDJE_CC_TRUE}" && test -z "${BUILD_EDJE_CC_FALSE}"; then 16724if test -z "${BUILD_EDJE_CC_TRUE}" && test -z "${BUILD_EDJE_CC_FALSE}"; then
16743 as_fn_error "conditional \"BUILD_EDJE_CC\" was never defined. 16725 as_fn_error $? "conditional \"BUILD_EDJE_CC\" was never defined.
16744Usually this means the macro was only invoked conditionally." "$LINENO" 5 16726Usually this means the macro was only invoked conditionally." "$LINENO" 5
16745fi 16727fi
16746if test -z "${BUILD_EDJE_DECC_TRUE}" && test -z "${BUILD_EDJE_DECC_FALSE}"; then 16728if test -z "${BUILD_EDJE_DECC_TRUE}" && test -z "${BUILD_EDJE_DECC_FALSE}"; then
16747 as_fn_error "conditional \"BUILD_EDJE_DECC\" was never defined. 16729 as_fn_error $? "conditional \"BUILD_EDJE_DECC\" was never defined.
16748Usually this means the macro was only invoked conditionally." "$LINENO" 5 16730Usually this means the macro was only invoked conditionally." "$LINENO" 5
16749fi 16731fi
16750if test -z "${BUILD_EDJE_RECC_TRUE}" && test -z "${BUILD_EDJE_RECC_FALSE}"; then 16732if test -z "${BUILD_EDJE_RECC_TRUE}" && test -z "${BUILD_EDJE_RECC_FALSE}"; then
16751 as_fn_error "conditional \"BUILD_EDJE_RECC\" was never defined. 16733 as_fn_error $? "conditional \"BUILD_EDJE_RECC\" was never defined.
16752Usually this means the macro was only invoked conditionally." "$LINENO" 5 16734Usually this means the macro was only invoked conditionally." "$LINENO" 5
16753fi 16735fi
16754if test -z "${BUILD_EDJE_PLAYER_TRUE}" && test -z "${BUILD_EDJE_PLAYER_FALSE}"; then 16736if test -z "${BUILD_EDJE_PLAYER_TRUE}" && test -z "${BUILD_EDJE_PLAYER_FALSE}"; then
16755 as_fn_error "conditional \"BUILD_EDJE_PLAYER\" was never defined. 16737 as_fn_error $? "conditional \"BUILD_EDJE_PLAYER\" was never defined.
16756Usually this means the macro was only invoked conditionally." "$LINENO" 5 16738Usually this means the macro was only invoked conditionally." "$LINENO" 5
16757fi 16739fi
16758if test -z "${BUILD_EDJE_INSPECTOR_TRUE}" && test -z "${BUILD_EDJE_INSPECTOR_FALSE}"; then 16740if test -z "${BUILD_EDJE_INSPECTOR_TRUE}" && test -z "${BUILD_EDJE_INSPECTOR_FALSE}"; then
16759 as_fn_error "conditional \"BUILD_EDJE_INSPECTOR\" was never defined. 16741 as_fn_error $? "conditional \"BUILD_EDJE_INSPECTOR\" was never defined.
16760Usually this means the macro was only invoked conditionally." "$LINENO" 5 16742Usually this means the macro was only invoked conditionally." "$LINENO" 5
16761fi 16743fi
16762if test -z "${BUILD_EDJE_EXTERNAL_INSPECTOR_TRUE}" && test -z "${BUILD_EDJE_EXTERNAL_INSPECTOR_FALSE}"; then 16744if test -z "${BUILD_EDJE_EXTERNAL_INSPECTOR_TRUE}" && test -z "${BUILD_EDJE_EXTERNAL_INSPECTOR_FALSE}"; then
16763 as_fn_error "conditional \"BUILD_EDJE_EXTERNAL_INSPECTOR\" was never defined. 16745 as_fn_error $? "conditional \"BUILD_EDJE_EXTERNAL_INSPECTOR\" was never defined.
16764Usually this means the macro was only invoked conditionally." "$LINENO" 5 16746Usually this means the macro was only invoked conditionally." "$LINENO" 5
16765fi 16747fi
16766if test -z "${EDJE_PROGRAM_CACHE_TRUE}" && test -z "${EDJE_PROGRAM_CACHE_FALSE}"; then 16748if test -z "${EDJE_PROGRAM_CACHE_TRUE}" && test -z "${EDJE_PROGRAM_CACHE_FALSE}"; then
16767 as_fn_error "conditional \"EDJE_PROGRAM_CACHE\" was never defined. 16749 as_fn_error $? "conditional \"EDJE_PROGRAM_CACHE\" was never defined.
16768Usually this means the macro was only invoked conditionally." "$LINENO" 5 16750Usually this means the macro was only invoked conditionally." "$LINENO" 5
16769fi 16751fi
16770if test -z "${EDJE_CALC_CACHE_TRUE}" && test -z "${EDJE_CALC_CACHE_FALSE}"; then 16752if test -z "${EDJE_CALC_CACHE_TRUE}" && test -z "${EDJE_CALC_CACHE_FALSE}"; then
16771 as_fn_error "conditional \"EDJE_CALC_CACHE\" was never defined. 16753 as_fn_error $? "conditional \"EDJE_CALC_CACHE\" was never defined.
16772Usually this means the macro was only invoked conditionally." "$LINENO" 5 16754Usually this means the macro was only invoked conditionally." "$LINENO" 5
16773fi 16755fi
16774if test -z "${BUILD_EDJE_FP_TRUE}" && test -z "${BUILD_EDJE_FP_FALSE}"; then 16756if test -z "${BUILD_EDJE_FP_TRUE}" && test -z "${BUILD_EDJE_FP_FALSE}"; then
16775 as_fn_error "conditional \"BUILD_EDJE_FP\" was never defined. 16757 as_fn_error $? "conditional \"BUILD_EDJE_FP\" was never defined.
16776Usually this means the macro was only invoked conditionally." "$LINENO" 5 16758Usually this means the macro was only invoked conditionally." "$LINENO" 5
16777fi 16759fi
16778if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then 16760if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
16779 as_fn_error "conditional \"am__fastdepCC\" was never defined. 16761 as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
16780Usually this means the macro was only invoked conditionally." "$LINENO" 5 16762Usually this means the macro was only invoked conditionally." "$LINENO" 5
16781fi 16763fi
16782if test -z "${EFL_BUILD_DOC_TRUE}" && test -z "${EFL_BUILD_DOC_FALSE}"; then 16764if test -z "${EFL_BUILD_DOC_TRUE}" && test -z "${EFL_BUILD_DOC_FALSE}"; then
16783 as_fn_error "conditional \"EFL_BUILD_DOC\" was never defined. 16765 as_fn_error $? "conditional \"EFL_BUILD_DOC\" was never defined.
16784Usually this means the macro was only invoked conditionally." "$LINENO" 5 16766Usually this means the macro was only invoked conditionally." "$LINENO" 5
16785fi 16767fi
16786if test -z "${HAVE_PYTHON_TRUE}" && test -z "${HAVE_PYTHON_FALSE}"; then 16768if test -z "${HAVE_PYTHON_TRUE}" && test -z "${HAVE_PYTHON_FALSE}"; then
16787 as_fn_error "conditional \"HAVE_PYTHON\" was never defined. 16769 as_fn_error $? "conditional \"HAVE_PYTHON\" was never defined.
16788Usually this means the macro was only invoked conditionally." "$LINENO" 5 16770Usually this means the macro was only invoked conditionally." "$LINENO" 5
16789fi 16771fi
16790if test -z "${ENABLE_MULTISENSE_TRUE}" && test -z "${ENABLE_MULTISENSE_FALSE}"; then 16772if test -z "${ENABLE_MULTISENSE_TRUE}" && test -z "${ENABLE_MULTISENSE_FALSE}"; then
16791 as_fn_error "conditional \"ENABLE_MULTISENSE\" was never defined. 16773 as_fn_error $? "conditional \"ENABLE_MULTISENSE\" was never defined.
16792Usually this means the macro was only invoked conditionally." "$LINENO" 5 16774Usually this means the macro was only invoked conditionally." "$LINENO" 5
16793fi 16775fi
16794if test -z "${HAVE_LIBSNDFILE_TRUE}" && test -z "${HAVE_LIBSNDFILE_FALSE}"; then 16776if test -z "${HAVE_LIBSNDFILE_TRUE}" && test -z "${HAVE_LIBSNDFILE_FALSE}"; then
16795 as_fn_error "conditional \"HAVE_LIBSNDFILE\" was never defined. 16777 as_fn_error $? "conditional \"HAVE_LIBSNDFILE\" was never defined.
16796Usually this means the macro was only invoked conditionally." "$LINENO" 5 16778Usually this means the macro was only invoked conditionally." "$LINENO" 5
16797fi 16779fi
16798if test -z "${HAVE_LIBREMIX_TRUE}" && test -z "${HAVE_LIBREMIX_FALSE}"; then 16780if test -z "${HAVE_LIBREMIX_TRUE}" && test -z "${HAVE_LIBREMIX_FALSE}"; then
16799 as_fn_error "conditional \"HAVE_LIBREMIX\" was never defined. 16781 as_fn_error $? "conditional \"HAVE_LIBREMIX\" was never defined.
16800Usually this means the macro was only invoked conditionally." "$LINENO" 5 16782Usually this means the macro was only invoked conditionally." "$LINENO" 5
16801fi 16783fi
16802if test -z "${HAVE_LIBALSA_TRUE}" && test -z "${HAVE_LIBALSA_FALSE}"; then 16784if test -z "${HAVE_LIBALSA_TRUE}" && test -z "${HAVE_LIBALSA_FALSE}"; then
16803 as_fn_error "conditional \"HAVE_LIBALSA\" was never defined. 16785 as_fn_error $? "conditional \"HAVE_LIBALSA\" was never defined.
16804Usually this means the macro was only invoked conditionally." "$LINENO" 5 16786Usually this means the macro was only invoked conditionally." "$LINENO" 5
16805fi 16787fi
16806if test -z "${BUILD_EPP_TRUE}" && test -z "${BUILD_EPP_FALSE}"; then 16788if test -z "${BUILD_EPP_TRUE}" && test -z "${BUILD_EPP_FALSE}"; then
16807 as_fn_error "conditional \"BUILD_EPP\" was never defined. 16789 as_fn_error $? "conditional \"BUILD_EPP\" was never defined.
16808Usually this means the macro was only invoked conditionally." "$LINENO" 5 16790Usually this means the macro was only invoked conditionally." "$LINENO" 5
16809fi 16791fi
16810if test -z "${EFL_ENABLE_TESTS_TRUE}" && test -z "${EFL_ENABLE_TESTS_FALSE}"; then 16792if test -z "${EFL_ENABLE_TESTS_TRUE}" && test -z "${EFL_ENABLE_TESTS_FALSE}"; then
16811 as_fn_error "conditional \"EFL_ENABLE_TESTS\" was never defined. 16793 as_fn_error $? "conditional \"EFL_ENABLE_TESTS\" was never defined.
16812Usually this means the macro was only invoked conditionally." "$LINENO" 5 16794Usually this means the macro was only invoked conditionally." "$LINENO" 5
16813fi 16795fi
16814if test -z "${EFL_ENABLE_COVERAGE_TRUE}" && test -z "${EFL_ENABLE_COVERAGE_FALSE}"; then 16796if test -z "${EFL_ENABLE_COVERAGE_TRUE}" && test -z "${EFL_ENABLE_COVERAGE_FALSE}"; then
16815 as_fn_error "conditional \"EFL_ENABLE_COVERAGE\" was never defined. 16797 as_fn_error $? "conditional \"EFL_ENABLE_COVERAGE\" was never defined.
16816Usually this means the macro was only invoked conditionally." "$LINENO" 5 16798Usually this means the macro was only invoked conditionally." "$LINENO" 5
16817fi 16799fi
16818if test -z "${BUILD_EXAMPLES_TRUE}" && test -z "${BUILD_EXAMPLES_FALSE}"; then 16800if test -z "${BUILD_EXAMPLES_TRUE}" && test -z "${BUILD_EXAMPLES_FALSE}"; then
16819 as_fn_error "conditional \"BUILD_EXAMPLES\" was never defined. 16801 as_fn_error $? "conditional \"BUILD_EXAMPLES\" was never defined.
16820Usually this means the macro was only invoked conditionally." "$LINENO" 5 16802Usually this means the macro was only invoked conditionally." "$LINENO" 5
16821fi 16803fi
16822 16804
@@ -16966,19 +16948,19 @@ export LANGUAGE
16966(unset CDPATH) >/dev/null 2>&1 && unset CDPATH 16948(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
16967 16949
16968 16950
16969# as_fn_error ERROR [LINENO LOG_FD] 16951# as_fn_error STATUS ERROR [LINENO LOG_FD]
16970# --------------------------------- 16952# ----------------------------------------
16971# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 16953# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
16972# provided, also output the error to LOG_FD, referencing LINENO. Then exit the 16954# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
16973# script with status $?, using 1 if that was 0. 16955# script with STATUS, using 1 if that was 0.
16974as_fn_error () 16956as_fn_error ()
16975{ 16957{
16976 as_status=$?; test $as_status -eq 0 && as_status=1 16958 as_status=$1; test $as_status -eq 0 && as_status=1
16977 if test "$3"; then 16959 if test "$4"; then
16978 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 16960 as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
16979 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 16961 $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
16980 fi 16962 fi
16981 $as_echo "$as_me: error: $1" >&2 16963 $as_echo "$as_me: error: $2" >&2
16982 as_fn_exit $as_status 16964 as_fn_exit $as_status
16983} # as_fn_error 16965} # as_fn_error
16984 16966
@@ -17174,7 +17156,7 @@ $as_echo X"$as_dir" |
17174 test -d "$as_dir" && break 17156 test -d "$as_dir" && break
17175 done 17157 done
17176 test -z "$as_dirs" || eval "mkdir $as_dirs" 17158 test -z "$as_dirs" || eval "mkdir $as_dirs"
17177 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 17159 } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
17178 17160
17179 17161
17180} # as_fn_mkdir_p 17162} # as_fn_mkdir_p
@@ -17227,8 +17209,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
17227# report actual input values of CONFIG_FILES etc. instead of their 17209# report actual input values of CONFIG_FILES etc. instead of their
17228# values after options handling. 17210# values after options handling.
17229ac_log=" 17211ac_log="
17230This file was extended by edje $as_me 1.1.99.67344, which was 17212This file was extended by edje $as_me 1.2.0-alpha, which was
17231generated by GNU Autoconf 2.65. Invocation command line was 17213generated by GNU Autoconf 2.67. Invocation command line was
17232 17214
17233 CONFIG_FILES = $CONFIG_FILES 17215 CONFIG_FILES = $CONFIG_FILES
17234 CONFIG_HEADERS = $CONFIG_HEADERS 17216 CONFIG_HEADERS = $CONFIG_HEADERS
@@ -17293,11 +17275,11 @@ _ACEOF
17293cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 17275cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
17294ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 17276ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
17295ac_cs_version="\\ 17277ac_cs_version="\\
17296edje config.status 1.1.99.67344 17278edje config.status 1.2.0-alpha
17297configured by $0, generated by GNU Autoconf 2.65, 17279configured by $0, generated by GNU Autoconf 2.67,
17298 with options \\"\$ac_cs_config\\" 17280 with options \\"\$ac_cs_config\\"
17299 17281
17300Copyright (C) 2009 Free Software Foundation, Inc. 17282Copyright (C) 2010 Free Software Foundation, Inc.
17301This config.status script is free software; the Free Software Foundation 17283This config.status script is free software; the Free Software Foundation
17302gives unlimited permission to copy, distribute and modify it." 17284gives unlimited permission to copy, distribute and modify it."
17303 17285
@@ -17315,11 +17297,16 @@ ac_need_defaults=:
17315while test $# != 0 17297while test $# != 0
17316do 17298do
17317 case $1 in 17299 case $1 in
17318 --*=*) 17300 --*=?*)
17319 ac_option=`expr "X$1" : 'X\([^=]*\)='` 17301 ac_option=`expr "X$1" : 'X\([^=]*\)='`
17320 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` 17302 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
17321 ac_shift=: 17303 ac_shift=:
17322 ;; 17304 ;;
17305 --*=)
17306 ac_option=`expr "X$1" : 'X\([^=]*\)='`
17307 ac_optarg=
17308 ac_shift=:
17309 ;;
17323 *) 17310 *)
17324 ac_option=$1 17311 ac_option=$1
17325 ac_optarg=$2 17312 ac_optarg=$2
@@ -17341,6 +17328,7 @@ do
17341 $ac_shift 17328 $ac_shift
17342 case $ac_optarg in 17329 case $ac_optarg in
17343 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; 17330 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
17331 '') as_fn_error $? "missing file argument" ;;
17344 esac 17332 esac
17345 as_fn_append CONFIG_FILES " '$ac_optarg'" 17333 as_fn_append CONFIG_FILES " '$ac_optarg'"
17346 ac_need_defaults=false;; 17334 ac_need_defaults=false;;
@@ -17353,7 +17341,7 @@ do
17353 ac_need_defaults=false;; 17341 ac_need_defaults=false;;
17354 --he | --h) 17342 --he | --h)
17355 # Conflict between --help and --header 17343 # Conflict between --help and --header
17356 as_fn_error "ambiguous option: \`$1' 17344 as_fn_error $? "ambiguous option: \`$1'
17357Try \`$0 --help' for more information.";; 17345Try \`$0 --help' for more information.";;
17358 --help | --hel | -h ) 17346 --help | --hel | -h )
17359 $as_echo "$ac_cs_usage"; exit ;; 17347 $as_echo "$ac_cs_usage"; exit ;;
@@ -17362,7 +17350,7 @@ Try \`$0 --help' for more information.";;
17362 ac_cs_silent=: ;; 17350 ac_cs_silent=: ;;
17363 17351
17364 # This is an error. 17352 # This is an error.
17365 -*) as_fn_error "unrecognized option: \`$1' 17353 -*) as_fn_error $? "unrecognized option: \`$1'
17366Try \`$0 --help' for more information." ;; 17354Try \`$0 --help' for more information." ;;
17367 17355
17368 *) as_fn_append ac_config_targets " $1" 17356 *) as_fn_append ac_config_targets " $1"
@@ -17694,7 +17682,7 @@ do
17694 "utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;; 17682 "utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;;
17695 "src/examples/Makefile") CONFIG_FILES="$CONFIG_FILES src/examples/Makefile" ;; 17683 "src/examples/Makefile") CONFIG_FILES="$CONFIG_FILES src/examples/Makefile" ;;
17696 17684
17697 *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 17685 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
17698 esac 17686 esac
17699done 17687done
17700 17688
@@ -17732,7 +17720,7 @@ $debug ||
17732{ 17720{
17733 tmp=./conf$$-$RANDOM 17721 tmp=./conf$$-$RANDOM
17734 (umask 077 && mkdir "$tmp") 17722 (umask 077 && mkdir "$tmp")
17735} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 17723} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
17736 17724
17737# Set up the scripts for CONFIG_FILES section. 17725# Set up the scripts for CONFIG_FILES section.
17738# No need to generate them if there are no CONFIG_FILES. 17726# No need to generate them if there are no CONFIG_FILES.
@@ -17749,7 +17737,7 @@ if test "x$ac_cr" = x; then
17749fi 17737fi
17750ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` 17738ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
17751if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then 17739if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
17752 ac_cs_awk_cr='\r' 17740 ac_cs_awk_cr='\\r'
17753else 17741else
17754 ac_cs_awk_cr=$ac_cr 17742 ac_cs_awk_cr=$ac_cr
17755fi 17743fi
@@ -17763,18 +17751,18 @@ _ACEOF
17763 echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && 17751 echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
17764 echo "_ACEOF" 17752 echo "_ACEOF"
17765} >conf$$subs.sh || 17753} >conf$$subs.sh ||
17766 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 17754 as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
17767ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` 17755ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
17768ac_delim='%!_!# ' 17756ac_delim='%!_!# '
17769for ac_last_try in false false false false false :; do 17757for ac_last_try in false false false false false :; do
17770 . ./conf$$subs.sh || 17758 . ./conf$$subs.sh ||
17771 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 17759 as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
17772 17760
17773 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` 17761 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
17774 if test $ac_delim_n = $ac_delim_num; then 17762 if test $ac_delim_n = $ac_delim_num; then
17775 break 17763 break
17776 elif $ac_last_try; then 17764 elif $ac_last_try; then
17777 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 17765 as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
17778 else 17766 else
17779 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " 17767 ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
17780 fi 17768 fi
@@ -17863,20 +17851,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
17863else 17851else
17864 cat 17852 cat
17865fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ 17853fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
17866 || as_fn_error "could not setup config files machinery" "$LINENO" 5 17854 || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
17867_ACEOF 17855_ACEOF
17868 17856
17869# VPATH may cause trouble with some makes, so we remove $(srcdir), 17857# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
17870# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and 17858# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
17871# trailing colons and then remove the whole line if VPATH becomes empty 17859# trailing colons and then remove the whole line if VPATH becomes empty
17872# (actually we leave an empty line to preserve line numbers). 17860# (actually we leave an empty line to preserve line numbers).
17873if test "x$srcdir" = x.; then 17861if test "x$srcdir" = x.; then
17874 ac_vpsub='/^[ ]*VPATH[ ]*=/{ 17862 ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
17875s/:*\$(srcdir):*/:/ 17863h
17876s/:*\${srcdir}:*/:/ 17864s///
17877s/:*@srcdir@:*/:/ 17865s/^/:/
17878s/^\([^=]*=[ ]*\):*/\1/ 17866s/[ ]*$/:/
17867s/:\$(srcdir):/:/g
17868s/:\${srcdir}:/:/g
17869s/:@srcdir@:/:/g
17870s/^:*//
17879s/:*$// 17871s/:*$//
17872x
17873s/\(=[ ]*\).*/\1/
17874G
17875s/\n//
17880s/^[^=]*=[ ]*$// 17876s/^[^=]*=[ ]*$//
17881}' 17877}'
17882fi 17878fi
@@ -17904,7 +17900,7 @@ for ac_last_try in false false :; do
17904 if test -z "$ac_t"; then 17900 if test -z "$ac_t"; then
17905 break 17901 break
17906 elif $ac_last_try; then 17902 elif $ac_last_try; then
17907 as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 17903 as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
17908 else 17904 else
17909 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " 17905 ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
17910 fi 17906 fi
@@ -17989,7 +17985,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
17989_ACAWK 17985_ACAWK
17990_ACEOF 17986_ACEOF
17991cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 17987cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
17992 as_fn_error "could not setup config headers machinery" "$LINENO" 5 17988 as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
17993fi # test -n "$CONFIG_HEADERS" 17989fi # test -n "$CONFIG_HEADERS"
17994 17990
17995 17991
@@ -18002,7 +17998,7 @@ do
18002 esac 17998 esac
18003 case $ac_mode$ac_tag in 17999 case $ac_mode$ac_tag in
18004 :[FHL]*:*);; 18000 :[FHL]*:*);;
18005 :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; 18001 :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
18006 :[FH]-) ac_tag=-:-;; 18002 :[FH]-) ac_tag=-:-;;
18007 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 18003 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
18008 esac 18004 esac
@@ -18030,7 +18026,7 @@ do
18030 [\\/$]*) false;; 18026 [\\/$]*) false;;
18031 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 18027 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
18032 esac || 18028 esac ||
18033 as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; 18029 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
18034 esac 18030 esac
18035 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac 18031 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
18036 as_fn_append ac_file_inputs " '$ac_f'" 18032 as_fn_append ac_file_inputs " '$ac_f'"
@@ -18057,7 +18053,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
18057 18053
18058 case $ac_tag in 18054 case $ac_tag in
18059 *:-:* | *:-) cat >"$tmp/stdin" \ 18055 *:-:* | *:-) cat >"$tmp/stdin" \
18060 || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; 18056 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
18061 esac 18057 esac
18062 ;; 18058 ;;
18063 esac 18059 esac
@@ -18194,22 +18190,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
18194$ac_datarootdir_hack 18190$ac_datarootdir_hack
18195" 18191"
18196eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ 18192eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
18197 || as_fn_error "could not create $ac_file" "$LINENO" 5 18193 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
18198 18194
18199test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && 18195test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
18200 { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && 18196 { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
18201 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && 18197 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
18202 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' 18198 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
18203which seems to be undefined. Please make sure it is defined." >&5 18199which seems to be undefined. Please make sure it is defined" >&5
18204$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' 18200$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
18205which seems to be undefined. Please make sure it is defined." >&2;} 18201which seems to be undefined. Please make sure it is defined" >&2;}
18206 18202
18207 rm -f "$tmp/stdin" 18203 rm -f "$tmp/stdin"
18208 case $ac_file in 18204 case $ac_file in
18209 -) cat "$tmp/out" && rm -f "$tmp/out";; 18205 -) cat "$tmp/out" && rm -f "$tmp/out";;
18210 *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; 18206 *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
18211 esac \ 18207 esac \
18212 || as_fn_error "could not create $ac_file" "$LINENO" 5 18208 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
18213 ;; 18209 ;;
18214 :H) 18210 :H)
18215 # 18211 #
@@ -18220,19 +18216,19 @@ which seems to be undefined. Please make sure it is defined." >&2;}
18220 $as_echo "/* $configure_input */" \ 18216 $as_echo "/* $configure_input */" \
18221 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" 18217 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
18222 } >"$tmp/config.h" \ 18218 } >"$tmp/config.h" \
18223 || as_fn_error "could not create $ac_file" "$LINENO" 5 18219 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
18224 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then 18220 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
18225 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 18221 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
18226$as_echo "$as_me: $ac_file is unchanged" >&6;} 18222$as_echo "$as_me: $ac_file is unchanged" >&6;}
18227 else 18223 else
18228 rm -f "$ac_file" 18224 rm -f "$ac_file"
18229 mv "$tmp/config.h" "$ac_file" \ 18225 mv "$tmp/config.h" "$ac_file" \
18230 || as_fn_error "could not create $ac_file" "$LINENO" 5 18226 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
18231 fi 18227 fi
18232 else 18228 else
18233 $as_echo "/* $configure_input */" \ 18229 $as_echo "/* $configure_input */" \
18234 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ 18230 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
18235 || as_fn_error "could not create -" "$LINENO" 5 18231 || as_fn_error $? "could not create -" "$LINENO" 5
18236 fi 18232 fi
18237# Compute "$ac_file"'s index in $config_headers. 18233# Compute "$ac_file"'s index in $config_headers.
18238_am_arg="$ac_file" 18234_am_arg="$ac_file"
@@ -19023,7 +19019,7 @@ _ACEOF
19023ac_clean_files=$ac_clean_files_save 19019ac_clean_files=$ac_clean_files_save
19024 19020
19025test $ac_write_fail = 0 || 19021test $ac_write_fail = 0 ||
19026 as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 19022 as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
19027 19023
19028 19024
19029# configure is writing to config.log, and then calls config.status. 19025# configure is writing to config.log, and then calls config.status.
@@ -19044,7 +19040,7 @@ if test "$no_create" != yes; then
19044 exec 5>>config.log 19040 exec 5>>config.log
19045 # Use ||, not &&, to avoid exiting from the if with $? = 1, which 19041 # Use ||, not &&, to avoid exiting from the if with $? = 1, which
19046 # would make configure fail if this is the last instruction. 19042 # would make configure fail if this is the last instruction.
19047 $ac_cs_success || as_fn_exit $? 19043 $ac_cs_success || as_fn_exit 1
19048fi 19044fi
19049if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then 19045if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
19050 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 19046 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
diff --git a/libraries/edje/configure.ac b/libraries/edje/configure.ac
index eceed6c..8ac6b7c 100644
--- a/libraries/edje/configure.ac
+++ b/libraries/edje/configure.ac
@@ -1,12 +1,12 @@
1##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 1##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
2##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 2##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
3m4_define([v_maj], [1]) 3m4_define([v_maj], [1])
4m4_define([v_min], [1]) 4m4_define([v_min], [2])
5m4_define([v_mic], [99]) 5m4_define([v_mic], [0])
6m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) 6m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
7m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) 7m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
8##-- When released, remove the dnl on the below line 8##-- When released, remove the dnl on the below line
9dnl m4_undefine([v_rev]) 9m4_undefine([v_rev])
10##-- When doing snapshots - change soname. remove dnl on below line 10##-- When doing snapshots - change soname. remove dnl on below line
11dnl m4_define([relname], [ver-pre-svn-07]) 11dnl m4_define([relname], [ver-pre-svn-07])
12dnl m4_define([v_rel], [-release relname]) 12dnl m4_define([v_rel], [-release relname])
@@ -18,7 +18,7 @@ m4_define([lt_age], v_min)
18##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 18##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
19##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 19##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
20 20
21AC_INIT([edje], [v_ver], [enlightenment-devel@lists.sourceforge.net]) 21AC_INIT([edje], [v_ver]-alpha, [enlightenment-devel@lists.sourceforge.net])
22AC_PREREQ([2.52]) 22AC_PREREQ([2.52])
23AC_CONFIG_SRCDIR([configure.ac]) 23AC_CONFIG_SRCDIR([configure.ac])
24AC_CONFIG_MACRO_DIR([m4]) 24AC_CONFIG_MACRO_DIR([m4])
@@ -96,6 +96,8 @@ AC_ARG_ENABLE([amalgamation],
96) 96)
97AM_CONDITIONAL([EDJE_AMALGAMATION], [test "x${do_amalgamation}" = "xyes"]) 97AM_CONDITIONAL([EDJE_AMALGAMATION], [test "x${do_amalgamation}" = "xyes"])
98 98
99EFL_WITH_BIN([edje], [edje-cc], [edje_cc])
100
99EFL_ENABLE_BIN([edje-cc]) 101EFL_ENABLE_BIN([edje-cc])
100EFL_ENABLE_BIN([edje-decc]) 102EFL_ENABLE_BIN([edje-decc])
101EFL_ENABLE_BIN([edje-recc]) 103EFL_ENABLE_BIN([edje-recc])
@@ -256,37 +258,37 @@ fi
256 258
257PKG_CHECK_MODULES([MINIMAL], 259PKG_CHECK_MODULES([MINIMAL],
258 [ 260 [
259 eina >= 1.1.0 261 eina >= 1.2.0
260 eet >= 1.5.0 262 eet >= 1.6.0
261 ]) 263 ])
262 264
263PKG_CHECK_MODULES([EDJE], 265PKG_CHECK_MODULES([EDJE],
264 [ 266 [
265 eina >= 1.1.0 267 eina >= 1.2.0
266 eet >= 1.5.0 268 eet >= 1.6.0
267 evas >= 1.1.0 269 evas >= 1.2.0
268 ecore >= 1.1.0 270 ecore >= 1.2.0
269 ecore-evas >= 1.1.0 271 ecore-evas >= 1.2.0
270 ecore-file >= 1.1.0 272 ecore-file >= 1.2.0
271 embryo >= 1.1.0 273 embryo >= 1.2.0
272 ]) 274 ])
273 275
274EDJE_LIBS="${EDJE_LIBS} ${LUA_LIBS} ${lua_libs}" 276EDJE_LIBS="${EDJE_LIBS} ${LUA_LIBS} ${lua_libs}"
275EDJE_CFLAGS="${EDJE_CFLAGS} ${LUA_CFLAGS}" 277EDJE_CFLAGS="${EDJE_CFLAGS} ${LUA_CFLAGS}"
276 278
277requirement_edje="embryo >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0 ${requirement_edje}" 279requirement_edje="embryo >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0 ${requirement_edje}"
278requirement_edje="${requirement_lua} ${requirement_edje}" 280requirement_edje="${requirement_lua} ${requirement_edje}"
279 281
280have_ecore_imf="no" 282have_ecore_imf="no"
281PKG_CHECK_MODULES([ECORE_IMF], 283PKG_CHECK_MODULES([ECORE_IMF],
282 [ 284 [
283 ecore-imf >= 1.1.0 285 ecore-imf >= 1.2.0
284 ecore-imf-evas >= 1.1.0 286 ecore-imf-evas >= 1.2.0
285 ], 287 ],
286 [ 288 [
287 AC_DEFINE([HAVE_ECORE_IMF], [1], [Input Method Support for Edje Entry]) 289 AC_DEFINE([HAVE_ECORE_IMF], [1], [Input Method Support for Edje Entry])
288 have_ecore_imf="yes" 290 have_ecore_imf="yes"
289 requirement_edje="ecore-imf-evas >= 1.1.0 ecore-imf >= 1.1.0 ${requirement_edje}" 291 requirement_edje="ecore-imf-evas >= 1.2.0 ecore-imf >= 1.2.0 ${requirement_edje}"
290 ], 292 ],
291 [have_ecore_imf="no"]) 293 [have_ecore_imf="no"])
292 294
@@ -443,26 +445,26 @@ fi
443# Dependencies for the binaries 445# Dependencies for the binaries
444 446
445if test "x$have_edje_cc" = "xyes"; then 447if test "x$have_edje_cc" = "xyes"; then
446 PKG_CHECK_MODULES([EDJE_CC], [ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0]) 448 PKG_CHECK_MODULES([EDJE_CC], [ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0])
447 EDJE_CC_LIBS="${EDJE_CC_LIBS} ${LUA_LIBS} ${lua_libs}" 449 EDJE_CC_LIBS="${EDJE_CC_LIBS} ${LUA_LIBS} ${lua_libs}"
448fi 450fi
449 451
450AM_CONDITIONAL([BUILD_EPP], [test "x$have_edje_cc" = "xyes"]) 452AM_CONDITIONAL([BUILD_EPP], [test "x$have_edje_cc" = "xyes"])
451 453
452if test "x$have_edje_decc" = "xyes"; then 454if test "x$have_edje_decc" = "xyes"; then
453 PKG_CHECK_MODULES([EDJE_DECC], [ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0]) 455 PKG_CHECK_MODULES([EDJE_DECC], [ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0])
454fi 456fi
455 457
456if test "x$have_edje_player" = "xyes"; then 458if test "x$have_edje_player" = "xyes"; then
457 PKG_CHECK_MODULES([EDJE_PLAYER], [ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0]) 459 PKG_CHECK_MODULES([EDJE_PLAYER], [ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0])
458fi 460fi
459 461
460if test "x$have_edje_inspector" = "xyes"; then 462if test "x$have_edje_inspector" = "xyes"; then
461 PKG_CHECK_MODULES([EDJE_INSPECTOR], [ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0]) 463 PKG_CHECK_MODULES([EDJE_INSPECTOR], [ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0])
462fi 464fi
463 465
464if test "x$have_edje_external_inspector" = "xyes"; then 466if test "x$have_edje_external_inspector" = "xyes"; then
465 PKG_CHECK_MODULES([EDJE_EXTERNAL_INSPECTOR], [ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0]) 467 PKG_CHECK_MODULES([EDJE_EXTERNAL_INSPECTOR], [ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0])
466fi 468fi
467 469
468 470
@@ -541,11 +543,6 @@ AC_ARG_ENABLE([build-examples],
541 [ 543 [
542 if test "x${enableval}" = "xyes" ; then 544 if test "x${enableval}" = "xyes" ; then
543 build_examples="yes" 545 build_examples="yes"
544 edje_cc=$($PKG_CONFIG --variable=prefix edje)/bin/edje_cc
545 # put in here the dependencies for Edje' examples. They are
546 # meant to be 'real world' usage examples, thus one will be
547 # using higher level libraries on these programs
548 AC_SUBST(edje_cc)
549 else 546 else
550 build_examples="no" 547 build_examples="no"
551 fi 548 fi
diff --git a/libraries/edje/data/Makefile.in b/libraries/edje/data/Makefile.in
index 83c9e7c..8555a6e 100644
--- a/libraries/edje/data/Makefile.in
+++ b/libraries/edje/data/Makefile.in
@@ -217,6 +217,8 @@ PACKAGE_URL = @PACKAGE_URL@
217PACKAGE_VERSION = @PACKAGE_VERSION@ 217PACKAGE_VERSION = @PACKAGE_VERSION@
218PATH_SEPARATOR = @PATH_SEPARATOR@ 218PATH_SEPARATOR = @PATH_SEPARATOR@
219PKG_CONFIG = @PKG_CONFIG@ 219PKG_CONFIG = @PKG_CONFIG@
220PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
221PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
220PYTHON = @PYTHON@ 222PYTHON = @PYTHON@
221PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 223PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
222PYTHON_PLATFORM = @PYTHON_PLATFORM@ 224PYTHON_PLATFORM = @PYTHON_PLATFORM@
diff --git a/libraries/edje/data/include/Makefile.in b/libraries/edje/data/include/Makefile.in
index b639450..ce14f03 100644
--- a/libraries/edje/data/include/Makefile.in
+++ b/libraries/edje/data/include/Makefile.in
@@ -177,6 +177,8 @@ PACKAGE_URL = @PACKAGE_URL@
177PACKAGE_VERSION = @PACKAGE_VERSION@ 177PACKAGE_VERSION = @PACKAGE_VERSION@
178PATH_SEPARATOR = @PATH_SEPARATOR@ 178PATH_SEPARATOR = @PATH_SEPARATOR@
179PKG_CONFIG = @PKG_CONFIG@ 179PKG_CONFIG = @PKG_CONFIG@
180PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
181PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
180PYTHON = @PYTHON@ 182PYTHON = @PYTHON@
181PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 183PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
182PYTHON_PLATFORM = @PYTHON_PLATFORM@ 184PYTHON_PLATFORM = @PYTHON_PLATFORM@
diff --git a/libraries/edje/doc/Makefile.in b/libraries/edje/doc/Makefile.in
index d88c39e..b821675 100644
--- a/libraries/edje/doc/Makefile.in
+++ b/libraries/edje/doc/Makefile.in
@@ -154,6 +154,8 @@ PACKAGE_URL = @PACKAGE_URL@
154PACKAGE_VERSION = @PACKAGE_VERSION@ 154PACKAGE_VERSION = @PACKAGE_VERSION@
155PATH_SEPARATOR = @PATH_SEPARATOR@ 155PATH_SEPARATOR = @PATH_SEPARATOR@
156PKG_CONFIG = @PKG_CONFIG@ 156PKG_CONFIG = @PKG_CONFIG@
157PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
158PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
157PYTHON = @PYTHON@ 159PYTHON = @PYTHON@
158PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 160PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
159PYTHON_PLATFORM = @PYTHON_PLATFORM@ 161PYTHON_PLATFORM = @PYTHON_PLATFORM@
diff --git a/libraries/edje/edje.spec b/libraries/edje/edje.spec
index cede72d..edc3837 100644
--- a/libraries/edje/edje.spec
+++ b/libraries/edje/edje.spec
@@ -4,7 +4,7 @@
4 4
5Summary: Complex Graphical Design/Layout Engine 5Summary: Complex Graphical Design/Layout Engine
6Name: edje 6Name: edje
7Version: 1.1.99.67344 7Version: 1.2.0-alpha
8Release: %{_rel} 8Release: %{_rel}
9License: BSD 9License: BSD
10Group: System Environment/Libraries 10Group: System Environment/Libraries
diff --git a/libraries/edje/ltmain.sh b/libraries/edje/ltmain.sh
index 7ed280b..fa4b1e1 100755
--- a/libraries/edje/ltmain.sh
+++ b/libraries/edje/ltmain.sh
@@ -65,7 +65,7 @@
65# compiler: $LTCC 65# compiler: $LTCC
66# compiler flags: $LTCFLAGS 66# compiler flags: $LTCFLAGS
67# linker: $LD (gnu? $with_gnu_ld) 67# linker: $LD (gnu? $with_gnu_ld)
68# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1 68# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu3
69# automake: $automake_version 69# automake: $automake_version
70# autoconf: $autoconf_version 70# autoconf: $autoconf_version
71# 71#
@@ -73,7 +73,7 @@
73 73
74PROGRAM=ltmain.sh 74PROGRAM=ltmain.sh
75PACKAGE=libtool 75PACKAGE=libtool
76VERSION="2.2.6b Debian-2.2.6b-2ubuntu1" 76VERSION="2.2.6b Debian-2.2.6b-2ubuntu3"
77TIMESTAMP="" 77TIMESTAMP=""
78package_revision=1.3017 78package_revision=1.3017
79 79
diff --git a/libraries/edje/m4/efl_binary.m4 b/libraries/edje/m4/efl_binary.m4
index 93d6934..c774688 100644
--- a/libraries/edje/m4/efl_binary.m4
+++ b/libraries/edje/m4/efl_binary.m4
@@ -42,3 +42,30 @@ AM_CONDITIONAL(BUILD_[]UP, test "x$have_[]m4_defn([DOWN])" = "xyes")
42AS_IF([test "x$have_[]m4_defn([DOWN])" = "xyes"], [$2], [$3]) 42AS_IF([test "x$have_[]m4_defn([DOWN])" = "xyes"], [$2], [$3])
43 43
44]) 44])
45
46
47dnl Macro that check if a binary is built or not
48
49dnl Usage: EFL_WITH_BIN(package, binary, default_value)
50dnl Call AC_SUBST(_binary) (_binary is the lowercase of binary, - being transformed into _ by default, or the value set by the user)
51
52AC_DEFUN([EFL_WITH_BIN],
53[
54
55m4_pushdef([DOWN], m4_translit([[$2]], [-A-Z], [_a-z]))dnl
56
57dnl configure option
58
59AC_ARG_WITH([$2],
60 [AC_HELP_STRING([--with-$2=PATH], [specify a specific path to ]DOWN[ @<:@default=$3@:>@])],
61 [_efl_with_binary=${withval}],
62 [_efl_with_binary=$(pkg-config --variable=prefix $1)/bin/$3])
63
64DOWN=${_efl_with_binary}
65AC_MSG_NOTICE(DOWN[ set to ${_efl_with_binary}])
66
67with_binary_[]m4_defn([DOWN])=${_efl_with_binary}
68
69AC_SUBST(DOWN)
70
71])
diff --git a/libraries/edje/src/Makefile.in b/libraries/edje/src/Makefile.in
index fc05386..532d75b 100644
--- a/libraries/edje/src/Makefile.in
+++ b/libraries/edje/src/Makefile.in
@@ -193,6 +193,8 @@ PACKAGE_URL = @PACKAGE_URL@
193PACKAGE_VERSION = @PACKAGE_VERSION@ 193PACKAGE_VERSION = @PACKAGE_VERSION@
194PATH_SEPARATOR = @PATH_SEPARATOR@ 194PATH_SEPARATOR = @PATH_SEPARATOR@
195PKG_CONFIG = @PKG_CONFIG@ 195PKG_CONFIG = @PKG_CONFIG@
196PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
197PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
196PYTHON = @PYTHON@ 198PYTHON = @PYTHON@
197PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 199PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
198PYTHON_PLATFORM = @PYTHON_PLATFORM@ 200PYTHON_PLATFORM = @PYTHON_PLATFORM@
diff --git a/libraries/edje/src/bin/Makefile.in b/libraries/edje/src/bin/Makefile.in
index 07bf025..877bcb2 100644
--- a/libraries/edje/src/bin/Makefile.in
+++ b/libraries/edje/src/bin/Makefile.in
@@ -291,6 +291,8 @@ PACKAGE_URL = @PACKAGE_URL@
291PACKAGE_VERSION = @PACKAGE_VERSION@ 291PACKAGE_VERSION = @PACKAGE_VERSION@
292PATH_SEPARATOR = @PATH_SEPARATOR@ 292PATH_SEPARATOR = @PATH_SEPARATOR@
293PKG_CONFIG = @PKG_CONFIG@ 293PKG_CONFIG = @PKG_CONFIG@
294PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
295PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
294PYTHON = @PYTHON@ 296PYTHON = @PYTHON@
295PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 297PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
296PYTHON_PLATFORM = @PYTHON_PLATFORM@ 298PYTHON_PLATFORM = @PYTHON_PLATFORM@
diff --git a/libraries/edje/src/bin/edje_cc.h b/libraries/edje/src/bin/edje_cc.h
index d0c6d22..0291f29 100644
--- a/libraries/edje/src/bin/edje_cc.h
+++ b/libraries/edje/src/bin/edje_cc.h
@@ -147,6 +147,7 @@ void data_queue_anonymous_lookup(Edje_Part_Collection *pc, Edje_Program *ep,
147void data_queue_copied_anonymous_lookup(Edje_Part_Collection *pc, int *src, int *dest); 147void data_queue_copied_anonymous_lookup(Edje_Part_Collection *pc, int *src, int *dest);
148void data_queue_image_lookup(char *name, int *dest, Eina_Bool *set); 148void data_queue_image_lookup(char *name, int *dest, Eina_Bool *set);
149void data_queue_copied_image_lookup(int *src, int *dest, Eina_Bool *set); 149void data_queue_copied_image_lookup(int *src, int *dest, Eina_Bool *set);
150void data_queue_image_remove(int *dest, Eina_Bool *set);
150void data_queue_part_slave_lookup(int *master, int *slave); 151void data_queue_part_slave_lookup(int *master, int *slave);
151void data_queue_image_slave_lookup(int *master, int *slave); 152void data_queue_image_slave_lookup(int *master, int *slave);
152void data_queue_spectrum_lookup(char *name, int *dest); 153void data_queue_spectrum_lookup(char *name, int *dest);
@@ -155,6 +156,7 @@ void data_process_lookups(void);
155void data_process_scripts(void); 156void data_process_scripts(void);
156void data_process_script_lookups(void); 157void data_process_script_lookups(void);
157 158
159void part_description_image_cleanup(Edje_Part *ep);
158 160
159int is_verbatim(void); 161int is_verbatim(void);
160void track_verbatim(int on); 162void track_verbatim(int on);
diff --git a/libraries/edje/src/bin/edje_cc_handlers.c b/libraries/edje/src/bin/edje_cc_handlers.c
index f74fa12..14ac0b7 100644
--- a/libraries/edje/src/bin/edje_cc_handlers.c
+++ b/libraries/edje/src/bin/edje_cc_handlers.c
@@ -106,6 +106,7 @@ static void st_collections_group_script_only(void);
106static void st_collections_group_alias(void); 106static void st_collections_group_alias(void);
107static void st_collections_group_min(void); 107static void st_collections_group_min(void);
108static void st_collections_group_max(void); 108static void st_collections_group_max(void);
109static void st_collections_group_broadcast_signal(void);
109static void st_collections_group_data_item(void); 110static void st_collections_group_data_item(void);
110static void st_collections_group_orientation(void); 111static void st_collections_group_orientation(void);
111 112
@@ -317,6 +318,7 @@ New_Statement_Handler statement_handlers[] =
317 {"collections.group.alias", st_collections_group_alias}, 318 {"collections.group.alias", st_collections_group_alias},
318 {"collections.group.min", st_collections_group_min}, 319 {"collections.group.min", st_collections_group_min},
319 {"collections.group.max", st_collections_group_max}, 320 {"collections.group.max", st_collections_group_max},
321 {"collections.group.broadcast_signal", st_collections_group_broadcast_signal},
320 {"collections.group.orientation", st_collections_group_orientation}, 322 {"collections.group.orientation", st_collections_group_orientation},
321 {"collections.group.data.item", st_collections_group_data_item}, 323 {"collections.group.data.item", st_collections_group_data_item},
322 {"collections.group.limits.horizontal", st_collections_group_limits_horizontal}, 324 {"collections.group.limits.horizontal", st_collections_group_limits_horizontal},
@@ -833,6 +835,39 @@ _edje_part_description_fill(Edje_Part_Description_Spec_Fill *fill)
833 fill->type = EDJE_FILL_TYPE_SCALE; 835 fill->type = EDJE_FILL_TYPE_SCALE;
834} 836}
835 837
838static void
839_edje_part_description_image_remove(Edje_Part_Description_Image *ed)
840{
841 unsigned int j;
842
843 if (!ed) return;
844
845 data_queue_image_remove(&(ed->image.id), &(ed->image.set));
846
847 for (j = 0; j < ed->image.tweens_count; ++j)
848 data_queue_image_remove(&(ed->image.tweens[j]->id),
849 &(ed->image.tweens[j]->set));
850}
851
852void
853part_description_image_cleanup(Edje_Part *ep)
854{
855 Edje_Part_Description_Image *ed;
856 unsigned int j;
857
858 if (ep->type != EDJE_PART_TYPE_IMAGE)
859 return ;
860
861 ed = (Edje_Part_Description_Image*) ep->default_desc;
862 _edje_part_description_image_remove(ed);
863
864 for (j = 0; j < ep->other.desc_count; j++)
865 {
866 ed = (Edje_Part_Description_Image*) ep->other.desc[j];
867 _edje_part_description_image_remove(ed);
868 }
869}
870
836static Edje_Part_Description_Common * 871static Edje_Part_Description_Common *
837_edje_part_description_alloc(unsigned char type, const char *collection, const char *part) 872_edje_part_description_alloc(unsigned char type, const char *collection, const char *part)
838{ 873{
@@ -2118,6 +2153,7 @@ ob_collections_group(void)
2118 pc = mem_alloc(SZ(Edje_Part_Collection)); 2153 pc = mem_alloc(SZ(Edje_Part_Collection));
2119 edje_collections = eina_list_append(edje_collections, pc); 2154 edje_collections = eina_list_append(edje_collections, pc);
2120 pc->id = current_de->id; 2155 pc->id = current_de->id;
2156 pc->broadcast_signal = EINA_TRUE; /* This was the behaviour by default in Edje 1.1 */
2121 2157
2122 cd = mem_alloc(SZ(Code)); 2158 cd = mem_alloc(SZ(Code));
2123 codes = eina_list_append(codes, cd); 2159 codes = eina_list_append(codes, cd);
@@ -2139,8 +2175,10 @@ ob_collections_group(void)
2139static void 2175static void
2140st_collections_group_name(void) 2176st_collections_group_name(void)
2141{ 2177{
2178 Edje_Part_Collection_Directory_Entry *alias;
2142 Edje_Part_Collection_Directory_Entry *older; 2179 Edje_Part_Collection_Directory_Entry *older;
2143 Edje_Part_Collection *current_pc; 2180 Edje_Part_Collection *current_pc;
2181 Eina_List *l = NULL;
2144 2182
2145 check_arg_count(1); 2183 check_arg_count(1);
2146 2184
@@ -2150,31 +2188,24 @@ st_collections_group_name(void)
2150 current_pc->part = current_de->entry; 2188 current_pc->part = current_de->entry;
2151 2189
2152 older = eina_hash_find(edje_file->collection, current_de->entry); 2190 older = eina_hash_find(edje_file->collection, current_de->entry);
2191 if (older) eina_hash_del(edje_file->collection, current_de->entry, older);
2192 eina_hash_direct_add(edje_file->collection, current_de->entry, current_de);
2193 if (!older) return;
2153 2194
2154 if (older) 2195 EINA_LIST_FOREACH(aliases, l, alias)
2155 { 2196 if (strcmp(alias->entry, current_de->entry) == 0)
2156 Edje_Part_Collection *pc; 2197 {
2157 Eina_List *l; 2198 Edje_Part_Collection *pc;
2158 Code *cd; 2199
2159 int i = 0; 2200 pc = eina_list_nth(edje_collections, older->id);
2160 2201 INF("overriding alias ('%s' => '%s') by group '%s'",
2161 pc = eina_list_nth(edje_collections, older->id); 2202 alias->entry, pc->part,
2162 cd = eina_list_nth(codes, older->id); 2203 current_de->entry);
2163 2204 aliases = eina_list_remove_list(aliases, l);
2164 eina_hash_del(edje_file->collection, current_de->entry, older); 2205 free(alias);
2165 edje_collections = eina_list_remove(edje_collections, pc); 2206 break;
2166 codes = eina_list_remove(codes, cd); 2207 }
2167
2168 EINA_LIST_FOREACH(edje_collections, l, pc)
2169 {
2170 older = eina_hash_find(edje_file->collection, pc->part);
2171
2172 pc->id = i++;
2173 if (older) older->id = pc->id;
2174 }
2175 }
2176 2208
2177 eina_hash_direct_add(edje_file->collection, current_de->entry, current_de);
2178} 2209}
2179 2210
2180typedef struct _Edje_List_Foreach_Data Edje_List_Foreach_Data; 2211typedef struct _Edje_List_Foreach_Data Edje_List_Foreach_Data;
@@ -2242,6 +2273,14 @@ st_collections_group_inherit(void)
2242 progname, file_in, line - 1, parent_name); 2273 progname, file_in, line - 1, parent_name);
2243 exit(-1); 2274 exit(-1);
2244 } 2275 }
2276 if (pc2 == pc)
2277 {
2278 ERR("%s: Error. parse error %s:%i. You are trying to inherit '%s' from itself. That's not possible."
2279 "If there is another group of the same name, you want to inherit from that group and have the"
2280 "same name as that group, there is a trick ! Just put the inherit before the directive that set"
2281 "the name !", progname, file_in, line - 1, parent_name);
2282 exit(-1);
2283 }
2245 2284
2246 if (pc2->data) 2285 if (pc2->data)
2247 { 2286 {
@@ -2463,6 +2502,8 @@ static void
2463st_collections_group_alias(void) 2502st_collections_group_alias(void)
2464{ 2503{
2465 Edje_Part_Collection_Directory_Entry *alias; 2504 Edje_Part_Collection_Directory_Entry *alias;
2505 Edje_Part_Collection_Directory_Entry *tmp;
2506 Eina_List *l;
2466 2507
2467 check_arg_count(1); 2508 check_arg_count(1);
2468 2509
@@ -2470,6 +2511,20 @@ st_collections_group_alias(void)
2470 alias->id = current_de->id; 2511 alias->id = current_de->id;
2471 alias->entry = parse_str(0); 2512 alias->entry = parse_str(0);
2472 2513
2514 EINA_LIST_FOREACH(aliases, l, tmp)
2515 if (strcmp(alias->entry, tmp->entry) == 0)
2516 {
2517 Edje_Part_Collection *pc;
2518
2519 pc = eina_list_nth(edje_collections, tmp->id);
2520 INF("overriding alias ('%s' => '%s') to ('%s' => '%s')",
2521 tmp->entry, pc->part,
2522 alias->entry, current_de->entry);
2523 aliases = eina_list_remove_list(aliases, l);
2524 free(tmp);
2525 break;
2526 }
2527
2473 aliases = eina_list_append(aliases, alias); 2528 aliases = eina_list_append(aliases, alias);
2474} 2529}
2475 2530
@@ -2520,6 +2575,28 @@ st_collections_group_max(void)
2520} 2575}
2521 2576
2522/** 2577/**
2578 @page edcref
2579 @property
2580 broadcast_signal
2581 @parameters
2582 [broadcast]
2583 @effect
2584 Signal got automatically broadcasted to all sub group part. Default to
2585 true since 1.1.
2586 @endproperty
2587*/
2588static void
2589st_collections_group_broadcast_signal(void)
2590{
2591 Edje_Part_Collection *pc;
2592
2593 check_arg_count(1);
2594
2595 pc = eina_list_data_get(eina_list_last(edje_collections));
2596 pc->broadcast_signal = parse_bool(0);
2597}
2598
2599/**
2523 @page edcref 2600 @page edcref
2524 @block 2601 @block
2525 script 2602 script
@@ -2947,21 +3024,57 @@ st_collections_group_parts_part_name(void)
2947static void 3024static void
2948st_collections_group_parts_part_type(void) 3025st_collections_group_parts_part_type(void)
2949{ 3026{
3027 unsigned int type;
3028
2950 check_arg_count(1); 3029 check_arg_count(1);
2951 3030
2952 current_part->type = parse_enum(0, 3031 type = parse_enum(0,
2953 "NONE", EDJE_PART_TYPE_NONE, 3032 "NONE", EDJE_PART_TYPE_NONE,
2954 "RECT", EDJE_PART_TYPE_RECTANGLE, 3033 "RECT", EDJE_PART_TYPE_RECTANGLE,
2955 "TEXT", EDJE_PART_TYPE_TEXT, 3034 "TEXT", EDJE_PART_TYPE_TEXT,
2956 "IMAGE", EDJE_PART_TYPE_IMAGE, 3035 "IMAGE", EDJE_PART_TYPE_IMAGE,
2957 "SWALLOW", EDJE_PART_TYPE_SWALLOW, 3036 "SWALLOW", EDJE_PART_TYPE_SWALLOW,
2958 "TEXTBLOCK", EDJE_PART_TYPE_TEXTBLOCK, 3037 "TEXTBLOCK", EDJE_PART_TYPE_TEXTBLOCK,
2959 "GROUP", EDJE_PART_TYPE_GROUP, 3038 "GROUP", EDJE_PART_TYPE_GROUP,
2960 "BOX", EDJE_PART_TYPE_BOX, 3039 "BOX", EDJE_PART_TYPE_BOX,
2961 "TABLE", EDJE_PART_TYPE_TABLE, 3040 "TABLE", EDJE_PART_TYPE_TABLE,
2962 "EXTERNAL", EDJE_PART_TYPE_EXTERNAL, 3041 "EXTERNAL", EDJE_PART_TYPE_EXTERNAL,
2963 "PROXY", EDJE_PART_TYPE_PROXY, 3042 "PROXY", EDJE_PART_TYPE_PROXY,
2964 NULL); 3043 NULL);
3044
3045 /* handle type change of inherited part */
3046 if (type != current_part->type)
3047 {
3048 Edje_Part_Description_Common *new, *previous;
3049 Edje_Part_Collection *pc;
3050 Edje_Part *ep;
3051 unsigned int i;
3052
3053 /* we don't free old part as we don't remove all reference to them */
3054 part_description_image_cleanup(current_part);
3055
3056 pc = eina_list_data_get(eina_list_last(edje_collections));
3057 ep = current_part;
3058
3059 previous = ep->default_desc;
3060 if (previous)
3061 {
3062 new = _edje_part_description_alloc(type, pc->part, ep->name);
3063 memcpy(new, previous, sizeof (Edje_Part_Description_Common));
3064
3065 ep->default_desc = new;
3066 }
3067
3068 for (i = 0; i < ep->other.desc_count; i++)
3069 {
3070 previous = ep->other.desc[i];
3071 new = _edje_part_description_alloc(type, pc->part, ep->name);
3072 memcpy(new, previous, sizeof (Edje_Part_Description_Common));
3073 ep->other.desc[i] = new;
3074 }
3075 }
3076
3077 current_part->type = type;
2965} 3078}
2966 3079
2967/** 3080/**
@@ -4292,6 +4405,7 @@ st_collections_group_parts_part_description_inherit(void)
4292 4405
4293 ied->image = iparent->image; 4406 ied->image = iparent->image;
4294 4407
4408 data_queue_image_remove(&ied->image.id, &ied->image.set);
4295 data_queue_copied_image_lookup(&iparent->image.id, &ied->image.id, &ied->image.set); 4409 data_queue_copied_image_lookup(&iparent->image.id, &ied->image.id, &ied->image.set);
4296 4410
4297 ied->image.tweens = calloc(iparent->image.tweens_count, 4411 ied->image.tweens = calloc(iparent->image.tweens_count,
@@ -4303,6 +4417,7 @@ st_collections_group_parts_part_description_inherit(void)
4303 iid = iparent->image.tweens[i]; 4417 iid = iparent->image.tweens[i];
4304 4418
4305 iid_new = mem_alloc(SZ(Edje_Part_Image_Id)); 4419 iid_new = mem_alloc(SZ(Edje_Part_Image_Id));
4420 data_queue_image_remove(&ied->image.id, &ied->image.set);
4306 data_queue_copied_image_lookup(&(iid->id), &(iid_new->id), &(iid_new->set)); 4421 data_queue_copied_image_lookup(&(iid->id), &(iid_new->id), &(iid_new->set));
4307 ied->image.tweens[i] = iid_new; 4422 ied->image.tweens[i] = iid_new;
4308 } 4423 }
@@ -4445,6 +4560,9 @@ st_collections_group_parts_part_description_state(void)
4445 if ((ep->default_desc->state.name && !strcmp(s, ep->default_desc->state.name) && ed->state.value == ep->default_desc->state.value) || 4560 if ((ep->default_desc->state.name && !strcmp(s, ep->default_desc->state.name) && ed->state.value == ep->default_desc->state.value) ||
4446 (!ep->default_desc->state.name && !strcmp(s, "default") && ed->state.value == ep->default_desc->state.value)) 4561 (!ep->default_desc->state.name && !strcmp(s, "default") && ed->state.value == ep->default_desc->state.value))
4447 { 4562 {
4563 if (ep->type == EDJE_PART_TYPE_IMAGE)
4564 _edje_part_description_image_remove((Edje_Part_Description_Image*) ed);
4565
4448 free(ed); 4566 free(ed);
4449 ep->other.desc_count--; 4567 ep->other.desc_count--;
4450 ep->other.desc = realloc(ep->other.desc, 4568 ep->other.desc = realloc(ep->other.desc,
@@ -4458,6 +4576,9 @@ st_collections_group_parts_part_description_state(void)
4458 { 4576 {
4459 if (!strcmp(s, ep->other.desc[i]->state.name) && ed->state.value == ep->other.desc[i]->state.value) 4577 if (!strcmp(s, ep->other.desc[i]->state.name) && ed->state.value == ep->other.desc[i]->state.value)
4460 { 4578 {
4579 if (ep->type == EDJE_PART_TYPE_IMAGE)
4580 _edje_part_description_image_remove((Edje_Part_Description_Image*) ed);
4581
4461 free(ed); 4582 free(ed);
4462 ep->other.desc_count--; 4583 ep->other.desc_count--;
4463 ep->other.desc = realloc(ep->other.desc, 4584 ep->other.desc = realloc(ep->other.desc,
@@ -4538,18 +4659,38 @@ st_collections_group_parts_part_description_fixed(void)
4538 @property 4659 @property
4539 min 4660 min
4540 @parameters 4661 @parameters
4541 [width] [height] 4662 [width] [height] or SOURCE
4542 @effect 4663 @effect
4543 The minimum size of the state. 4664 The minimum size of the state.
4665
4666 When min is defined to SOURCE, it will look at the original
4667 image size and enforce it minimal size to match at least the
4668 original one. The part must be an IMAGE or a GROUP part.
4544 @endproperty 4669 @endproperty
4545*/ 4670*/
4546static void 4671static void
4547st_collections_group_parts_part_description_min(void) 4672st_collections_group_parts_part_description_min(void)
4548{ 4673{
4549 check_arg_count(2); 4674 check_min_arg_count(1);
4675
4676 if (is_param(1)) {
4677 current_desc->min.w = parse_float_range(0, 0, 0x7fffffff);
4678 current_desc->min.h = parse_float_range(1, 0, 0x7fffffff);
4679 } else {
4680 char *tmp;
4681
4682 tmp = parse_str(0);
4683 if ((current_part->type != EDJE_PART_TYPE_IMAGE && current_part->type != EDJE_PART_TYPE_GROUP) ||
4684 !tmp || strcmp(tmp, "SOURCE") != 0)
4685 {
4686 ERR("%s: Error. parse error %s:%i. "
4687 "Only IMAGE and GROUP part can have a min: SOURCE; defined",
4688 progname, file_in, line - 1);
4689 exit(-1);
4690 }
4550 4691
4551 current_desc->min.w = parse_float_range(0, 0, 0x7fffffff); 4692 current_desc->min.limit = EINA_TRUE;
4552 current_desc->min.h = parse_float_range(1, 0, 0x7fffffff); 4693 }
4553} 4694}
4554 4695
4555/** 4696/**
@@ -4578,18 +4719,38 @@ st_collections_group_parts_part_description_minmul(void)
4578 @property 4719 @property
4579 max 4720 max
4580 @parameters 4721 @parameters
4581 [width] [height] 4722 [width] [height] or SOURCE
4582 @effect 4723 @effect
4583 The maximum size of the state. A size of -1.0 means that it will be ignored in one direction. 4724 The maximum size of the state. A size of -1.0 means that it will be ignored in one direction.
4725
4726 When max is set to SOURCE, edje will enforce the part to be
4727 not more than the original image size. The part must be an
4728 IMAGE part.
4584 @endproperty 4729 @endproperty
4585*/ 4730*/
4586static void 4731static void
4587st_collections_group_parts_part_description_max(void) 4732st_collections_group_parts_part_description_max(void)
4588{ 4733{
4589 check_arg_count(2); 4734 check_min_arg_count(1);
4735
4736 if (is_param(1)) {
4737 current_desc->max.w = parse_float_range(0, -1.0, 0x7fffffff);
4738 current_desc->max.h = parse_float_range(1, -1.0, 0x7fffffff);
4739 } else {
4740 char *tmp;
4590 4741
4591 current_desc->max.w = parse_float_range(0, -1.0, 0x7fffffff); 4742 tmp = parse_str(0);
4592 current_desc->max.h = parse_float_range(1, -1.0, 0x7fffffff); 4743 if (current_part->type != EDJE_PART_TYPE_IMAGE ||
4744 !tmp || strcmp(tmp, "SOURCE") != 0)
4745 {
4746 ERR("%s: Error. parse error %s:%i. "
4747 "Only IMAGE part can have a max: SOURCE; defined",
4748 progname, file_in, line - 1);
4749 exit(-1);
4750 }
4751
4752 current_desc->max.limit = EINA_TRUE;
4753 }
4593} 4754}
4594 4755
4595/** 4756/**
@@ -5039,6 +5200,7 @@ st_collections_group_parts_part_description_image_normal(void)
5039 char *name; 5200 char *name;
5040 5201
5041 name = parse_str(0); 5202 name = parse_str(0);
5203 data_queue_image_remove(&(ed->image.id), &(ed->image.set));
5042 data_queue_image_lookup(name, &(ed->image.id), &(ed->image.set)); 5204 data_queue_image_lookup(name, &(ed->image.id), &(ed->image.set));
5043 free(name); 5205 free(name);
5044 } 5206 }
@@ -5083,6 +5245,7 @@ st_collections_group_parts_part_description_image_tween(void)
5083 sizeof (Edje_Part_Image_Id*) * ed->image.tweens_count); 5245 sizeof (Edje_Part_Image_Id*) * ed->image.tweens_count);
5084 ed->image.tweens[ed->image.tweens_count - 1] = iid; 5246 ed->image.tweens[ed->image.tweens_count - 1] = iid;
5085 name = parse_str(0); 5247 name = parse_str(0);
5248 data_queue_image_remove(&(iid->id), &(iid->set));
5086 data_queue_image_lookup(name, &(iid->id), &(iid->set)); 5249 data_queue_image_lookup(name, &(iid->id), &(iid->set));
5087 free(name); 5250 free(name);
5088 } 5251 }
diff --git a/libraries/edje/src/bin/edje_cc_mem.c b/libraries/edje/src/bin/edje_cc_mem.c
index 7c1a5c9..d2d4ae0 100644
--- a/libraries/edje/src/bin/edje_cc_mem.c
+++ b/libraries/edje/src/bin/edje_cc_mem.c
@@ -7,12 +7,6 @@
7 7
8#include "edje_cc.h" 8#include "edje_cc.h"
9 9
10#ifdef _WIN32
11# define FMT_SIZE_T "%Iu"
12#else
13# define FMT_SIZE_T "%zu"
14#endif
15
16void * 10void *
17mem_alloc(size_t size) 11mem_alloc(size_t size)
18{ 12{
@@ -20,7 +14,7 @@ mem_alloc(size_t size)
20 14
21 mem = calloc(1, size); 15 mem = calloc(1, size);
22 if (mem) return mem; 16 if (mem) return mem;
23 ERR("%s: Error. %s:%i memory allocation of " FMT_SIZE_T " bytes failed. %s", 17 ERR("%s: Error. %s:%i memory allocation of %zu bytes failed. %s",
24 progname, file_in, line, size, strerror(errno)); 18 progname, file_in, line, size, strerror(errno));
25 exit(-1); 19 exit(-1);
26 return NULL; 20 return NULL;
@@ -33,7 +27,7 @@ mem_strdup(const char *s)
33 27
34 str = strdup(s); 28 str = strdup(s);
35 if (str) return str; 29 if (str) return str;
36 ERR("%s: Error. %s:%i memory allocation of " FMT_SIZE_T " bytes failed. %s. string being duplicated: \"%s\"", 30 ERR("%s: Error. %s:%i memory allocation of %zu bytes failed. %s. string being duplicated: \"%s\"",
37 progname, file_in, line, strlen(s) + 1, strerror(errno), s); 31 progname, file_in, line, strlen(s) + 1, strerror(errno), s);
38 exit(-1); 32 exit(-1);
39 return NULL; 33 return NULL;
diff --git a/libraries/edje/src/bin/edje_cc_out.c b/libraries/edje/src/bin/edje_cc_out.c
index 5050ad4..b4c541c 100644
--- a/libraries/edje/src/bin/edje_cc_out.c
+++ b/libraries/edje/src/bin/edje_cc_out.c
@@ -2,21 +2,30 @@
2# include "config.h" 2# include "config.h"
3#endif 3#endif
4 4
5#ifdef STDC_HEADERS
6# include <stdlib.h>
7# include <stddef.h>
8#else
9# ifdef HAVE_STDLIB_H
10# include <stdlib.h>
11# endif
12#endif
5#ifdef HAVE_ALLOCA_H 13#ifdef HAVE_ALLOCA_H
6# include <alloca.h> 14# include <alloca.h>
7#elif defined __GNUC__ 15#elif !defined alloca
8# define alloca __builtin_alloca 16# ifdef __GNUC__
9#elif defined _AIX 17# define alloca __builtin_alloca
10# define alloca __alloca 18# elif defined _AIX
11#elif defined _MSC_VER 19# define alloca __alloca
12# include <malloc.h> 20# elif defined _MSC_VER
13# define alloca _alloca 21# include <malloc.h>
14#else 22# define alloca _alloca
15# include <stddef.h> 23# elif !defined HAVE_ALLOCA
16# ifdef __cplusplus 24# ifdef __cplusplus
17extern "C" 25extern "C"
18# endif 26# endif
19void *alloca (size_t); 27void *alloca (size_t);
28# endif
20#endif 29#endif
21 30
22#include <string.h> 31#include <string.h>
@@ -102,7 +111,7 @@ struct _Code_Lookup
102 Eina_Bool set; 111 Eina_Bool set;
103}; 112};
104 113
105static void data_process_string(Edje_Part_Collection *pc, const char *prefix, char *s, void (*func)(Edje_Part_Collection *pc, char *name, char *ptr, int len)); 114static void data_process_string(Edje_Part_Collection *pc, const char *prefix, char *s, void (*func)(Edje_Part_Collection *pc, char *name, char* ptr, int len));
106 115
107Edje_File *edje_file = NULL; 116Edje_File *edje_file = NULL;
108Eina_List *edje_collections = NULL; 117Eina_List *edje_collections = NULL;
@@ -500,7 +509,8 @@ data_write_images(Eet_File *ef, int *image_num, int *input_bytes, int *input_raw
500 { 509 {
501 img = &edje_file->image_dir->entries[i]; 510 img = &edje_file->image_dir->entries[i];
502 511
503 if (img->source_type == EDJE_IMAGE_SOURCE_TYPE_EXTERNAL) 512 if (img->source_type == EDJE_IMAGE_SOURCE_TYPE_EXTERNAL
513 || img->entry == NULL)
504 { 514 {
505 } 515 }
506 else 516 else
@@ -1550,6 +1560,23 @@ data_queue_image_lookup(char *name, int *dest, Eina_Bool *set)
1550} 1560}
1551 1561
1552void 1562void
1563data_queue_image_remove(int *dest, Eina_Bool *set)
1564{
1565 Eina_List *l;
1566 Image_Lookup *il;
1567
1568 EINA_LIST_FOREACH(image_lookups, l, il)
1569 {
1570 if (il->dest == dest && il->set == set)
1571 {
1572 image_lookups = eina_list_remove_list(image_lookups, l);
1573 free(il);
1574 return ;
1575 }
1576 }
1577 }
1578
1579void
1553data_queue_copied_image_lookup(int *src, int *dest, Eina_Bool *set) 1580data_queue_copied_image_lookup(int *src, int *dest, Eina_Bool *set)
1554{ 1581{
1555 Eina_List *l; 1582 Eina_List *l;
@@ -1602,14 +1629,64 @@ data_process_lookups(void)
1602 Program_Lookup *program; 1629 Program_Lookup *program;
1603 Group_Lookup *group; 1630 Group_Lookup *group;
1604 Image_Lookup *image; 1631 Image_Lookup *image;
1632 Eina_List *l2;
1605 Eina_List *l; 1633 Eina_List *l;
1634 Eina_Hash *images_in_use;
1606 void *data; 1635 void *data;
1636 Eina_Bool is_lua = EINA_FALSE;
1637
1638 /* remove all unreferenced Edje_Part_Collection */
1639 EINA_LIST_FOREACH_SAFE(edje_collections, l, l2, pc)
1640 {
1641 Edje_Part_Collection_Directory_Entry *alias;
1642 Edje_Part_Collection_Directory_Entry *find;
1643 Eina_List *l3;
1644 unsigned int id = 0;
1645 unsigned int i;
1646
1647 find = eina_hash_find(edje_file->collection, pc->part);
1648 if (find && find->id == pc->id)
1649 continue ;
1650
1651 EINA_LIST_FOREACH(aliases, l3, alias)
1652 if (alias->id == pc->id)
1653 continue ;
1654
1655 /* This Edje_Part_Collection is not used at all */
1656 edje_collections = eina_list_remove_list(edje_collections, l);
1657 l3 = eina_list_nth_list(codes, pc->id);
1658 codes = eina_list_remove_list(codes, l3);
1659
1660 /* Unref all image used by that group */
1661 for (i = 0; i < pc->parts_count; ++i)
1662 part_description_image_cleanup(pc->parts[i]);
1663
1664 /* Correct all id */
1665 EINA_LIST_FOREACH(edje_collections, l3, pc)
1666 {
1667 Eina_List *l4;
1668
1669 /* Some group could be removed from the collection, but still be referenced by alias */
1670 find = eina_hash_find(edje_file->collection, pc->part);
1671 if (pc->id != find->id) find = NULL;
1672
1673 /* Update all matching alias */
1674 EINA_LIST_FOREACH(aliases, l4, alias)
1675 if (pc->id == alias->id)
1676 alias->id = id;
1677
1678 pc->id = id++;
1679 if (find) find->id = pc->id;
1680 }
1681 }
1607 1682
1608 EINA_LIST_FOREACH(edje_collections, l, pc) 1683 EINA_LIST_FOREACH(edje_collections, l, pc)
1609 { 1684 {
1610 unsigned int count = 0; 1685 unsigned int count = 0;
1611 unsigned int i; 1686 unsigned int i;
1612 1687
1688 if (pc->lua_script_only)
1689 is_lua = EINA_TRUE;
1613#define PROGRAM_ID_SET(Type, Pc, It, Count) \ 1690#define PROGRAM_ID_SET(Type, Pc, It, Count) \
1614 for (It = 0; It < Pc->programs.Type ## _count; ++It) \ 1691 for (It = 0; It < Pc->programs.Type ## _count; ++It) \
1615 { \ 1692 { \
@@ -1738,13 +1815,15 @@ data_process_lookups(void)
1738 free(group); 1815 free(group);
1739 } 1816 }
1740 1817
1818 images_in_use = eina_hash_string_superfast_new(NULL);
1819
1741 EINA_LIST_FREE(image_lookups, image) 1820 EINA_LIST_FREE(image_lookups, image)
1742 { 1821 {
1743 Edje_Image_Directory_Entry *de;
1744 Eina_Bool find = EINA_FALSE; 1822 Eina_Bool find = EINA_FALSE;
1745 1823
1746 if (edje_file->image_dir) 1824 if (edje_file->image_dir)
1747 { 1825 {
1826 Edje_Image_Directory_Entry *de;
1748 unsigned int i; 1827 unsigned int i;
1749 1828
1750 for (i = 0; i < edje_file->image_dir->entries_count; ++i) 1829 for (i = 0; i < edje_file->image_dir->entries_count; ++i)
@@ -1760,6 +1839,9 @@ data_process_lookups(void)
1760 *(image->dest) = de->id; 1839 *(image->dest) = de->id;
1761 *(image->set) = EINA_FALSE; 1840 *(image->set) = EINA_FALSE;
1762 find = EINA_TRUE; 1841 find = EINA_TRUE;
1842
1843 if (!eina_hash_find(images_in_use, image->name))
1844 eina_hash_direct_add(images_in_use, de->entry, de);
1763 break; 1845 break;
1764 } 1846 }
1765 } 1847 }
@@ -1774,10 +1856,20 @@ data_process_lookups(void)
1774 1856
1775 if ((set->name) && (!strcmp(set->name, image->name))) 1857 if ((set->name) && (!strcmp(set->name, image->name)))
1776 { 1858 {
1859 Edje_Image_Directory_Set_Entry *child;
1860 Eina_List *lc;
1861
1777 handle_slave_lookup(image_slave_lookups, image->dest, set->id); 1862 handle_slave_lookup(image_slave_lookups, image->dest, set->id);
1778 *(image->dest) = set->id; 1863 *(image->dest) = set->id;
1779 *(image->set) = EINA_TRUE; 1864 *(image->set) = EINA_TRUE;
1780 find = EINA_TRUE; 1865 find = EINA_TRUE;
1866
1867 EINA_LIST_FOREACH(set->entries, lc, child)
1868 if (!eina_hash_find(images_in_use, child->name))
1869 eina_hash_direct_add(images_in_use, child->name, child);
1870
1871 if (!eina_hash_find(images_in_use, image->name))
1872 eina_hash_direct_add(images_in_use, set->name, set);
1781 break; 1873 break;
1782 } 1874 }
1783 } 1875 }
@@ -1795,6 +1887,54 @@ data_process_lookups(void)
1795 free(image); 1887 free(image);
1796 } 1888 }
1797 1889
1890 if (edje_file->image_dir && !is_lua)
1891 {
1892 Edje_Image_Directory_Entry *de;
1893 Edje_Image_Directory_Set *set;
1894 unsigned int i;
1895
1896 for (i = 0; i < edje_file->image_dir->entries_count; ++i)
1897 {
1898 de = edje_file->image_dir->entries + i;
1899
1900 if (de->entry && eina_hash_find(images_in_use, de->entry))
1901 continue ;
1902
1903 if (verbose)
1904 {
1905 printf("%s: Image '%s' in ressource 'edje/image/%i' will not be included as it is unused.\n", progname, de->entry, de->id);
1906 }
1907 else
1908 {
1909 INF("Image '%s' in ressource 'edje/image/%i' will not be included as it is unused.", de->entry, de->id);
1910 }
1911
1912 de->entry = NULL;
1913 }
1914
1915 for (i = 0; i < edje_file->image_dir->sets_count; ++i)
1916 {
1917 set = edje_file->image_dir->sets + i;
1918
1919 if (set->name && eina_hash_find(images_in_use, set->name))
1920 continue ;
1921
1922 if (verbose)
1923 {
1924 printf("%s: Set '%s' will not be included as it is unused.\n", progname, set->name);
1925 }
1926 else
1927 {
1928 INF("Set '%s' will not be included as it is unused.", set->name);
1929 }
1930
1931 set->name = NULL;
1932 set->entries = NULL;
1933 }
1934 }
1935
1936 eina_hash_free(images_in_use);
1937
1798 EINA_LIST_FREE(part_slave_lookups, data) 1938 EINA_LIST_FREE(part_slave_lookups, data)
1799 free(data); 1939 free(data);
1800 1940
diff --git a/libraries/edje/src/bin/edje_inspector.c b/libraries/edje/src/bin/edje_inspector.c
index 093de86..676c829 100644
--- a/libraries/edje/src/bin/edje_inspector.c
+++ b/libraries/edje/src/bin/edje_inspector.c
@@ -31,12 +31,6 @@ static int _log_dom;
31#define FLOAT_PRECISION 0.0001 31#define FLOAT_PRECISION 0.0001
32#define FDIFF(a, b) (fabs((a) - (b)) > FLOAT_PRECISION) 32#define FDIFF(a, b) (fabs((a) - (b)) > FLOAT_PRECISION)
33 33
34#ifdef _WIN32
35# define FMT_UCHAR "%c"
36#else
37# define FMT_UCHAR "%hhu"
38#endif
39
40/* context */ 34/* context */
41static Eina_List *groups; 35static Eina_List *groups;
42static Ecore_Evas *ee; 36static Ecore_Evas *ee;
@@ -1588,8 +1582,8 @@ main(int argc, char **argv)
1588 goto error_getopt; 1582 goto error_getopt;
1589 } 1583 }
1590 1584
1591 DBG("mode=%s, detail=%d(%s), group=%s, part=%s, program=%s, api-only=" FMT_UCHAR 1585 DBG("mode=%s, detail=%d(%s), group=%s, part=%s, program=%s, api-only=%hhu"
1592 ", api-fix=" FMT_UCHAR ", machine=" FMT_UCHAR ", file=%s", 1586 ", api-fix=%hhu, machine=%hhu, file=%s",
1593 mode, detail, detail_name, 1587 mode, detail, detail_name,
1594 group ? group : "", 1588 group ? group : "",
1595 part ? part : "", 1589 part ? part : "",
diff --git a/libraries/edje/src/bin/edje_player.c b/libraries/edje/src/bin/edje_player.c
index 4d0c0a3..208fbb4 100644
--- a/libraries/edje/src/bin/edje_player.c
+++ b/libraries/edje/src/bin/edje_player.c
@@ -20,12 +20,6 @@
20#include <Ecore_Evas.h> 20#include <Ecore_Evas.h>
21#include <Edje.h> 21#include <Edje.h>
22 22
23#ifdef _WIN32
24# define FMT_UCHAR "%c"
25#else
26# define FMT_UCHAR "%hhu"
27#endif
28
29struct opts { 23struct opts {
30 char *file; 24 char *file;
31 char *group; 25 char *group;
@@ -554,7 +548,7 @@ static unsigned char _parse_color(__UNUSED__ const Ecore_Getopt *parser, __UNUSE
554{ 548{
555 unsigned char *color = (unsigned char *)storage->ptrp; 549 unsigned char *color = (unsigned char *)storage->ptrp;
556 550
557 if (sscanf(str, FMT_UCHAR "," FMT_UCHAR "," FMT_UCHAR, color, color + 1, color + 2) != 3) 551 if (sscanf(str, "%hhu,%hhu,%hhu", color, color + 1, color + 2) != 3)
558 { 552 {
559 fprintf(stderr, "ERROR: incorrect color value '%s'\n", str); 553 fprintf(stderr, "ERROR: incorrect color value '%s'\n", str);
560 return 0; 554 return 0;
diff --git a/libraries/edje/src/bin/epp/Makefile.in b/libraries/edje/src/bin/epp/Makefile.in
index c1a8ee5..2ef2e56 100644
--- a/libraries/edje/src/bin/epp/Makefile.in
+++ b/libraries/edje/src/bin/epp/Makefile.in
@@ -225,6 +225,8 @@ PACKAGE_URL = @PACKAGE_URL@
225PACKAGE_VERSION = @PACKAGE_VERSION@ 225PACKAGE_VERSION = @PACKAGE_VERSION@
226PATH_SEPARATOR = @PATH_SEPARATOR@ 226PATH_SEPARATOR = @PATH_SEPARATOR@
227PKG_CONFIG = @PKG_CONFIG@ 227PKG_CONFIG = @PKG_CONFIG@
228PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
229PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
228PYTHON = @PYTHON@ 230PYTHON = @PYTHON@
229PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 231PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
230PYTHON_PLATFORM = @PYTHON_PLATFORM@ 232PYTHON_PLATFORM = @PYTHON_PLATFORM@
diff --git a/libraries/edje/src/examples/Makefile.am b/libraries/edje/src/examples/Makefile.am
index 579f148..e3893cd 100644
--- a/libraries/edje/src/examples/Makefile.am
+++ b/libraries/edje/src/examples/Makefile.am
@@ -1,5 +1,10 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3EDJE_CC = @edje_cc@
4EDJE_CC_FLAGS_VERBOSE_0 =
5EDJE_CC_FLAGS_VERBOSE_1 = -v
6EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_$(V)) -id $(srcdir) -fd $(srcdir)
7
3examplesdir = $(datadir)/$(PACKAGE)/examples 8examplesdir = $(datadir)/$(PACKAGE)/examples
4 9
5if ENABLE_MULTISENSE 10if ENABLE_MULTISENSE
@@ -24,7 +29,8 @@ EDCS = \
24 $(MULTISENSE_EDC_FILE) 29 $(MULTISENSE_EDC_FILE)
25 30
26.edc.edj: 31.edc.edj:
27 $(edje_cc) -v -fd $(srcdir) -id $(srcdir) $(SND_DIR) $< $(builddir)/$(@F) 32 $(EDJE_CC) $(EDJE_CC_FLAGS) $(SND_DIR) $< $(builddir)/$(@F)
33
28 34
29EDJS = $(EDCS:%.edc=%.edj) 35EDJS = $(EDCS:%.edc=%.edj)
30 36
@@ -53,31 +59,33 @@ EXTRA_DIST = $(files_DATA)
53if BUILD_EXAMPLES 59if BUILD_EXAMPLES
54 60
55AM_CPPFLAGS = \ 61AM_CPPFLAGS = \
56 -I. \ 62-I. \
57 -I$(top_srcdir)/src/lib \ 63-I$(top_srcdir)/src/lib \
58 -I$(top_srcdir)/src/lib/include \ 64-I$(top_srcdir)/src/lib/include \
59 -DPACKAGE_BIN_DIR=\"$(bindir)\" \ 65-DPACKAGE_BIN_DIR=\"$(bindir)\" \
60 -DPACKAGE_LIB_DIR=\"$(libdir)\" \ 66-DPACKAGE_LIB_DIR=\"$(libdir)\" \
61 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 67-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
62 -DPACKAGE_EXAMPLES_DIR=\"$(datadir)/$(PACKAGE)/examples\" \ 68@EDJE_CFLAGS@
63 @EDJE_CFLAGS@
64 69
65files_DATA += $(EDJS) 70files_DATA += $(EDJS)
66 71
67examples_PROGRAMS = \ 72examples_PROGRAMS = \
73 edje-animations \
68 edje-basic \ 74 edje-basic \
69 edje-swallow \
70 edje-text \
71 edje-table \
72 edje-box \ 75 edje-box \
73 edje-box2 \ 76 edje-box2 \
74 edje-drag\
75 edje-signals-messages \
76 edje-color-class \ 77 edje-color-class \
78 edje-drag\
77 edje-perspective \ 79 edje-perspective \
78 edje-animations \ 80 edje-signals-messages \
81 edje-swallow \
82 edje-table \
83 edje-text \
79 sigtest 84 sigtest
80 85
81LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_LIBS@ 86LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_LIBS@
82 87
83endif 88endif
89
90clean-local:
91 rm -f *.edj
diff --git a/libraries/edje/src/examples/Makefile.in b/libraries/edje/src/examples/Makefile.in
index 7f867e0..de47940 100644
--- a/libraries/edje/src/examples/Makefile.in
+++ b/libraries/edje/src/examples/Makefile.in
@@ -36,14 +36,15 @@ POST_UNINSTALL = :
36build_triplet = @build@ 36build_triplet = @build@
37host_triplet = @host@ 37host_triplet = @host@
38@BUILD_EXAMPLES_TRUE@am__append_1 = $(EDJS) 38@BUILD_EXAMPLES_TRUE@am__append_1 = $(EDJS)
39@BUILD_EXAMPLES_TRUE@examples_PROGRAMS = edje-basic$(EXEEXT) \ 39@BUILD_EXAMPLES_TRUE@examples_PROGRAMS = edje-animations$(EXEEXT) \
40@BUILD_EXAMPLES_TRUE@ edje-swallow$(EXEEXT) edje-text$(EXEEXT) \ 40@BUILD_EXAMPLES_TRUE@ edje-basic$(EXEEXT) edje-box$(EXEEXT) \
41@BUILD_EXAMPLES_TRUE@ edje-table$(EXEEXT) edje-box$(EXEEXT) \ 41@BUILD_EXAMPLES_TRUE@ edje-box2$(EXEEXT) \
42@BUILD_EXAMPLES_TRUE@ edje-box2$(EXEEXT) edje-drag$(EXEEXT) \
43@BUILD_EXAMPLES_TRUE@ edje-signals-messages$(EXEEXT) \
44@BUILD_EXAMPLES_TRUE@ edje-color-class$(EXEEXT) \ 42@BUILD_EXAMPLES_TRUE@ edje-color-class$(EXEEXT) \
43@BUILD_EXAMPLES_TRUE@ edje-drag$(EXEEXT) \
45@BUILD_EXAMPLES_TRUE@ edje-perspective$(EXEEXT) \ 44@BUILD_EXAMPLES_TRUE@ edje-perspective$(EXEEXT) \
46@BUILD_EXAMPLES_TRUE@ edje-animations$(EXEEXT) sigtest$(EXEEXT) 45@BUILD_EXAMPLES_TRUE@ edje-signals-messages$(EXEEXT) \
46@BUILD_EXAMPLES_TRUE@ edje-swallow$(EXEEXT) edje-table$(EXEEXT) \
47@BUILD_EXAMPLES_TRUE@ edje-text$(EXEEXT) sigtest$(EXEEXT)
47subdir = src/examples 48subdir = src/examples
48DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 49DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
49ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 50ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -279,6 +280,8 @@ PACKAGE_URL = @PACKAGE_URL@
279PACKAGE_VERSION = @PACKAGE_VERSION@ 280PACKAGE_VERSION = @PACKAGE_VERSION@
280PATH_SEPARATOR = @PATH_SEPARATOR@ 281PATH_SEPARATOR = @PATH_SEPARATOR@
281PKG_CONFIG = @PKG_CONFIG@ 282PKG_CONFIG = @PKG_CONFIG@
283PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
284PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
282PYTHON = @PYTHON@ 285PYTHON = @PYTHON@
283PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 286PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
284PYTHON_PLATFORM = @PYTHON_PLATFORM@ 287PYTHON_PLATFORM = @PYTHON_PLATFORM@
@@ -366,6 +369,10 @@ top_srcdir = @top_srcdir@
366version_info = @version_info@ 369version_info = @version_info@
367vimdir = @vimdir@ 370vimdir = @vimdir@
368MAINTAINERCLEANFILES = Makefile.in 371MAINTAINERCLEANFILES = Makefile.in
372EDJE_CC = @edje_cc@
373EDJE_CC_FLAGS_VERBOSE_0 =
374EDJE_CC_FLAGS_VERBOSE_1 = -v
375EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_$(V)) -id $(srcdir) -fd $(srcdir)
369examplesdir = $(datadir)/$(PACKAGE)/examples 376examplesdir = $(datadir)/$(PACKAGE)/examples
370@ENABLE_MULTISENSE_TRUE@MULTISENSE_EDC_FILE = multisense.edc 377@ENABLE_MULTISENSE_TRUE@MULTISENSE_EDC_FILE = multisense.edc
371@ENABLE_MULTISENSE_TRUE@SND_DIR = -sd $(srcdir) 378@ENABLE_MULTISENSE_TRUE@SND_DIR = -sd $(srcdir)
@@ -394,14 +401,13 @@ files_DATA = $(EDCS) bubble.png red.png test.png Vera.ttf edje-basic.c \
394 edje-perspective.c edje-animations.c sigtest.c $(am__append_1) 401 edje-perspective.c edje-animations.c sigtest.c $(am__append_1)
395EXTRA_DIST = $(files_DATA) 402EXTRA_DIST = $(files_DATA)
396@BUILD_EXAMPLES_TRUE@AM_CPPFLAGS = \ 403@BUILD_EXAMPLES_TRUE@AM_CPPFLAGS = \
397@BUILD_EXAMPLES_TRUE@ -I. \ 404@BUILD_EXAMPLES_TRUE@-I. \
398@BUILD_EXAMPLES_TRUE@ -I$(top_srcdir)/src/lib \ 405@BUILD_EXAMPLES_TRUE@-I$(top_srcdir)/src/lib \
399@BUILD_EXAMPLES_TRUE@ -I$(top_srcdir)/src/lib/include \ 406@BUILD_EXAMPLES_TRUE@-I$(top_srcdir)/src/lib/include \
400@BUILD_EXAMPLES_TRUE@ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ 407@BUILD_EXAMPLES_TRUE@-DPACKAGE_BIN_DIR=\"$(bindir)\" \
401@BUILD_EXAMPLES_TRUE@ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ 408@BUILD_EXAMPLES_TRUE@-DPACKAGE_LIB_DIR=\"$(libdir)\" \
402@BUILD_EXAMPLES_TRUE@ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 409@BUILD_EXAMPLES_TRUE@-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
403@BUILD_EXAMPLES_TRUE@ -DPACKAGE_EXAMPLES_DIR=\"$(datadir)/$(PACKAGE)/examples\" \ 410@BUILD_EXAMPLES_TRUE@@EDJE_CFLAGS@
404@BUILD_EXAMPLES_TRUE@ @EDJE_CFLAGS@
405 411
406@BUILD_EXAMPLES_TRUE@LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_LIBS@ 412@BUILD_EXAMPLES_TRUE@LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_LIBS@
407all: all-am 413all: all-am
@@ -705,7 +711,7 @@ maintainer-clean-generic:
705clean: clean-am 711clean: clean-am
706 712
707clean-am: clean-examplesPROGRAMS clean-generic clean-libtool \ 713clean-am: clean-examplesPROGRAMS clean-generic clean-libtool \
708 mostlyclean-am 714 clean-local mostlyclean-am
709 715
710distclean: distclean-am 716distclean: distclean-am
711 -rm -rf ./$(DEPDIR) 717 -rm -rf ./$(DEPDIR)
@@ -776,8 +782,8 @@ uninstall-am: uninstall-examplesPROGRAMS uninstall-filesDATA
776.MAKE: install-am install-strip 782.MAKE: install-am install-strip
777 783
778.PHONY: CTAGS GTAGS all all-am check check-am clean \ 784.PHONY: CTAGS GTAGS all all-am check check-am clean \
779 clean-examplesPROGRAMS clean-generic clean-libtool ctags \ 785 clean-examplesPROGRAMS clean-generic clean-libtool clean-local \
780 distclean distclean-compile distclean-generic \ 786 ctags distclean distclean-compile distclean-generic \
781 distclean-libtool distclean-tags distdir dvi dvi-am html \ 787 distclean-libtool distclean-tags distdir dvi dvi-am html \
782 html-am info info-am install install-am install-data \ 788 html-am info info-am install install-am install-data \
783 install-data-am install-dvi install-dvi-am \ 789 install-data-am install-dvi install-dvi-am \
@@ -793,7 +799,10 @@ uninstall-am: uninstall-examplesPROGRAMS uninstall-filesDATA
793 799
794 800
795.edc.edj: 801.edc.edj:
796 $(edje_cc) -v -fd $(srcdir) -id $(srcdir) $(SND_DIR) $< $(builddir)/$(@F) 802 $(EDJE_CC) $(EDJE_CC_FLAGS) $(SND_DIR) $< $(builddir)/$(@F)
803
804clean-local:
805 rm -f *.edj
797 806
798# Tell versions [3.59,3.63) of GNU make to not export all variables. 807# Tell versions [3.59,3.63) of GNU make to not export all variables.
799# Otherwise a system limit (for SysV at least) may be exceeded. 808# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/libraries/edje/src/examples/edje-animations.c b/libraries/edje/src/examples/edje-animations.c
index 9363471..15f2ee0 100644
--- a/libraries/edje/src/examples/edje-animations.c
+++ b/libraries/edje/src/examples/edje-animations.c
@@ -10,10 +10,9 @@
10 */ 10 */
11 11
12#ifdef HAVE_CONFIG_H 12#ifdef HAVE_CONFIG_H
13#include "config.h" 13# include "config.h"
14#else 14#else
15#define PACKAGE_EXAMPLES_DIR "." 15# define __UNUSED__
16#define __UNUSED__
17#endif 16#endif
18 17
19#include <Ecore.h> 18#include <Ecore.h>
@@ -23,34 +22,59 @@
23#define WIDTH (400) 22#define WIDTH (400)
24#define HEIGHT (300) 23#define HEIGHT (300)
25 24
26static const char *edje_file_path = PACKAGE_EXAMPLES_DIR "/animations.edj"; 25static const char commands[] = \
27static Ecore_Evas *ee; 26 "commands are:\n"
28static Evas_Object *bg, *edje_obj; 27 "\t+ - increase frametime\n"
29static double frametime = 1.0/30.0; /* default value */ 28 "\t- - decrease frametime\n"
29 "\t= - status of the animation\n"
30 "\ts - pause\n"
31 "\tp - play\n"
32 "\tf - freeze one object\n"
33 "\tF - freeze all objects\n"
34 "\tt - thaw one object\n"
35 "\tT - thaw all objects\n"
36 "\ta - start animation of one object\n"
37 "\tA - stop animation of one object\n"
38 "\tEsc - exit\n"
39 "\th - print help\n";
40
41static double frametime = 1.0 / 30.0; /* default value */
30 42
31static void 43static void
32_on_delete_cb(Ecore_Evas *ee) 44_on_delete_cb(Ecore_Evas *ee __UNUSED__)
33{ 45{
34 ecore_main_loop_quit(); 46 ecore_main_loop_quit();
35} 47}
36 48
37static void 49static void
38_canvas_resize_cb(Ecore_Evas *ee) 50_on_canvas_resize(Ecore_Evas *ee)
39{ 51{
40 int w, h; 52 Evas_Object *bg;
41 53 Evas_Object *edje_obj;
42 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 54 int w;
43 evas_object_resize(bg, w, h); 55 int h;
44 evas_object_resize(edje_obj, w, h); 56
57 bg = ecore_evas_data_get(ee, "background");
58 edje_obj = ecore_evas_data_get(ee, "edje_obj");
59 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
60 evas_object_resize(bg, w, h);
61 evas_object_resize(edje_obj, w, h);
45} 62}
46 63
47static void 64static void
48_on_key_down_cb(void *data, Evas *evas, Evas_Object *obj, void *event_info) 65_on_key_down(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj, void *event_info)
49{ 66{
50 Evas_Event_Key_Down *ev = event_info; 67 Evas_Event_Key_Down *ev;
51 double ft; 68 double ft;
69
70 ev = (Evas_Event_Key_Down *)event_info;
52 71
53 if (!strcmp(ev->key, "plus")) 72 if (!strcmp(ev->keyname, "h"))
73 {
74 fprintf(stdout, commands);
75 return;
76 }
77 else if (!strcmp(ev->key, "plus"))
54 { 78 {
55 frametime *= 2.0; 79 frametime *= 2.0;
56 fprintf(stdout, "Increasing frametime to: %f\n", frametime); 80 fprintf(stdout, "Increasing frametime to: %f\n", frametime);
@@ -109,24 +133,52 @@ _on_key_down_cb(void *data, Evas *evas, Evas_Object *obj, void *event_info)
109 edje_object_animation_set(obj, EINA_FALSE); 133 edje_object_animation_set(obj, EINA_FALSE);
110 fprintf(stdout, "Stopping the animation in the Edje object\n"); 134 fprintf(stdout, "Stopping the animation in the Edje object\n");
111 } 135 }
136 else if (!strcmp(ev->keyname, "Escape"))
137 ecore_main_loop_quit();
138 else
139 {
140 printf("unhandled key: %s\n", ev->keyname);
141 fprintf(stdout, commands);
142 }
112} 143}
113 144
114int 145int
115main(int argc, char *argv[]) 146main(int argc __UNUSED__, char *argv[])
116{ 147{
117 Evas *evas; 148 char edje_file_path[PATH_MAX];
118 149 const char *edje_file = "animations.edj";
119 ecore_evas_init(); 150 Ecore_Evas *ee;
120 edje_init(); 151 Evas *evas;
152 Evas_Object *bg;
153 Evas_Object *edje_obj;
154 Eina_Prefix *pfx;
155
156 if (!ecore_evas_init())
157 return EXIT_FAILURE;
158
159 if (!edje_init())
160 goto shutdown_ecore_evas;
161
162 pfx = eina_prefix_new(argv[0], main,
163 "EDJE_EXAMPLES",
164 "edje/examples",
165 edje_file,
166 PACKAGE_BIN_DIR,
167 PACKAGE_LIB_DIR,
168 PACKAGE_DATA_DIR,
169 PACKAGE_DATA_DIR);
170 if (!pfx)
171 goto shutdown_edje;
121 172
122 /* this will give you a window with an Evas canvas under the first 173 /* this will give you a window with an Evas canvas under the first
123 * engine available */ 174 * engine available */
124 ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); 175 ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
176 if (!ee)
177 goto free_prefix;
125 178
126 ecore_evas_callback_delete_request_set(ee, _on_delete_cb); 179 ecore_evas_callback_delete_request_set(ee, _on_delete_cb);
127 ecore_evas_callback_resize_set(ee, _canvas_resize_cb); 180 ecore_evas_callback_resize_set(ee, _on_canvas_resize);
128 ecore_evas_title_set(ee, "Edje Animations Example"); 181 ecore_evas_title_set(ee, "Edje Animations Example");
129 ecore_evas_show(ee);
130 182
131 evas = ecore_evas_get(ee); 183 evas = ecore_evas_get(ee);
132 184
@@ -135,22 +187,41 @@ main(int argc, char *argv[])
135 evas_object_move(bg, 0, 0); /* at canvas' origin */ 187 evas_object_move(bg, 0, 0); /* at canvas' origin */
136 evas_object_resize(bg, WIDTH, HEIGHT); /* covers full canvas */ 188 evas_object_resize(bg, WIDTH, HEIGHT); /* covers full canvas */
137 evas_object_show(bg); 189 evas_object_show(bg);
190 ecore_evas_data_set(ee, "background", bg);
138 191
139 edje_obj = edje_object_add(evas); 192 edje_obj = edje_object_add(evas);
140 193
194 snprintf(edje_file_path, sizeof(edje_file_path),
195 "%s/examples/%s", eina_prefix_data_get(pfx), edje_file);
141 edje_object_file_set(edje_obj, edje_file_path, "animations_group"); 196 edje_object_file_set(edje_obj, edje_file_path, "animations_group");
142 evas_object_move(edje_obj, 0, 0); 197 evas_object_move(edje_obj, 0, 0);
143 evas_object_resize(edje_obj, WIDTH, HEIGHT); 198 evas_object_resize(edje_obj, WIDTH, HEIGHT);
144 evas_object_show(edje_obj); 199 evas_object_show(edje_obj);
200 ecore_evas_data_set(ee, "edje_obj", edje_obj);
145 201
146 evas_object_event_callback_add(edje_obj, EVAS_CALLBACK_KEY_DOWN, 202 evas_object_event_callback_add(edje_obj, EVAS_CALLBACK_KEY_DOWN,
147 _on_key_down_cb, NULL); 203 _on_key_down, NULL);
148 evas_object_focus_set(edje_obj, EINA_TRUE); 204 evas_object_focus_set(edje_obj, EINA_TRUE);
149 205
206 fprintf(stdout, commands);
207
208 ecore_evas_show(ee);
209
150 ecore_main_loop_begin(); 210 ecore_main_loop_begin();
151 211
212 eina_prefix_free(pfx);
152 ecore_evas_free(ee); 213 ecore_evas_free(ee);
153 ecore_evas_shutdown(); 214 ecore_evas_shutdown();
154 edje_shutdown(); 215 edje_shutdown();
155 return 0; 216
217 return EXIT_SUCCESS;
218
219 free_prefix:
220 eina_prefix_free(pfx);
221 shutdown_edje:
222 edje_shutdown();
223 shutdown_ecore_evas:
224 ecore_evas_shutdown();
225
226 return EXIT_FAILURE;
156} 227}
diff --git a/libraries/edje/src/examples/edje-basic.c b/libraries/edje/src/examples/edje-basic.c
index 2a7a862..8a85312 100644
--- a/libraries/edje/src/examples/edje-basic.c
+++ b/libraries/edje/src/examples/edje-basic.c
@@ -11,47 +11,46 @@
11 */ 11 */
12 12
13#ifdef HAVE_CONFIG_H 13#ifdef HAVE_CONFIG_H
14#include "config.h" 14# include "config.h"
15#else 15#else
16#define PACKAGE_EXAMPLES_DIR "." 16# define __UNUSED__
17#define __UNUSED__
18#endif 17#endif
19 18
19#include <stdio.h>
20
21#include <Eina.h>
20#include <Ecore.h> 22#include <Ecore.h>
21#include <Ecore_Evas.h> 23#include <Ecore_Evas.h>
22#include <Edje.h> 24#include <Edje.h>
23#include <stdio.h>
24 25
25#define WIDTH (300) 26#define WIDTH (300)
26#define HEIGHT (300) 27#define HEIGHT (300)
27 28
28static const char *border_img_path = PACKAGE_EXAMPLES_DIR "/red.png";
29static const char *edje_file_path = PACKAGE_EXAMPLES_DIR "/basic.edj";
30
31static Ecore_Evas *ee;
32static Evas_Object *edje_obj;
33
34static const char commands[] = \ 29static const char commands[] = \
35 "commands are:\n" 30 "commands are:\n"
36 "\ts - change Edje's global scaling factor\n" 31 "\ts - change Edje's global scaling factor\n"
37 "\tr - change center rectangle's scaling factor\n" 32 "\tr - change center rectangle's scaling factor\n"
33 "\tEsc - exit\n"
38 "\th - print help\n"; 34 "\th - print help\n";
39 35
40static void 36static void
41_on_keydown(void *data __UNUSED__, 37_on_keydown(void *data,
42 Evas *evas __UNUSED__, 38 Evas *evas __UNUSED__,
43 Evas_Object *o __UNUSED__, 39 Evas_Object *o __UNUSED__,
44 void *einfo) 40 void *einfo)
45{ 41{
46 Evas_Event_Key_Down *ev = einfo; 42 Evas_Event_Key_Down *ev;
43 Evas_Object *edje_obj;
44
45 ev = (Evas_Event_Key_Down *)einfo;
46 edje_obj = (Evas_Object *)data;
47 47
48 if (strcmp(ev->keyname, "h") == 0) /* print help */ 48 if (strcmp(ev->keyname, "h") == 0) /* print help */
49 { 49 {
50 fprintf(stdout, commands); 50 fprintf(stdout, commands);
51 return; 51 return;
52 } 52 }
53 53 else if (strcmp(ev->keyname, "s") == 0) /* global scaling factor */
54 if (strcmp(ev->keyname, "s") == 0) /* global scaling factor */
55 { 54 {
56 double scale = edje_scale_get(); 55 double scale = edje_scale_get();
57 56
@@ -66,8 +65,7 @@ _on_keydown(void *data __UNUSED__,
66 65
67 return; 66 return;
68 } 67 }
69 68 else if (strcmp(ev->keyname, "r") == 0) /* individual scaling factor */
70 if (strcmp(ev->keyname, "r") == 0) /* individual scaling factor */
71 { 69 {
72 double scale = edje_object_scale_get(edje_obj); 70 double scale = edje_object_scale_get(edje_obj);
73 71
@@ -84,6 +82,13 @@ _on_keydown(void *data __UNUSED__,
84 82
85 return; 83 return;
86 } 84 }
85 else if (!strcmp(ev->keyname, "Escape"))
86 ecore_main_loop_quit();
87 else
88 {
89 printf("unhandled key: %s\n", ev->keyname);
90 fprintf(stdout, commands);
91 }
87} 92}
88 93
89static void 94static void
@@ -93,27 +98,47 @@ _on_delete(Ecore_Evas *ee __UNUSED__)
93} 98}
94 99
95int 100int
96main(void) 101main(int argc __UNUSED__, char *argv[])
97{ 102{
98 Evas_Object *border, *bg; 103 char border_img_path[PATH_MAX];
99 int x, y, w, h; 104 char edje_file_path[PATH_MAX];
100 Evas *evas; 105 const char *edje_file = "basic.edj";
106 Ecore_Evas *ee;
107 Evas *evas;
108 Evas_Object *bg;
109 Evas_Object *border;
110 Evas_Object *edje_obj;
111 Eina_Prefix *pfx;
112 int x;
113 int y;
114 int w;
115 int h;
101 116
102 if (!ecore_evas_init()) 117 if (!ecore_evas_init())
103 return EXIT_FAILURE; 118 return EXIT_FAILURE;
104 119
105 if (!edje_init()) 120 if (!edje_init())
106 return EXIT_FAILURE; 121 goto shutdown_ecore_evas;
122
123 pfx = eina_prefix_new(argv[0], main,
124 "EDJE_EXAMPLES",
125 "edje/examples",
126 edje_file,
127 PACKAGE_BIN_DIR,
128 PACKAGE_LIB_DIR,
129 PACKAGE_DATA_DIR,
130 PACKAGE_DATA_DIR);
131 if (!pfx)
132 goto shutdown_edje;
107 133
108 /* this will give you a window with an Evas canvas under the first 134 /* this will give you a window with an Evas canvas under the first
109 * engine available */ 135 * engine available */
110 ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); 136 ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
111 if (!ee) 137 if (!ee)
112 goto error; 138 goto free_prefix;
113 139
114 ecore_evas_callback_delete_request_set(ee, _on_delete); 140 ecore_evas_callback_delete_request_set(ee, _on_delete);
115 ecore_evas_title_set(ee, "Edje Basics Example"); 141 ecore_evas_title_set(ee, "Edje Basics Example");
116 ecore_evas_show(ee);
117 142
118 evas = ecore_evas_get(ee); 143 evas = ecore_evas_get(ee);
119 144
@@ -125,11 +150,12 @@ main(void)
125 ecore_evas_object_associate(ee, bg, ECORE_EVAS_OBJECT_ASSOCIATE_BASE); 150 ecore_evas_object_associate(ee, bg, ECORE_EVAS_OBJECT_ASSOCIATE_BASE);
126 151
127 evas_object_focus_set(bg, EINA_TRUE); 152 evas_object_focus_set(bg, EINA_TRUE);
128 evas_object_event_callback_add(
129 bg, EVAS_CALLBACK_KEY_DOWN, _on_keydown, NULL);
130 153
131 edje_obj = edje_object_add(evas); 154 edje_obj = edje_object_add(evas);
132 155
156 snprintf(edje_file_path, sizeof(edje_file_path),
157 "%s/examples/%s", eina_prefix_data_get(pfx), edje_file);
158 printf("%s\n", edje_file_path);
133 /* exercising Edje loading error, on purpose */ 159 /* exercising Edje loading error, on purpose */
134 if (!edje_object_file_set(edje_obj, edje_file_path, "unexistant_group")) 160 if (!edje_object_file_set(edje_obj, edje_file_path, "unexistant_group"))
135 { 161 {
@@ -147,7 +173,7 @@ main(void)
147 errmsg); 173 errmsg);
148 174
149 evas_object_del(edje_obj); 175 evas_object_del(edje_obj);
150 goto error_edj; 176 goto free_prefix;
151 } 177 }
152 178
153 fprintf(stdout, "Loaded Edje object bound to group 'example_group' from" 179 fprintf(stdout, "Loaded Edje object bound to group 'example_group' from"
@@ -157,6 +183,11 @@ main(void)
157 evas_object_resize(edje_obj, WIDTH - 40, HEIGHT - 40); 183 evas_object_resize(edje_obj, WIDTH - 40, HEIGHT - 40);
158 evas_object_show(edje_obj); 184 evas_object_show(edje_obj);
159 185
186 evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_keydown, edje_obj);
187
188 snprintf(border_img_path, sizeof(border_img_path),
189 "%s/edje/examples/red.png", eina_prefix_data_get(pfx));
190
160 /* this is a border around the Edje object above, here just to 191 /* this is a border around the Edje object above, here just to
161 * emphasize its geometry */ 192 * emphasize its geometry */
162 border = evas_object_image_filled_add(evas); 193 border = evas_object_image_filled_add(evas);
@@ -203,24 +234,24 @@ main(void)
203 "y = %d, w = %d, h = %d\n", x, y, w, h); 234 "y = %d, w = %d, h = %d\n", x, y, w, h);
204 235
205 fprintf(stdout, commands); 236 fprintf(stdout, commands);
237
238 ecore_evas_show(ee);
239
206 ecore_main_loop_begin(); 240 ecore_main_loop_begin();
207 241
242 eina_prefix_free(pfx);
208 ecore_evas_free(ee); 243 ecore_evas_free(ee);
209 ecore_evas_shutdown(); 244 ecore_evas_shutdown();
210 edje_shutdown(); 245 edje_shutdown();
211 return 0;
212 246
213error: 247 return EXIT_SUCCESS;
214 fprintf(stderr, "You got to have at least one evas engine built"
215 " and linked up to ecore-evas for this example to run"
216 " properly.\n");
217 ecore_evas_shutdown();
218 return -1;
219
220error_edj:
221 fprintf(stderr, "Failed to load basic.edj!\n");
222 248
249 free_prefix:
250 eina_prefix_free(pfx);
251 shutdown_edje:
252 edje_shutdown();
253 shutdown_ecore_evas:
223 ecore_evas_shutdown(); 254 ecore_evas_shutdown();
224 return -2;
225}
226 255
256 return EXIT_FAILURE;
257}
diff --git a/libraries/edje/src/examples/edje-box.c b/libraries/edje/src/examples/edje-box.c
index 7fffba3..2b0cbda 100644
--- a/libraries/edje/src/examples/edje-box.c
+++ b/libraries/edje/src/examples/edje-box.c
@@ -10,10 +10,9 @@
10 */ 10 */
11 11
12#ifdef HAVE_CONFIG_H 12#ifdef HAVE_CONFIG_H
13#include "config.h" 13# include "config.h"
14#else 14#else
15#define PACKAGE_EXAMPLES_DIR "." 15# define __UNUSED__
16#define __UNUSED__
17#endif 16#endif
18 17
19#include <Ecore.h> 18#include <Ecore.h>
@@ -28,13 +27,13 @@
28 27
29#define NRECTS 20 28#define NRECTS 20
30 29
31static const char *edje_file_path = PACKAGE_EXAMPLES_DIR "/box.edj"; 30static const char commands[] = \
32 31 "commands are:\n"
33struct _App { 32 "\ti - prepend rectangle\n"
34 Ecore_Evas *ee; 33 "\ta - append rectangle\n"
35 Evas_Object *edje; 34 "\tc - remove\n"
36 Evas_Object *bg; 35 "\tEsc - exit\n"
37}; 36 "\th - print help\n";
38 37
39static void 38static void
40_on_destroy(Ecore_Evas *ee __UNUSED__) 39_on_destroy(Ecore_Evas *ee __UNUSED__)
@@ -45,32 +44,41 @@ _on_destroy(Ecore_Evas *ee __UNUSED__)
45/* here just to keep our example's window size and background image's 44/* here just to keep our example's window size and background image's
46 * size in synchrony */ 45 * size in synchrony */
47static void 46static void
48_canvas_resize_cb(Ecore_Evas *ee) 47_on_canvas_resize(Ecore_Evas *ee)
49{ 48{
50 int w, h; 49 Evas_Object *bg;
51 struct _App *app = ecore_evas_data_get(ee, "app"); 50 Evas_Object *edje_obj;
51 int w;
52 int h;
52 53
54 bg = ecore_evas_data_get(ee, "background");
55 edje_obj = ecore_evas_data_get(ee, "edje_obj");
53 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 56 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
54 evas_object_resize(app->bg, w, h); 57 evas_object_resize(bg, w, h);
55 evas_object_resize(app->edje, w, h); 58 evas_object_resize(edje_obj, w, h);
56} 59}
57 60
58static void 61static void
59_rect_mouse_down(void *data, Evas *e, Evas_Object *o, void *event_info) 62_on_rect_mouse_down(void *data, Evas *e, Evas_Object *o, void *event_info)
60{ 63{
61 struct _App *app = data; 64 Ecore_Evas *ee;
62 Evas_Event_Mouse_Down *ev = event_info; 65 Evas_Event_Mouse_Down *ev;
66 Evas_Object *edje_obj;
67
68 ee = (Ecore_Evas *)data;
69 ev = (Evas_Event_Mouse_Down *)event_info;
70 edje_obj = ecore_evas_data_get(ee, "edje_obj");
63 71
64 if (ev->button == 1) 72 if (ev->button == 1)
65 { 73 {
66 printf("Removing rect %p under the mouse pointer.\n", o); 74 printf("Removing rect %p under the mouse pointer.\n", o);
67 edje_object_part_box_remove(app->edje, "example/box", o); 75 edje_object_part_box_remove(edje_obj, "example/box", o);
68 evas_object_del(o); 76 evas_object_del(o);
69 } 77 }
70 else if (ev->button == 3) 78 else if (ev->button == 3)
71 { 79 {
72 Evas_Object *rect; 80 Evas_Object *rect;
73 Eina_Bool r; 81 Eina_Bool r;
74 82
75 rect = evas_object_rectangle_add(e); 83 rect = evas_object_rectangle_add(e);
76 evas_object_color_set(rect, 0, 0, 255, 255); 84 evas_object_color_set(rect, 0, 0, 255, 255);
@@ -78,23 +86,32 @@ _rect_mouse_down(void *data, Evas *e, Evas_Object *o, void *event_info)
78 evas_object_show(rect); 86 evas_object_show(rect);
79 87
80 printf("Inserting rect %p before the rectangle under the mouse pointer.\n", rect); 88 printf("Inserting rect %p before the rectangle under the mouse pointer.\n", rect);
81 r = edje_object_part_box_insert_before(app->edje, "example/box", rect, o); 89 r = edje_object_part_box_insert_before(edje_obj, "example/box", rect, o);
82 if (!r) 90 if (!r)
83 printf("An error ocurred when appending rect %p to the box.\n", rect); 91 printf("An error ocurred when appending rect %p to the box.\n", rect);
84 92
85 evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _rect_mouse_down, app); 93 evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _on_rect_mouse_down, NULL);
86 } 94 }
87} 95}
88 96
89static void 97static void
90_bg_key_down(void *data, Evas *e, Evas_Object *o __UNUSED__, void *event_info) 98_on_bg_key_down(void *data, Evas *e, Evas_Object *o __UNUSED__, void *event_info)
91{ 99{
92 struct _App *app = data; 100 Ecore_Evas *ee;
93 Evas_Event_Key_Down *ev = event_info; 101 Evas_Event_Key_Down *ev;
94 Evas_Object *rect; 102 Evas_Object *edje_obj;
95 Eina_Bool r; 103 Evas_Object *rect;
104 Eina_Bool r;
96 105
106 ee = (Ecore_Evas *)data;
107 ev = (Evas_Event_Key_Down *)event_info;
108 edje_obj = ecore_evas_data_get(ee, "edje_obj");
97 109
110 if (!strcmp(ev->keyname, "h"))
111 {
112 fprintf(stdout, commands);
113 return;
114 }
98 if (!strcmp(ev->keyname, "i")) 115 if (!strcmp(ev->keyname, "i"))
99 { 116 {
100 rect = evas_object_rectangle_add(e); 117 rect = evas_object_rectangle_add(e);
@@ -103,11 +120,11 @@ _bg_key_down(void *data, Evas *e, Evas_Object *o __UNUSED__, void *event_info)
103 evas_object_show(rect); 120 evas_object_show(rect);
104 121
105 printf("Inserting rect %p before the rectangle under the mouse pointer.\n", rect); 122 printf("Inserting rect %p before the rectangle under the mouse pointer.\n", rect);
106 r = edje_object_part_box_insert_at(app->edje, "example/box", rect, 0); 123 r = edje_object_part_box_insert_at(edje_obj, "example/box", rect, 0);
107 if (!r) 124 if (!r)
108 printf("An error ocurred when appending rect %p to the box.\n", rect); 125 printf("An error ocurred when appending rect %p to the box.\n", rect);
109 126
110 evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _rect_mouse_down, app); 127 evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _on_rect_mouse_down, NULL);
111 } 128 }
112 else if (!strcmp(ev->keyname, "a")) 129 else if (!strcmp(ev->keyname, "a"))
113 { 130 {
@@ -117,53 +134,82 @@ _bg_key_down(void *data, Evas *e, Evas_Object *o __UNUSED__, void *event_info)
117 evas_object_show(rect); 134 evas_object_show(rect);
118 135
119 printf("Inserting rect %p before the rectangle under the mouse pointer.\n", rect); 136 printf("Inserting rect %p before the rectangle under the mouse pointer.\n", rect);
120 r = edje_object_part_box_append(app->edje, "example/box", rect); 137 r = edje_object_part_box_append(edje_obj, "example/box", rect);
121 if (!r) 138 if (!r)
122 printf("An error ocurred when appending rect %p to the box.\n", rect); 139 printf("An error ocurred when appending rect %p to the box.\n", rect);
123 140
124 evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _rect_mouse_down, app); 141 evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _on_rect_mouse_down, NULL);
125 } 142 }
126 else if (!strcmp(ev->keyname, "c")) 143 else if (!strcmp(ev->keyname, "c"))
127 edje_object_part_box_remove_all(app->edje, "example/box", EINA_TRUE); 144 edje_object_part_box_remove_all(edje_obj, "example/box", EINA_TRUE);
145 else if (!strcmp(ev->keyname, "Escape"))
146 ecore_main_loop_quit();
147 else
148 {
149 printf("unhandled key: %s\n", ev->keyname);
150 fprintf(stdout, commands);
151 }
128} 152}
129 153
130int 154int
131main(void) 155main(int argc __UNUSED__, char *argv[])
132{ 156{
133 Evas *evas; 157 char edje_file_path[PATH_MAX];
134 struct _App app; 158 const char *edje_file = "box.edj";
135 int i; 159 Ecore_Evas *ee;
136 160 Evas *evas;
137 ecore_evas_init(); 161 Evas_Object *bg;
138 edje_init(); 162 Evas_Object *edje_obj;
163 Eina_Prefix *pfx;
164 int i;
165
166 if (!ecore_evas_init())
167 return EXIT_FAILURE;
168
169 if (!edje_init())
170 goto shutdown_ecore_evas;
171
172 pfx = eina_prefix_new(argv[0], main,
173 "EDJE_EXAMPLES",
174 "edje/examples",
175 edje_file,
176 PACKAGE_BIN_DIR,
177 PACKAGE_LIB_DIR,
178 PACKAGE_DATA_DIR,
179 PACKAGE_DATA_DIR);
180 if (!pfx)
181 goto shutdown_edje;
139 182
140 /* this will give you a window with an Evas canvas under the first 183 /* this will give you a window with an Evas canvas under the first
141 * engine available */ 184 * engine available */
142 app.ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); 185 ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
143 186 if (!ee)
144 ecore_evas_callback_destroy_set(app.ee, _on_destroy); 187 goto free_prefix;
145 ecore_evas_callback_resize_set(app.ee, _canvas_resize_cb);
146 ecore_evas_title_set(app.ee, "Edje Box Example");
147 ecore_evas_show(app.ee);
148 188
149 ecore_evas_data_set(app.ee, "app", &app); 189 ecore_evas_callback_destroy_set(ee, _on_destroy);
190 ecore_evas_callback_resize_set(ee, _on_canvas_resize);
191 ecore_evas_title_set(ee, "Edje Box Example");
150 192
151 evas = ecore_evas_get(app.ee); 193 evas = ecore_evas_get(ee);
152 194
153 app.bg = evas_object_rectangle_add(evas); 195 bg = evas_object_rectangle_add(evas);
154 evas_object_color_set(app.bg, 255, 255, 255, 255); 196 evas_object_color_set(bg, 255, 255, 255, 255);
155 evas_object_resize(app.bg, WIDTH, HEIGHT); 197 evas_object_resize(bg, WIDTH, HEIGHT);
156 evas_object_focus_set(app.bg, EINA_TRUE); 198 evas_object_focus_set(bg, EINA_TRUE);
157 evas_object_show(app.bg); 199 evas_object_show(bg);
200 ecore_evas_data_set(ee, "background", bg);
158 201
159 evas_object_event_callback_add(app.bg, EVAS_CALLBACK_KEY_DOWN, _bg_key_down, &app); 202 evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_bg_key_down, ee);
160 203
161 app.edje = edje_object_add(evas); 204 edje_obj = edje_object_add(evas);
162 205
163 edje_object_file_set(app.edje, edje_file_path, "example/group"); 206 snprintf(edje_file_path, sizeof(edje_file_path),
164 evas_object_move(app.edje, 0, 0); 207 "%s/examples/%s", eina_prefix_data_get(pfx), edje_file);
165 evas_object_resize(app.edje, WIDTH, HEIGHT); 208 edje_object_file_set(edje_obj, edje_file_path, "example/group");
166 evas_object_show(app.edje); 209 evas_object_move(edje_obj, 0, 0);
210 evas_object_resize(edje_obj, WIDTH, HEIGHT);
211 evas_object_show(edje_obj);
212 ecore_evas_data_set(ee, "edje_obj", edje_obj);
167 213
168 for (i = 0; i < NRECTS; i++) 214 for (i = 0; i < NRECTS; i++)
169 { 215 {
@@ -173,19 +219,34 @@ main(void)
173 rect = evas_object_rectangle_add(evas); 219 rect = evas_object_rectangle_add(evas);
174 evas_object_color_set(rect, red, 0, 0, 255); 220 evas_object_color_set(rect, red, 0, 0, 255);
175 evas_object_resize(rect, RECTW, RECTH); 221 evas_object_resize(rect, RECTW, RECTH);
176 r = edje_object_part_box_append(app.edje, "example/box", rect); 222 r = edje_object_part_box_append(edje_obj, "example/box", rect);
177 if (!r) 223 if (!r)
178 printf("An error ocurred when appending rect #%d to the box.\n", i); 224 printf("An error ocurred when appending rect #%d to the box.\n", i);
179 evas_object_show(rect); 225 evas_object_show(rect);
180 226
181 evas_object_event_callback_add( 227 evas_object_event_callback_add(
182 rect, EVAS_CALLBACK_MOUSE_DOWN, _rect_mouse_down, &app); 228 rect, EVAS_CALLBACK_MOUSE_DOWN, _on_rect_mouse_down, ee);
183 } 229 }
184 230
231 fprintf(stdout, commands);
232
233 ecore_evas_show(ee);
234
185 ecore_main_loop_begin(); 235 ecore_main_loop_begin();
186 236
187 ecore_evas_free(app.ee); 237 eina_prefix_free(pfx);
238 ecore_evas_free(ee);
188 ecore_evas_shutdown(); 239 ecore_evas_shutdown();
189 edje_shutdown(); 240 edje_shutdown();
190 return 0; 241
242 return EXIT_SUCCESS;
243
244 free_prefix:
245 eina_prefix_free(pfx);
246 shutdown_edje:
247 edje_shutdown();
248 shutdown_ecore_evas:
249 ecore_evas_shutdown();
250
251 return EXIT_FAILURE;
191} 252}
diff --git a/libraries/edje/src/examples/edje-box2.c b/libraries/edje/src/examples/edje-box2.c
index b3f4e40..81f1a90 100644
--- a/libraries/edje/src/examples/edje-box2.c
+++ b/libraries/edje/src/examples/edje-box2.c
@@ -10,40 +10,35 @@
10 */ 10 */
11 11
12#ifdef HAVE_CONFIG_H 12#ifdef HAVE_CONFIG_H
13#include "config.h" 13# include "config.h"
14#else 14#else
15#define PACKAGE_EXAMPLES_DIR "." 15# define __UNUSED__
16#define __UNUSED__
17#endif 16#endif
18 17
19#include <Ecore.h>
20#include <Evas.h>
21#include <Ecore_Evas.h>
22#include <Edje.h>
23
24#include <stdlib.h> 18#include <stdlib.h>
25#include <stdio.h> 19#include <stdio.h>
26#include <string.h> 20#include <string.h>
27 21
28static const char *edje_file_path = PACKAGE_EXAMPLES_DIR "/box.edj"; 22#include <Ecore.h>
29 23#include <Evas.h>
30struct _App { 24#include <Ecore_Evas.h>
31 Ecore_Evas *ee; 25#include <Edje.h>
32 Evas *evas;
33 Evas_Object *bg;
34 Evas_Object *box;
35};
36 26
37static struct _App app; 27static const char commands[] = \
28 "commands are:\n"
29 "\tShift - remove box\n"
30 "\tCtrl - insert box\n"
31 "\tEsc - exit\n"
32 "\th - print help\n";
38 33
39static void 34static void
40custom_layout(Evas_Object *o, Evas_Object_Box_Data *p, void *data) 35custom_layout(Evas_Object *o, Evas_Object_Box_Data *p, void *data __UNUSED__)
41{ 36{
37 Evas_Object_Box_Option *opt;
38 Eina_List *l;
42 int x, y, w, h; 39 int x, y, w, h;
43 int xx, yy, ww, hh; 40 int xx, yy, ww, hh;
44 int count; 41 int count;
45 Eina_List *l;
46 Evas_Object_Box_Option *opt;
47 42
48 evas_object_geometry_get(o, &x, &y, &w, &h); 43 evas_object_geometry_get(o, &x, &y, &w, &h);
49 count = eina_list_count(p->children); 44 count = eina_list_count(p->children);
@@ -76,129 +71,177 @@ new_greenie_block(Evas *e)
76} 71}
77 72
78static void 73static void
79on_keydown(void *data, Evas *evas, Evas_Object *o, void *einfo) 74on_keydown(void *data, Evas *evas, Evas_Object *o __UNUSED__, void *einfo)
80{ 75{
81 struct _App *app = data; 76 Evas_Event_Key_Down *ev;
82 Evas_Event_Key_Down *ev = einfo; 77 Evas_Object *edje_obj;
83 const Evas_Modifier *mods; 78 const Evas_Modifier *mods;
84 79
80 ev = (Evas_Event_Key_Down *)einfo;
81 edje_obj = (Evas_Object *)data;
82
85 mods = evas_key_modifier_get(evas); 83 mods = evas_key_modifier_get(evas);
84 if (!strcmp(ev->keyname, "h"))
85 {
86 fprintf(stdout, commands);
87 return;
88 }
86 if (evas_key_modifier_is_set(mods, "Shift")) 89 if (evas_key_modifier_is_set(mods, "Shift"))
87 { 90 {
88 int pos; 91 int pos;
89 Evas_Object *obj = NULL; 92 Evas_Object *obj = NULL;
90 pos = atoi(ev->keyname); 93 pos = atoi(ev->keyname);
91 obj = edje_object_part_box_remove_at(app->box, "example/box", pos); 94 obj = edje_object_part_box_remove_at(edje_obj, "example/box", pos);
92 if (obj) 95 if (obj)
93 evas_object_del(obj); 96 evas_object_del(obj);
94 return; 97 return;
95 } 98 }
96 if (evas_key_modifier_is_set(mods, "Control")) 99 if (evas_key_modifier_is_set(mods, "Control"))
97 { 100 {
98 Evas_Object *o; 101 Evas_Object *obj;
99 int pos; 102 int pos;
100 pos = atoi(ev->keyname); 103 pos = atoi(ev->keyname);
101 o = new_greenie_block(app->evas); 104 obj = new_greenie_block(evas);
102 if (!edje_object_part_box_insert_at(app->box, "example/box", o, pos)) 105 if (!edje_object_part_box_insert_at(edje_obj, "example/box", obj, pos))
103 edje_object_part_box_append(app->box, "example/box", o); 106 edje_object_part_box_append(edje_obj, "example/box", obj);
104 return; 107 return;
105 } 108 }
106 if (strcmp(ev->keyname, "Escape") == 0) 109 if (!strcmp(ev->keyname, "Escape"))
107 ecore_main_loop_quit(); 110 ecore_main_loop_quit();
108} 111}
109 112
110static Evas_Object * 113static Evas_Object *
111box_new(Evas *evas, const char *name, int x, int y, int w, int h) 114box_new(Ecore_Evas *ee, const char *edje_file_path, const char *name, int x, int y, int w, int h)
112{ 115{
113 Evas_Object *o; 116 Evas_Object *edje_obj;
114 117
115 o = edje_object_add(evas); 118 edje_obj = edje_object_add(ecore_evas_get(ee));
116 evas_object_move(o, x, y); 119 evas_object_move(edje_obj, x, y);
117 evas_object_resize(o, w, h); 120 evas_object_resize(edje_obj, w, h);
118 if (!edje_object_file_set(o, edje_file_path, "example/group2")) 121 if (!edje_object_file_set(edje_obj, edje_file_path, "example/group2"))
119 { 122 {
120 printf("error: could not load file object.\n"); 123 printf("error: could not load file object.\n");
121 } 124 }
122 evas_object_show(o); 125 evas_object_show(edje_obj);
123 126 evas_object_name_set(edje_obj, name);
124 evas_object_name_set(o, name); 127 ecore_evas_data_set(ee, "edje_obj", edje_obj);
125 128
126 return o; 129 return edje_obj;
127} 130}
128 131
129static void 132static void
130on_resize(Ecore_Evas *ee) 133on_resize(Ecore_Evas *ee)
131{ 134{
132 int w, h; 135 Evas_Object *bg;
133 136 Evas_Object *edje_obj;
134 evas_output_viewport_get(app.evas, NULL, NULL, &w, &h); 137 int w;
135 evas_object_resize(app.bg, w, h); 138 int h;
136 evas_object_resize(app.box, w, h); 139
140 bg = ecore_evas_data_get(ee, "background");
141 edje_obj = ecore_evas_data_get(ee, "edje_obj");
142 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
143 evas_object_resize(bg, w, h);
144 evas_object_resize(edje_obj, w, h);
137} 145}
138 146
139static void 147static void
140on_destroy(Ecore_Evas *ee) 148on_destroy(Ecore_Evas *ee __UNUSED__)
141{ 149{
142 ecore_main_loop_quit(); 150 ecore_main_loop_quit();
143} 151}
144 152
145int 153int
146main(int argc, char *argv[]) 154main(int argc __UNUSED__, char *argv[])
147{ 155{
148 Ecore_Evas *ee; 156 char edje_file_path[PATH_MAX];
149 int w, h, i; 157 const char *edje_file = "box.edj";
158 Ecore_Evas *ee;
159 Evas *evas;
160 Evas_Object *bg;
161 Evas_Object *edje_obj;
150 Evas_Object *last; 162 Evas_Object *last;
151 Evas_Object *o; 163 Evas_Object *o;
152 164 Eina_Prefix *pfx;
153 evas_init(); 165 int w;
154 ecore_init(); 166 int h;
155 ecore_evas_init(); 167 int i;
156 edje_init(); 168
157 169 if (!ecore_evas_init())
170 return EXIT_FAILURE;
171
172 if (!edje_init())
173 goto shutdown_ecore_evas;
174
175 pfx = eina_prefix_new(argv[0], main,
176 "EDJE_EXAMPLES",
177 "edje/examples",
178 edje_file,
179 PACKAGE_BIN_DIR,
180 PACKAGE_LIB_DIR,
181 PACKAGE_DATA_DIR,
182 PACKAGE_DATA_DIR);
183 if (!pfx)
184 goto shutdown_edje;
185
186 /* this will give you a window with an Evas canvas under the first
187 * engine available */
158 ee = ecore_evas_new(NULL, 0, 0, 640, 480, NULL); 188 ee = ecore_evas_new(NULL, 0, 0, 640, 480, NULL);
159 ecore_evas_show(ee); 189 if (!ee)
160 190 goto free_prefix;
161 app.ee = ee;
162 app.evas = ecore_evas_get(ee);
163 191
164 ecore_evas_callback_resize_set(ee, on_resize); 192 ecore_evas_callback_resize_set(ee, on_resize);
165 ecore_evas_callback_destroy_set(ee, on_destroy); 193 ecore_evas_callback_destroy_set(ee, on_destroy);
194 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
166 195
167 evas_output_viewport_get(app.evas, NULL, NULL, &w, &h); 196 evas = ecore_evas_get(ee);
168 197
169 app.bg = evas_object_rectangle_add(app.evas); 198 bg = evas_object_rectangle_add(evas);
170 evas_object_resize(app.bg, w, h); 199 evas_object_resize(bg, w, h);
171 evas_object_show(app.bg); 200 evas_object_show(bg);
172 evas_object_focus_set(app.bg, 1); 201 evas_object_focus_set(bg, 1);
173 evas_object_event_callback_add( 202 ecore_evas_data_set(ee, "background", bg);
174 app.bg, EVAS_CALLBACK_KEY_DOWN, on_keydown, &app);
175 203
176 edje_box_layout_register("custom_layout", custom_layout, NULL, NULL, NULL, NULL); 204 edje_box_layout_register("custom_layout", custom_layout, NULL, NULL, NULL, NULL);
177 205
178 app.box = box_new(app.evas, "box", 0, 0, w, h); 206 snprintf(edje_file_path, sizeof(edje_file_path),
207 "%s/examples/%s", eina_prefix_data_get(pfx), edje_file);
208 edje_obj = box_new(ee, edje_file_path, "box", 0, 0, w, h);
209 evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, on_keydown, edje_obj);
179 210
180 for (i = 1; i <= 5; i++) 211 for (i = 1; i <= 5; i++)
181 { 212 {
182 o = last = evas_object_rectangle_add(app.evas); 213 o = last = evas_object_rectangle_add(evas);
183 evas_object_size_hint_min_set(o, 50, 50); 214 evas_object_size_hint_min_set(o, 50, 50);
184 evas_object_resize(o, 50, 50); 215 evas_object_resize(o, 50, 50);
185 evas_object_color_set(o, 255, 0, 0, 128); 216 evas_object_color_set(o, 255, 0, 0, 128);
186 evas_object_show(o); 217 evas_object_show(o);
187 218
188 if (!edje_object_part_box_append(app.box, "example/box", o)) 219 if (!edje_object_part_box_append(edje_obj, "example/box", o))
189 { 220 {
190 fprintf(stderr, "error appending child object!\n"); 221 fprintf(stderr, "error appending child object!\n");
191 return 1; 222 return 1;
192 } 223 }
193 } 224 }
194 225
226 fprintf(stdout, commands);
227
228 ecore_evas_show(ee);
229
195 ecore_main_loop_begin(); 230 ecore_main_loop_begin();
196 231
197 edje_shutdown(); 232 eina_prefix_free(pfx);
233 ecore_evas_free(ee);
198 ecore_evas_shutdown(); 234 ecore_evas_shutdown();
199 ecore_shutdown(); 235 edje_shutdown();
200 evas_shutdown(); 236
237 return EXIT_SUCCESS;
201 238
239 free_prefix:
240 eina_prefix_free(pfx);
241 shutdown_edje:
242 edje_shutdown();
243 shutdown_ecore_evas:
244 ecore_evas_shutdown();
202 245
203 return 0; 246 return EXIT_FAILURE;
204} 247}
diff --git a/libraries/edje/src/examples/edje-color-class.c b/libraries/edje/src/examples/edje-color-class.c
index 9ac8653..8d073d0 100644
--- a/libraries/edje/src/examples/edje-color-class.c
+++ b/libraries/edje/src/examples/edje-color-class.c
@@ -10,10 +10,9 @@
10 */ 10 */
11 11
12#ifdef HAVE_CONFIG_H 12#ifdef HAVE_CONFIG_H
13#include "config.h" 13# include "config.h"
14#else 14#else
15#define PACKAGE_EXAMPLES_DIR "." 15# define __UNUSED__
16#define __UNUSED__
17#endif 16#endif
18 17
19#include <Ecore.h> 18#include <Ecore.h>
@@ -23,13 +22,11 @@
23#define WIDTH (400) 22#define WIDTH (400)
24#define HEIGHT (400) 23#define HEIGHT (400)
25 24
26static const char *edje_file_path = PACKAGE_EXAMPLES_DIR "/color-class.edj";
27
28typedef int color[4]; /* rgba */ 25typedef int color[4]; /* rgba */
29 26
30static Ecore_Evas *ee, *ee2; 27static Ecore_Evas *ee1, *ee2;
31static Evas *evas, *evas2; 28static Evas *evas1, *evas2;
32static Evas_Object *bg, *edje_obj, *bg2, *edje_obj2; 29static Evas_Object *bg1, *edje_obj1, *bg2, *edje_obj2;
33static const char *selected_class; 30static const char *selected_class;
34 31
35static color colors_init_data[] = 32static color colors_init_data[] =
@@ -96,21 +93,23 @@ _color_classes_print(void)
96} 93}
97 94
98static void 95static void
99_on_destroy(Ecore_Evas *ee) 96_on_destroy(Ecore_Evas *ee __UNUSED__)
100{ 97{
101 ecore_main_loop_quit(); 98 ecore_main_loop_quit();
102} 99}
103 100
104static void 101static void
105_on_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info) 102_on_mouse_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info)
106{ 103{
107 Evas_Event_Mouse_Down *ev = event_info; 104 Evas_Event_Mouse_Down *ev = event_info;
108 105
109 if (ev->button == 1) 106 if (ev->button == 1)
110 if (obj == edje_obj) 107 {
111 edje_color_class_del(selected_class); 108 if (obj == edje_obj1)
112 else 109 edje_color_class_del(selected_class);
113 edje_object_color_class_del(edje_obj2, selected_class); 110 else
111 edje_object_color_class_del(edje_obj2, selected_class);
112 }
114} 113}
115 114
116/* here just to keep our example's window size 115/* here just to keep our example's window size
@@ -122,10 +121,10 @@ _canvas_resize_cb(Ecore_Evas *_ee)
122 121
123 ecore_evas_geometry_get(_ee, NULL, NULL, &w, &h); 122 ecore_evas_geometry_get(_ee, NULL, NULL, &w, &h);
124 123
125 if (_ee == ee) 124 if (_ee == ee1)
126 { 125 {
127 evas_object_resize(bg, w, h); 126 evas_object_resize(bg1, w, h);
128 evas_object_resize(edje_obj, w, h); 127 evas_object_resize(edje_obj1, w, h);
129 } 128 }
130 else 129 else
131 { 130 {
@@ -135,8 +134,8 @@ _canvas_resize_cb(Ecore_Evas *_ee)
135} 134}
136 135
137static void 136static void
138_color_class_callback_delete(void *data, Evas *evas, Evas_Object *obj, 137_color_class_callback_delete(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
139 const char *emission, void *source) 138 const char *emission, void *source __UNUSED__)
140{ 139{
141 if (!strcmp(data, "process")) 140 if (!strcmp(data, "process"))
142 fprintf(stdout, "Color class: %s deleted on process level\n", emission); 141 fprintf(stdout, "Color class: %s deleted on process level\n", emission);
@@ -144,32 +143,34 @@ _color_class_callback_delete(void *data, Evas *evas, Evas_Object *obj,
144 fprintf(stdout, "Color class: %s deleted on object level\n", emission); 143 fprintf(stdout, "Color class: %s deleted on object level\n", emission);
145} 144}
146 145
147static void 146static int
148_create_windows(void) 147_create_windows(const char *edje_file_path)
149{ 148{
150 /* this will give you a window with an Evas canvas under the first 149 /* this will give you a window with an Evas canvas under the first
151 * engine available */ 150 * engine available */
152 ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); 151 ee1 = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
152 if (!ee1)
153 return 0;
153 ee2 = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); 154 ee2 = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
155 if (!ee2)
156 return 0;
154 157
155 ecore_evas_callback_destroy_set(ee, _on_destroy); 158 ecore_evas_callback_destroy_set(ee1, _on_destroy);
156 ecore_evas_callback_resize_set(ee, _canvas_resize_cb); 159 ecore_evas_callback_resize_set(ee1, _canvas_resize_cb);
157 ecore_evas_title_set(ee, "Edje Color Class Example"); 160 ecore_evas_title_set(ee1, "Edje Color Class Example");
158 ecore_evas_show(ee);
159 161
160 ecore_evas_callback_destroy_set(ee2, _on_destroy); 162 ecore_evas_callback_destroy_set(ee2, _on_destroy);
161 ecore_evas_callback_resize_set(ee2, _canvas_resize_cb); 163 ecore_evas_callback_resize_set(ee2, _canvas_resize_cb);
162 ecore_evas_title_set(ee2, "Edje Object Color Class Example"); 164 ecore_evas_title_set(ee2, "Edje Object Color Class Example");
163 ecore_evas_show(ee2);
164 165
165 evas = ecore_evas_get(ee); 166 evas1 = ecore_evas_get(ee1);
166 evas2 = ecore_evas_get(ee2); 167 evas2 = ecore_evas_get(ee2);
167 168
168 bg = evas_object_rectangle_add(evas); 169 bg1 = evas_object_rectangle_add(evas1);
169 evas_object_color_set(bg, 255, 255, 255, 255); /* white bg */ 170 evas_object_color_set(bg1, 255, 255, 255, 255); /* white bg */
170 evas_object_move(bg, 0, 0); /* at canvas' origin */ 171 evas_object_move(bg1, 0, 0); /* at canvas' origin */
171 evas_object_resize(bg, WIDTH, HEIGHT); /* covers full canvas */ 172 evas_object_resize(bg1, WIDTH, HEIGHT); /* covers full canvas */
172 evas_object_show(bg); 173 evas_object_show(bg1);
173 174
174 bg2 = evas_object_rectangle_add(evas2); 175 bg2 = evas_object_rectangle_add(evas2);
175 evas_object_color_set(bg2, 255, 255, 255, 255); /* white bg */ 176 evas_object_color_set(bg2, 255, 255, 255, 255); /* white bg */
@@ -177,18 +178,18 @@ _create_windows(void)
177 evas_object_resize(bg2, WIDTH, HEIGHT); /* covers full canvas */ 178 evas_object_resize(bg2, WIDTH, HEIGHT); /* covers full canvas */
178 evas_object_show(bg2); 179 evas_object_show(bg2);
179 180
180 edje_obj = edje_object_add(evas); 181 edje_obj1 = edje_object_add(evas1);
181 evas_object_event_callback_add(edje_obj, EVAS_CALLBACK_MOUSE_DOWN, 182 evas_object_event_callback_add(edje_obj1, EVAS_CALLBACK_MOUSE_DOWN,
182 _on_mouse_down, NULL); 183 _on_mouse_down, NULL);
183 184
184 edje_object_file_set(edje_obj, edje_file_path, "example_color_class"); 185 edje_object_file_set(edje_obj1, edje_file_path, "example_color_class");
185 evas_object_move(edje_obj, 0, 0); /* at canvas' origin */ 186 evas_object_move(edje_obj1, 0, 0); /* at canvas' origin */
186 evas_object_resize(edje_obj, WIDTH, HEIGHT); 187 evas_object_resize(edje_obj1, WIDTH, HEIGHT);
187 edje_object_part_text_set(edje_obj, "part_four", "EDJE EXAMPLE"); 188 edje_object_part_text_set(edje_obj1, "part_four", "EDJE EXAMPLE");
188 edje_object_signal_callback_add(edje_obj, "color_class,del", "*", 189 edje_object_signal_callback_add(edje_obj1, "color_class,del", "*",
189 (Edje_Signal_Cb) _color_class_callback_delete, 190 (Edje_Signal_Cb) _color_class_callback_delete,
190 "process"); 191 "process");
191 evas_object_show(edje_obj); 192 evas_object_show(edje_obj1);
192 193
193 edje_obj2 = edje_object_add(evas2); 194 edje_obj2 = edje_object_add(evas2);
194 evas_object_event_callback_add(edje_obj2, EVAS_CALLBACK_MOUSE_DOWN, 195 evas_object_event_callback_add(edje_obj2, EVAS_CALLBACK_MOUSE_DOWN,
@@ -202,13 +203,18 @@ _create_windows(void)
202 (Edje_Signal_Cb) _color_class_callback_delete, 203 (Edje_Signal_Cb) _color_class_callback_delete,
203 "object"); 204 "object");
204 evas_object_show(edje_obj2); 205 evas_object_show(edje_obj2);
206
207 return 1;
205} 208}
206 209
207int 210int
208main(int argc, char *argv[]) 211main(int argc, char *argv[])
209{ 212{
210 color c1, c2, c3; 213 char edje_file_path[PATH_MAX];
211 int i; 214 const char *edje_file = "color-class.edj";
215 Eina_Prefix *pfx;
216 color c1, c2, c3;
217 int i;
212 218
213 if (argc != 5) 219 if (argc != 5)
214 { 220 {
@@ -218,7 +224,7 @@ main(int argc, char *argv[])
218 for (i = 0; i < 8; i++) 224 for (i = 0; i < 8; i++)
219 fprintf(stderr, "%s\n", color_names[i]); 225 fprintf(stderr, "%s\n", color_names[i]);
220 226
221 return 1; 227 return EXIT_FAILURE;
222 } 228 }
223 229
224 selected_class = argv[1]; 230 selected_class = argv[1];
@@ -227,13 +233,30 @@ main(int argc, char *argv[])
227 _get_color_from_name(argv[4], &c3))) 233 _get_color_from_name(argv[4], &c3)))
228 { 234 {
229 fprintf(stderr, "Color not available!\n"); 235 fprintf(stderr, "Color not available!\n");
230 return 2; 236 return EXIT_FAILURE;
231 } 237 }
232 238
233 ecore_evas_init(); 239 if (!ecore_evas_init())
234 edje_init(); 240 return EXIT_FAILURE;
241
242 if (!edje_init())
243 goto shutdown_ecore_evas;
244
245 pfx = eina_prefix_new(argv[0], main,
246 "EDJE_EXAMPLES",
247 "edje/examples",
248 edje_file,
249 PACKAGE_BIN_DIR,
250 PACKAGE_LIB_DIR,
251 PACKAGE_DATA_DIR,
252 PACKAGE_DATA_DIR);
253 if (!pfx)
254 goto shutdown_edje;
235 255
236 _create_windows(); 256 snprintf(edje_file_path, sizeof(edje_file_path),
257 "%s/examples/%s", eina_prefix_data_get(pfx), edje_file);
258 if (!_create_windows(edje_file_path))
259 goto free_prefix;
237 260
238 edje_color_class_set(argv[1], /* class name */ 261 edje_color_class_set(argv[1], /* class name */
239 c1[0], c1[1], c1[2], c1[3], /* Object color */ 262 c1[0], c1[1], c1[2], c1[3], /* Object color */
@@ -248,10 +271,25 @@ main(int argc, char *argv[])
248 39, 90, 187, 255); /* Text shadow */ 271 39, 90, 187, 255); /* Text shadow */
249 272
250 _color_classes_print(); 273 _color_classes_print();
274
275 ecore_evas_show(ee1);
276 ecore_evas_show(ee2);
277
251 ecore_main_loop_begin(); 278 ecore_main_loop_begin();
252 ecore_evas_free(ee); 279
253 ecore_evas_free(ee2); 280 eina_prefix_free(pfx);
281 ecore_evas_free(ee1);
254 ecore_evas_shutdown(); 282 ecore_evas_shutdown();
255 edje_shutdown(); 283 edje_shutdown();
256 return 0; 284
285 return EXIT_SUCCESS;
286
287 free_prefix:
288 eina_prefix_free(pfx);
289 shutdown_edje:
290 edje_shutdown();
291 shutdown_ecore_evas:
292 ecore_evas_shutdown();
293
294 return EXIT_FAILURE;
257} 295}
diff --git a/libraries/edje/src/examples/edje-drag.c b/libraries/edje/src/examples/edje-drag.c
index 78e2e72..bb61b68 100644
--- a/libraries/edje/src/examples/edje-drag.c
+++ b/libraries/edje/src/examples/edje-drag.c
@@ -10,10 +10,9 @@
10 */ 10 */
11 11
12#ifdef HAVE_CONFIG_H 12#ifdef HAVE_CONFIG_H
13#include "config.h" 13# include "config.h"
14#else 14#else
15#define PACKAGE_EXAMPLES_DIR "." 15# define __UNUSED__
16#define __UNUSED__
17#endif 16#endif
18 17
19#include <Ecore.h> 18#include <Ecore.h>
@@ -28,15 +27,17 @@
28 27
29#define NRECTS 20 28#define NRECTS 20
30 29
31static const char *PARTNAME = "example/knob"; 30static const char commands[] = \
32 31 "commands are:\n"
33static const char *edje_file_path = PACKAGE_EXAMPLES_DIR "/drag.edj"; 32 "\tDdown - set drag step to 1\n"
33 "\tUp - set drag step to -1\n"
34 "\tm - set drag value to 0.5\n"
35 "\tPrior - set drag page to -1\n"
36 "\tNext - set drag page to -1\n"
37 "\tEsc - exit\n"
38 "\th - print help\n";
34 39
35struct _App { 40static const char *PARTNAME = "example/knob";
36 Ecore_Evas *ee;
37 Evas_Object *edje;
38 Evas_Object *bg;
39};
40 41
41static void 42static void
42_on_destroy(Ecore_Evas *ee __UNUSED__) 43_on_destroy(Ecore_Evas *ee __UNUSED__)
@@ -47,111 +48,163 @@ _on_destroy(Ecore_Evas *ee __UNUSED__)
47/* here just to keep our example's window size and background image's 48/* here just to keep our example's window size and background image's
48 * size in synchrony */ 49 * size in synchrony */
49static void 50static void
50_canvas_resize_cb(Ecore_Evas *ee) 51_on_canvas_resize(Ecore_Evas *ee)
51{ 52{
52 int w, h; 53 Evas_Object *bg;
53 struct _App *app = ecore_evas_data_get(ee, "app"); 54 Evas_Object *edje_obj;
55 int w;
56 int h;
57
58 bg = ecore_evas_data_get(ee, "background");
59 edje_obj = ecore_evas_data_get(ee, "edje_obj");
54 60
55 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 61 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
56 evas_object_resize(app->bg, w, h); 62 evas_object_resize(bg, w, h);
57 evas_object_resize(app->edje, w, h); 63 evas_object_resize(edje_obj, w, h);
58} 64}
59 65
60static void 66static void
61_bg_key_down(void *data, Evas *e, Evas_Object *o __UNUSED__, void *event_info) 67_on_bg_key_down(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event_info)
62{ 68{
63 struct _App *app = data; 69 Ecore_Evas *ee;
64 Evas_Event_Key_Down *ev = event_info; 70 Evas_Event_Key_Down *ev;
65 Evas_Object *rect; 71 Evas_Object *edje_obj;
66 Eina_Bool r;
67 72
73 ee = (Ecore_Evas *)data;
74 ev = (Evas_Event_Key_Down *)event_info;
75 edje_obj = ecore_evas_data_get(ee, "edje_obj");
68 76
69 if (!strcmp(ev->keyname, "Down")) 77 if (!strcmp(ev->keyname, "h"))
70 { 78 {
71 edje_object_part_drag_step(app->edje, PARTNAME, 0, 1.0); 79 fprintf(stdout, commands);
80 return;
81 }
82 else if (!strcmp(ev->keyname, "Down"))
83 {
84 edje_object_part_drag_step(edje_obj, PARTNAME, 0, 1.0);
72 } 85 }
73 else if (!strcmp(ev->keyname, "Up")) 86 else if (!strcmp(ev->keyname, "Up"))
74 { 87 {
75 edje_object_part_drag_step(app->edje, PARTNAME, 0, -1.0); 88 edje_object_part_drag_step(edje_obj, PARTNAME, 0, -1.0);
76 } 89 }
77 else if (!strcmp(ev->keyname, "m")) 90 else if (!strcmp(ev->keyname, "m"))
78 { 91 {
79 edje_object_part_drag_value_set(app->edje, PARTNAME, 0.0, 0.5); 92 edje_object_part_drag_value_set(edje_obj, PARTNAME, 0.0, 0.5);
80 } 93 }
81 else if (!strcmp(ev->keyname, "Prior")) 94 else if (!strcmp(ev->keyname, "Prior"))
82 { 95 {
83 edje_object_part_drag_page(app->edje, PARTNAME, 0.0, -1.0); 96 edje_object_part_drag_page(edje_obj, PARTNAME, 0.0, -1.0);
84 } 97 }
85 else if (!strcmp(ev->keyname, "Next")) 98 else if (!strcmp(ev->keyname, "Next"))
86 { 99 {
87 edje_object_part_drag_page(app->edje, PARTNAME, 0.0, 1.0); 100 edje_object_part_drag_page(edje_obj, PARTNAME, 0.0, 1.0);
88 } 101 }
89 else if (!strcmp(ev->keyname, "Escape")) 102 else if (!strcmp(ev->keyname, "Escape"))
90 ecore_main_loop_quit(); 103 ecore_main_loop_quit();
91 else 104 else
92 printf("unhandled key: %s\n", ev->keyname); 105 {
106 printf("unhandled key: %s\n", ev->keyname);
107 fprintf(stdout, commands);
108 }
93} 109}
94 110
95static void 111static void
96_knob_moved_cb(void *data, Evas_Object *o, const char *emission, const char *source) 112_on_knob_moved(void *data __UNUSED__, Evas_Object *o, const char *emission __UNUSED__, const char *source __UNUSED__)
97{ 113{
98 double val; 114 double val;
115
99 edje_object_part_drag_value_get(o, PARTNAME, NULL, &val); 116 edje_object_part_drag_value_get(o, PARTNAME, NULL, &val);
100 printf("value changed to: %0.3f\n", val); 117 printf("value changed to: %0.3f\n", val);
101} 118}
102 119
103int 120int
104main(void) 121main(int argc __UNUSED__, char *argv[])
105{ 122{
106 Evas *evas; 123 char edje_file_path[PATH_MAX];
107 struct _App app; 124 const char *edje_file = "drag.edj";
108 int i; 125 Ecore_Evas *ee;
109 126 Evas *evas;
110 ecore_evas_init(); 127 Evas_Object *bg;
111 edje_init(); 128 Evas_Object *edje_obj;
129 Eina_Prefix *pfx;
130
131 if (!ecore_evas_init())
132 return EXIT_FAILURE;
133
134 if (!edje_init())
135 goto shutdown_ecore_evas;
136
137 pfx = eina_prefix_new(argv[0], main,
138 "EDJE_EXAMPLES",
139 "edje/examples",
140 edje_file,
141 PACKAGE_BIN_DIR,
142 PACKAGE_LIB_DIR,
143 PACKAGE_DATA_DIR,
144 PACKAGE_DATA_DIR);
145 if (!pfx)
146 goto shutdown_edje;
112 147
113 /* this will give you a window with an Evas canvas under the first 148 /* this will give you a window with an Evas canvas under the first
114 * engine available */ 149 * engine available */
115 app.ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); 150 ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
116 151 if (!ee)
117 ecore_evas_callback_destroy_set(app.ee, _on_destroy); 152 goto free_prefix;
118 ecore_evas_callback_resize_set(app.ee, _canvas_resize_cb);
119 ecore_evas_title_set(app.ee, "Edje Box Example");
120 ecore_evas_show(app.ee);
121 153
122 ecore_evas_data_set(app.ee, "app", &app); 154 ecore_evas_callback_destroy_set(ee, _on_destroy);
155 ecore_evas_callback_resize_set(ee, _on_canvas_resize);
156 ecore_evas_title_set(ee, "Edje Box Example");
123 157
124 evas = ecore_evas_get(app.ee); 158 evas = ecore_evas_get(ee);
125 159
126 app.bg = evas_object_rectangle_add(evas); 160 bg = evas_object_rectangle_add(evas);
127 evas_object_color_set(app.bg, 255, 255, 255, 255); 161 evas_object_color_set(bg, 255, 255, 255, 255);
128 evas_object_resize(app.bg, WIDTH, HEIGHT); 162 evas_object_resize(bg, WIDTH, HEIGHT);
129 evas_object_focus_set(app.bg, EINA_TRUE); 163 evas_object_focus_set(bg, EINA_TRUE);
130 evas_object_show(app.bg); 164 evas_object_show(bg);
165 ecore_evas_data_set(ee, "background", bg);
131 166
132 evas_object_event_callback_add(app.bg, EVAS_CALLBACK_KEY_DOWN, _bg_key_down, &app); 167 evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_bg_key_down, ee);
133 168
134 app.edje = edje_object_add(evas); 169 edje_obj = edje_object_add(evas);
135 170
136 edje_object_file_set(app.edje, edje_file_path, "example/group"); 171 snprintf(edje_file_path, sizeof(edje_file_path),
137 evas_object_move(app.edje, 0, 0); 172 "%s/examples/%s", eina_prefix_data_get(pfx), edje_file);
138 evas_object_resize(app.edje, WIDTH, HEIGHT); 173 edje_object_file_set(edje_obj, edje_file_path, "example/group");
139 evas_object_show(app.edje); 174 evas_object_move(edje_obj, 0, 0);
175 evas_object_resize(edje_obj, WIDTH, HEIGHT);
176 evas_object_show(edje_obj);
177 ecore_evas_data_set(ee, "edje_obj", edje_obj);
140 178
141 edje_object_part_drag_size_set(app.edje, PARTNAME, 1.0, 0.4); 179 edje_object_part_drag_size_set(edje_obj, PARTNAME, 1.0, 0.4);
142 180
143 if (!edje_object_part_drag_step_set(app.edje, PARTNAME, 0.0, 0.1)) 181 if (!edje_object_part_drag_step_set(edje_obj, PARTNAME, 0.0, 0.1))
144 printf("error when setting drag step size.\n"); 182 printf("error when setting drag step size.\n");
145 183
146 if (!edje_object_part_drag_page_set(app.edje, PARTNAME, 0.0, 0.3)) 184 if (!edje_object_part_drag_page_set(edje_obj, PARTNAME, 0.0, 0.3))
147 printf("error when setting drag page step size.\n"); 185 printf("error when setting drag page step size.\n");
148 186
149 edje_object_signal_callback_add(app.edje, "drag", PARTNAME, _knob_moved_cb, &app); 187 edje_object_signal_callback_add(edje_obj, "drag", PARTNAME, _on_knob_moved, NULL);
188
189 fprintf(stdout, commands);
190
191 ecore_evas_show(ee);
150 192
151 ecore_main_loop_begin(); 193 ecore_main_loop_begin();
152 194
153 ecore_evas_free(app.ee); 195 eina_prefix_free(pfx);
196 ecore_evas_free(ee);
154 ecore_evas_shutdown(); 197 ecore_evas_shutdown();
155 edje_shutdown(); 198 edje_shutdown();
156 return 0; 199
200 return EXIT_SUCCESS;
201
202 free_prefix:
203 eina_prefix_free(pfx);
204 shutdown_edje:
205 edje_shutdown();
206 shutdown_ecore_evas:
207 ecore_evas_shutdown();
208
209 return EXIT_FAILURE;
157} 210}
diff --git a/libraries/edje/src/examples/edje-perspective.c b/libraries/edje/src/examples/edje-perspective.c
index 5220b74..1037043 100644
--- a/libraries/edje/src/examples/edje-perspective.c
+++ b/libraries/edje/src/examples/edje-perspective.c
@@ -10,10 +10,9 @@
10 */ 10 */
11 11
12#ifdef HAVE_CONFIG_H 12#ifdef HAVE_CONFIG_H
13#include "config.h" 13# include "config.h"
14#else 14#else
15#define PACKAGE_EXAMPLES_DIR "." 15# define __UNUSED__
16#define __UNUSED__
17#endif 16#endif
18 17
19#include <Ecore.h> 18#include <Ecore.h>
@@ -23,11 +22,21 @@
23#define WIDTH 480 22#define WIDTH 480
24#define HEIGHT 320 23#define HEIGHT 320
25 24
26static const char *edje_file_path = PACKAGE_EXAMPLES_DIR "/perspective.edj"; 25static const char commands[] = \
26 "commands are:\n"
27 "\tDown - move part down\n"
28 "\tUp - move part up\n"
29 "\tLeft - move part left\n"
30 "\tRight - move part right\n"
31 "\tPrior - move part up-left\n"
32 "\tNext - move part down-right\n"
33 "\tInsert - increase focal\n"
34 "\tSuppr - decrease focal\n"
35 "\tEsc - exit\n"
36 "\th - print help\n";
27 37
28struct _App { 38struct _App {
29 Ecore_Evas *ee; 39 Evas_Object *edje_obj;
30 Evas_Object *edje;
31 Evas_Object *bg; 40 Evas_Object *bg;
32 Edje_Perspective *ps; 41 Edje_Perspective *ps;
33 Eina_Bool animating; 42 Eina_Bool animating;
@@ -44,14 +53,14 @@ _on_destroy(Ecore_Evas *ee __UNUSED__)
44/* here just to keep our example's window size and background image's 53/* here just to keep our example's window size and background image's
45 * size in synchrony */ 54 * size in synchrony */
46static void 55static void
47_canvas_resize_cb(Ecore_Evas *ee) 56_on_canvas_resize(Ecore_Evas *ee)
48{ 57{
49 int w, h; 58 int w, h;
50 struct _App *app = ecore_evas_data_get(ee, "app"); 59 struct _App *app = ecore_evas_data_get(ee, "app");
51 60
52 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 61 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
53 evas_object_resize(app->bg, w, h); 62 evas_object_resize(app->bg, w, h);
54 evas_object_resize(app->edje, w, h); 63 evas_object_resize(app->edje_obj, w, h);
55} 64}
56 65
57static void 66static void
@@ -74,20 +83,24 @@ _part_move(struct _App *app, int dx, int dy)
74 app->y = 0; 83 app->y = 0;
75 84
76 snprintf(emission, sizeof(emission), "move,%d,%d", app->x, app->y); 85 snprintf(emission, sizeof(emission), "move,%d,%d", app->x, app->y);
77 edje_object_signal_emit(app->edje, emission, ""); 86 edje_object_signal_emit(app->edje_obj, emission, "");
78 app->animating = EINA_TRUE; 87 app->animating = EINA_TRUE;
79} 88}
80 89
81 90
82static void 91static void
83_bg_key_down(void *data, Evas *e, Evas_Object *o __UNUSED__, void *event_info) 92_on_bg_key_down(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event_info)
84{ 93{
85 struct _App *app = data; 94 struct _App *app = data;
86 Evas_Event_Key_Down *ev = event_info; 95 Evas_Event_Key_Down *ev = event_info;
87 96
88 97 if (!strcmp(ev->keyname, "h"))
98 {
99 fprintf(stdout, commands);
100 return;
101 }
89 // just moving the part and text 102 // just moving the part and text
90 if (!strcmp(ev->keyname, "Down")) 103 else if (!strcmp(ev->keyname, "Down"))
91 { 104 {
92 _part_move(app, 0, 1); 105 _part_move(app, 0, 1);
93 } 106 }
@@ -116,7 +129,7 @@ _bg_key_down(void *data, Evas *e, Evas_Object *o __UNUSED__, void *event_info)
116 { 129 {
117 app->focal += 5; 130 app->focal += 5;
118 edje_perspective_set(app->ps, 240, 160, 0, app->focal); 131 edje_perspective_set(app->ps, 240, 160, 0, app->focal);
119 edje_object_calc_force(app->edje); 132 edje_object_calc_force(app->edje_obj);
120 } 133 }
121 else if (!strcmp(ev->keyname, "KP_Subtract")) 134 else if (!strcmp(ev->keyname, "KP_Subtract"))
122 { 135 {
@@ -125,13 +138,16 @@ _bg_key_down(void *data, Evas *e, Evas_Object *o __UNUSED__, void *event_info)
125 app->focal = 5; 138 app->focal = 5;
126 139
127 edje_perspective_set(app->ps, 240, 160, 0, app->focal); 140 edje_perspective_set(app->ps, 240, 160, 0, app->focal);
128 edje_object_calc_force(app->edje); 141 edje_object_calc_force(app->edje_obj);
129 } 142 }
130 // exiting 143 // exiting
131 else if (!strcmp(ev->keyname, "Escape")) 144 else if (!strcmp(ev->keyname, "Escape"))
132 ecore_main_loop_quit(); 145 ecore_main_loop_quit();
133 else 146 else
134 printf("unhandled key: %s\n", ev->keyname); 147 {
148 printf("unhandled key: %s\n", ev->keyname);
149 fprintf(stdout, commands);
150 }
135} 151}
136 152
137static void 153static void
@@ -143,16 +159,33 @@ _animation_end_cb(void *data, Evas_Object *o __UNUSED__, const char *emission __
143} 159}
144 160
145int 161int
146main(void) 162main(int argc __UNUSED__, char *argv[])
147{ 163{
148 Evas *evas; 164 char edje_file_path[PATH_MAX];
149 struct _App app; 165 const char *edje_file = "perspective.edj";
150 int i; 166 struct _App app;
151 167 Ecore_Evas *ee;
152 ecore_evas_init(); 168 Evas *evas;
153 edje_init(); 169 Eina_Prefix *pfx;
154 170
155 edje_frametime_set(((double)1) / 60); 171 if (!ecore_evas_init())
172 return EXIT_FAILURE;
173
174 if (!edje_init())
175 goto shutdown_ecore_evas;
176
177 pfx = eina_prefix_new(argv[0], main,
178 "EDJE_EXAMPLES",
179 "edje/examples",
180 edje_file,
181 PACKAGE_BIN_DIR,
182 PACKAGE_LIB_DIR,
183 PACKAGE_DATA_DIR,
184 PACKAGE_DATA_DIR);
185 if (!pfx)
186 goto shutdown_edje;
187
188 edje_frametime_set(1.0 / 60.0);
156 189
157 /* this will give you a window with an Evas canvas under the first 190 /* this will give you a window with an Evas canvas under the first
158 * engine available */ 191 * engine available */
@@ -160,16 +193,18 @@ main(void)
160 app.x = 0; 193 app.x = 0;
161 app.y = 0; 194 app.y = 0;
162 app.focal = 50; 195 app.focal = 50;
163 app.ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
164 196
165 ecore_evas_callback_destroy_set(app.ee, _on_destroy); 197 ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
166 ecore_evas_callback_resize_set(app.ee, _canvas_resize_cb); 198 if (!ee)
167 ecore_evas_title_set(app.ee, "Edje Box Example"); 199 goto free_prefix;
168 ecore_evas_show(app.ee); 200
201 ecore_evas_callback_destroy_set(ee, _on_destroy);
202 ecore_evas_callback_resize_set(ee, _on_canvas_resize);
203 ecore_evas_title_set(ee, "Edje Box Example");
169 204
170 ecore_evas_data_set(app.ee, "app", &app); 205 ecore_evas_data_set(ee, "app", &app);
171 206
172 evas = ecore_evas_get(app.ee); 207 evas = ecore_evas_get(ee);
173 208
174 app.bg = evas_object_rectangle_add(evas); 209 app.bg = evas_object_rectangle_add(evas);
175 evas_object_color_set(app.bg, 255, 255, 255, 255); 210 evas_object_color_set(app.bg, 255, 255, 255, 255);
@@ -177,25 +212,42 @@ main(void)
177 evas_object_focus_set(app.bg, EINA_TRUE); 212 evas_object_focus_set(app.bg, EINA_TRUE);
178 evas_object_show(app.bg); 213 evas_object_show(app.bg);
179 214
180 evas_object_event_callback_add(app.bg, EVAS_CALLBACK_KEY_DOWN, _bg_key_down, &app); 215 evas_object_event_callback_add(app.bg, EVAS_CALLBACK_KEY_DOWN, _on_bg_key_down, &app);
181 216
182 app.edje = edje_object_add(evas); 217 app.edje_obj = edje_object_add(evas);
183 218
184 edje_object_file_set(app.edje, edje_file_path, "example/group"); 219 snprintf(edje_file_path, sizeof(edje_file_path),
185 evas_object_move(app.edje, 0, 0); 220 "%s/examples/%s", eina_prefix_data_get(pfx), edje_file);
186 evas_object_resize(app.edje, WIDTH, HEIGHT); 221 edje_object_file_set(app.edje_obj, edje_file_path, "example/group");
187 evas_object_show(app.edje); 222 evas_object_move(app.edje_obj, 0, 0);
223 evas_object_resize(app.edje_obj, WIDTH, HEIGHT);
224 evas_object_show(app.edje_obj);
188 225
189 edje_object_signal_callback_add(app.edje, "animation,end", "", _animation_end_cb, &app); 226 edje_object_signal_callback_add(app.edje_obj, "animation,end", "", _animation_end_cb, &app);
190 227
191 app.ps = edje_perspective_new(evas); 228 app.ps = edje_perspective_new(evas);
192 edje_perspective_set(app.ps, 240, 160, 0, app.focal); 229 edje_perspective_set(app.ps, 240, 160, 0, app.focal);
193 edje_perspective_global_set(app.ps, EINA_TRUE); 230 edje_perspective_global_set(app.ps, EINA_TRUE);
194 231
232 fprintf(stdout, commands);
233
234 ecore_evas_show(ee);
235
195 ecore_main_loop_begin(); 236 ecore_main_loop_begin();
196 237
197 ecore_evas_free(app.ee); 238 eina_prefix_free(pfx);
239 ecore_evas_free(ee);
198 ecore_evas_shutdown(); 240 ecore_evas_shutdown();
199 edje_shutdown(); 241 edje_shutdown();
200 return 0; 242
243 return EXIT_SUCCESS;
244
245 free_prefix:
246 eina_prefix_free(pfx);
247 shutdown_edje:
248 edje_shutdown();
249 shutdown_ecore_evas:
250 ecore_evas_shutdown();
251
252 return EXIT_FAILURE;
201} 253}
diff --git a/libraries/edje/src/examples/edje-signals-messages.c b/libraries/edje/src/examples/edje-signals-messages.c
index 2345738..4949415 100644
--- a/libraries/edje/src/examples/edje-signals-messages.c
+++ b/libraries/edje/src/examples/edje-signals-messages.c
@@ -27,34 +27,32 @@
27#define MSG_COLOR 1 27#define MSG_COLOR 1
28#define MSG_TEXT 2 28#define MSG_TEXT 2
29 29
30static const char *border_img_path = PACKAGE_EXAMPLES_DIR "/red.png"; 30static const char commands[] = \
31static const char *edje_file_path = \
32 PACKAGE_EXAMPLES_DIR "/signals-messages.edj";
33
34static Ecore_Evas *ee;
35static Evas_Object *edje_obj;
36static Eina_Bool right_rect_show = EINA_TRUE;
37
38static const char *commands = \
39 "commands are:\n" 31 "commands are:\n"
40 "\tt - toggle right rectangle's visibility\n" 32 "\tt - toggle right rectangle's visibility\n"
33 "\tEsc - exit\n"
41 "\th - print help\n"; 34 "\th - print help\n";
42 35
36static Eina_Bool right_rect_show = EINA_TRUE;
37
43static void 38static void
44_on_keydown(void *data __UNUSED__, 39_on_keydown(void *data,
45 Evas *evas __UNUSED__, 40 Evas *evas __UNUSED__,
46 Evas_Object *o __UNUSED__, 41 Evas_Object *o __UNUSED__,
47 void *einfo) 42 void *einfo)
48{ 43{
49 Evas_Event_Key_Down *ev = einfo; 44 Evas_Event_Key_Down *ev;
45 Evas_Object *edje_obj;
46
47 ev = (Evas_Event_Key_Down *)einfo;
48 edje_obj = (Evas_Object *)data;
50 49
51 if (strcmp(ev->keyname, "h") == 0) /* print help */ 50 if (!strcmp(ev->keyname, "h")) /* print help */
52 { 51 {
53 fprintf(stdout, commands); 52 fprintf(stdout, commands);
54 return; 53 return;
55 } 54 }
56 55 else if (!strcmp(ev->keyname, "t")) /* toggle right rectangle's visibility */
57 if (strcmp(ev->keyname, "t") == 0) /* toggle right rectangle's visibility */
58 { 56 {
59 char buf[1024]; 57 char buf[1024];
60 58
@@ -68,6 +66,13 @@ _on_keydown(void *data __UNUSED__,
68 66
69 return; 67 return;
70 } 68 }
69 else if (!strcmp(ev->keyname, "Escape"))
70 ecore_main_loop_quit();
71 else
72 {
73 printf("unhandled key: %s\n", ev->keyname);
74 fprintf(stdout, commands);
75 }
71} 76}
72 77
73static void 78static void
@@ -85,7 +90,7 @@ _sig_print(const char *emission,
85} 90}
86 91
87static void 92static void
88_mouse_wheel_cb(void *data __UNUSED__, 93_on_mouse_wheel(void *data __UNUSED__,
89 Evas_Object *obj __UNUSED__, 94 Evas_Object *obj __UNUSED__,
90 const char *emission, 95 const char *emission,
91 const char *source) 96 const char *source)
@@ -95,8 +100,8 @@ _mouse_wheel_cb(void *data __UNUSED__,
95 100
96/* mouse over signals */ 101/* mouse over signals */
97static void 102static void
98_mouse_over_cb(void *data __UNUSED__, 103_on_mouse_over(void *data __UNUSED__,
99 Evas_Object *obj __UNUSED__, 104 Evas_Object *edje_obj,
100 const char *emission, 105 const char *emission,
101 const char *source) 106 const char *source)
102{ 107{
@@ -133,28 +138,43 @@ _message_handle(void *data __UNUSED__,
133} 138}
134 139
135int 140int
136main(void) 141main(int argc __UNUSED__, char *argv[])
137{ 142{
138 Evas_Object *border, *bg; 143 char border_img_path[PATH_MAX];
139 Evas *evas; 144 char edje_file_path[PATH_MAX];
140 145 const char *edje_file = "signals-messages.edj";
141 srand(time(NULL)); 146 Ecore_Evas *ee;
147 Evas *evas;
148 Evas_Object *bg;
149 Evas_Object *edje_obj;
150 Evas_Object *border;
151 Eina_Prefix *pfx;
142 152
143 if (!ecore_evas_init()) 153 if (!ecore_evas_init())
144 return EXIT_FAILURE; 154 return EXIT_FAILURE;
145 155
146 if (!edje_init()) 156 if (!edje_init())
147 return EXIT_FAILURE; 157 goto shutdown_ecore_evas;
158
159 pfx = eina_prefix_new(argv[0], main,
160 "EDJE_EXAMPLES",
161 "edje/examples",
162 edje_file,
163 PACKAGE_BIN_DIR,
164 PACKAGE_LIB_DIR,
165 PACKAGE_DATA_DIR,
166 PACKAGE_DATA_DIR);
167 if (!pfx)
168 goto shutdown_edje;
148 169
149 /* this will give you a window with an Evas canvas under the first 170 /* this will give you a window with an Evas canvas under the first
150 * engine available */ 171 * engine available */
151 ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); 172 ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
152 if (!ee) 173 if (!ee)
153 goto error; 174 goto free_prefix;
154 175
155 ecore_evas_callback_delete_request_set(ee, _on_delete); 176 ecore_evas_callback_delete_request_set(ee, _on_delete);
156 ecore_evas_title_set(ee, "Edje Basics Example"); 177 ecore_evas_title_set(ee, "Edje Basics Example");
157 ecore_evas_show(ee);
158 178
159 evas = ecore_evas_get(ee); 179 evas = ecore_evas_get(ee);
160 180
@@ -163,14 +183,13 @@ main(void)
163 evas_object_move(bg, 0, 0); /* at canvas' origin */ 183 evas_object_move(bg, 0, 0); /* at canvas' origin */
164 evas_object_resize(bg, WIDTH, HEIGHT); /* covers full canvas */ 184 evas_object_resize(bg, WIDTH, HEIGHT); /* covers full canvas */
165 evas_object_show(bg); 185 evas_object_show(bg);
166 ecore_evas_object_associate(ee, bg, ECORE_EVAS_OBJECT_ASSOCIATE_BASE);
167
168 evas_object_focus_set(bg, EINA_TRUE); 186 evas_object_focus_set(bg, EINA_TRUE);
169 evas_object_event_callback_add( 187 ecore_evas_object_associate(ee, bg, ECORE_EVAS_OBJECT_ASSOCIATE_BASE);
170 bg, EVAS_CALLBACK_KEY_DOWN, _on_keydown, NULL);
171 188
172 edje_obj = edje_object_add(evas); 189 edje_obj = edje_object_add(evas);
173 190
191 snprintf(edje_file_path, sizeof(edje_file_path),
192 "%s/examples/%s", eina_prefix_data_get(pfx), edje_file);
174 if (!edje_object_file_set(edje_obj, edje_file_path, "example_group")) 193 if (!edje_object_file_set(edje_obj, edje_file_path, "example_group"))
175 { 194 {
176 int err = edje_object_load_error_get(edje_obj); 195 int err = edje_object_load_error_get(edje_obj);
@@ -179,14 +198,14 @@ main(void)
179 "signals-messages.edj: %s\n", errmsg); 198 "signals-messages.edj: %s\n", errmsg);
180 199
181 evas_object_del(edje_obj); 200 evas_object_del(edje_obj);
182 goto error_edj; 201 goto free_prefix;
183 } 202 }
184 203
185 edje_object_signal_callback_add(edje_obj, "mouse,wheel,*", "part_left", 204 edje_object_signal_callback_add(edje_obj, "mouse,wheel,*", "part_left",
186 _mouse_wheel_cb, NULL); 205 _on_mouse_wheel, NULL);
187 206
188 edje_object_signal_callback_add(edje_obj, "mouse,over", "part_right", 207 edje_object_signal_callback_add(edje_obj, "mouse,over", "part_right",
189 _mouse_over_cb, NULL); 208 _on_mouse_over, NULL);
190 209
191 edje_object_message_handler_set(edje_obj, _message_handle, NULL); 210 edje_object_message_handler_set(edje_obj, _message_handle, NULL);
192 211
@@ -194,6 +213,11 @@ main(void)
194 evas_object_resize(edje_obj, WIDTH - 40, HEIGHT - 40); 213 evas_object_resize(edje_obj, WIDTH - 40, HEIGHT - 40);
195 evas_object_show(edje_obj); 214 evas_object_show(edje_obj);
196 215
216 evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_keydown, edje_obj);
217
218 snprintf(border_img_path, sizeof(border_img_path),
219 "%s/edje/examples/red.png", eina_prefix_data_get(pfx));
220
197 /* this is a border around the Edje object above, here just to 221 /* this is a border around the Edje object above, here just to
198 * emphasize its geometry */ 222 * emphasize its geometry */
199 border = evas_object_image_filled_add(evas); 223 border = evas_object_image_filled_add(evas);
@@ -207,24 +231,24 @@ main(void)
207 evas_object_show(border); 231 evas_object_show(border);
208 232
209 fprintf(stdout, commands); 233 fprintf(stdout, commands);
234
235 ecore_evas_show(ee);
236
210 ecore_main_loop_begin(); 237 ecore_main_loop_begin();
211 238
239 eina_prefix_free(pfx);
212 ecore_evas_free(ee); 240 ecore_evas_free(ee);
213 ecore_evas_shutdown(); 241 ecore_evas_shutdown();
214 edje_shutdown(); 242 edje_shutdown();
215 return 0;
216
217error:
218 fprintf(stderr, "You got to have at least one Evas engine built"
219 " and linked up to ecore-evas for this example to run"
220 " properly.\n");
221 ecore_evas_shutdown();
222 return -1;
223 243
224error_edj: 244 return EXIT_SUCCESS;
225 fprintf(stderr, "Failed to load signals-messages.edj!\n");
226 245
246 free_prefix:
247 eina_prefix_free(pfx);
248 shutdown_edje:
249 edje_shutdown();
250 shutdown_ecore_evas:
227 ecore_evas_shutdown(); 251 ecore_evas_shutdown();
228 return -2;
229}
230 252
253 return EXIT_FAILURE;
254}
diff --git a/libraries/edje/src/examples/edje-swallow.c b/libraries/edje/src/examples/edje-swallow.c
index a1d30e2..ad79ca2 100644
--- a/libraries/edje/src/examples/edje-swallow.c
+++ b/libraries/edje/src/examples/edje-swallow.c
@@ -10,10 +10,9 @@
10 */ 10 */
11 11
12#ifdef HAVE_CONFIG_H 12#ifdef HAVE_CONFIG_H
13#include "config.h" 13# include "config.h"
14#else 14#else
15#define PACKAGE_EXAMPLES_DIR "." 15# define __UNUSED__
16#define __UNUSED__
17#endif 16#endif
18 17
19#include <Ecore.h> 18#include <Ecore.h>
@@ -23,11 +22,6 @@
23#define WIDTH (300) 22#define WIDTH (300)
24#define HEIGHT (300) 23#define HEIGHT (300)
25 24
26static const char *edje_file_path = PACKAGE_EXAMPLES_DIR "/swallow.edj";
27
28static Ecore_Evas *ee;
29static Evas_Object *bg;
30
31static void 25static void
32_on_delete(Ecore_Evas *ee __UNUSED__) 26_on_delete(Ecore_Evas *ee __UNUSED__)
33{ 27{
@@ -37,31 +31,56 @@ _on_delete(Ecore_Evas *ee __UNUSED__)
37/* here just to keep our example's window size and background image's 31/* here just to keep our example's window size and background image's
38 * size in synchrony */ 32 * size in synchrony */
39static void 33static void
40_canvas_resize_cb(Ecore_Evas *ee) 34_on_canvas_resize(Ecore_Evas *ee)
41{ 35{
42 int w, h; 36 Evas_Object *bg;
37 int w;
38 int h;
43 39
40 bg = ecore_evas_data_get(ee, "background");
44 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 41 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
45 evas_object_resize(bg, w, h); 42 evas_object_resize(bg, w, h);
46} 43}
47 44
48int 45int
49main(void) 46main(int argc __UNUSED__, char *argv[])
50{ 47{
51 Evas_Object *edje_obj, *rect, *obj; 48 char edje_file_path[PATH_MAX];
52 Evas *evas; 49 const char *edje_file = "swallow.edj";
53 50 Ecore_Evas *ee;
54 ecore_evas_init(); 51 Evas *evas;
55 edje_init(); 52 Evas_Object *bg;
53 Evas_Object *rect;
54 Evas_Object *obj;
55 Evas_Object *edje_obj;
56 Eina_Prefix *pfx;
57
58 if (!ecore_evas_init())
59 return EXIT_FAILURE;
60
61 if (!edje_init())
62 goto shutdown_ecore_evas;
63
64 pfx = eina_prefix_new(argv[0], main,
65 "EDJE_EXAMPLES",
66 "edje/examples",
67 edje_file,
68 PACKAGE_BIN_DIR,
69 PACKAGE_LIB_DIR,
70 PACKAGE_DATA_DIR,
71 PACKAGE_DATA_DIR);
72 if (!pfx)
73 goto shutdown_edje;
56 74
57 /* this will give you a window with an Evas canvas under the first 75 /* this will give you a window with an Evas canvas under the first
58 * engine available */ 76 * engine available */
59 ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); 77 ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
78 if (!ee)
79 goto free_prefix;
60 80
61 ecore_evas_callback_delete_request_set(ee, _on_delete); 81 ecore_evas_callback_delete_request_set(ee, _on_delete);
62 ecore_evas_callback_resize_set(ee, _canvas_resize_cb); 82 ecore_evas_callback_resize_set(ee, _on_canvas_resize);
63 ecore_evas_title_set(ee, "Edje Swallow Example"); 83 ecore_evas_title_set(ee, "Edje Swallow Example");
64 ecore_evas_show(ee);
65 84
66 evas = ecore_evas_get(ee); 85 evas = ecore_evas_get(ee);
67 86
@@ -70,9 +89,12 @@ main(void)
70 evas_object_move(bg, 0, 0); /* at canvas' origin */ 89 evas_object_move(bg, 0, 0); /* at canvas' origin */
71 evas_object_resize(bg, WIDTH, HEIGHT); /* covers full canvas */ 90 evas_object_resize(bg, WIDTH, HEIGHT); /* covers full canvas */
72 evas_object_show(bg); 91 evas_object_show(bg);
92 ecore_evas_data_set(ee, "background", bg);
73 93
74 edje_obj = edje_object_add(evas); 94 edje_obj = edje_object_add(evas);
75 95
96 snprintf(edje_file_path, sizeof(edje_file_path),
97 "%s/examples/%s", eina_prefix_data_get(pfx), edje_file);
76 edje_object_file_set(edje_obj, edje_file_path, "example_group"); 98 edje_object_file_set(edje_obj, edje_file_path, "example_group");
77 evas_object_move(edje_obj, 20, 20); 99 evas_object_move(edje_obj, 20, 20);
78 evas_object_resize(edje_obj, WIDTH - 40, HEIGHT - 40); 100 evas_object_resize(edje_obj, WIDTH - 40, HEIGHT - 40);
@@ -86,10 +108,23 @@ main(void)
86 if(obj == rect) 108 if(obj == rect)
87 printf("Swallowing worked!\n"); 109 printf("Swallowing worked!\n");
88 110
111 ecore_evas_show(ee);
112
89 ecore_main_loop_begin(); 113 ecore_main_loop_begin();
90 114
115 eina_prefix_free(pfx);
91 ecore_evas_free(ee); 116 ecore_evas_free(ee);
92 ecore_evas_shutdown(); 117 ecore_evas_shutdown();
93 edje_shutdown(); 118 edje_shutdown();
94 return 0; 119
120 return EXIT_SUCCESS;
121
122 free_prefix:
123 eina_prefix_free(pfx);
124 shutdown_edje:
125 edje_shutdown();
126 shutdown_ecore_evas:
127 ecore_evas_shutdown();
128
129 return EXIT_FAILURE;
95} 130}
diff --git a/libraries/edje/src/examples/edje-table.c b/libraries/edje/src/examples/edje-table.c
index 3866d22..7780221 100644
--- a/libraries/edje/src/examples/edje-table.c
+++ b/libraries/edje/src/examples/edje-table.c
@@ -10,10 +10,9 @@
10 */ 10 */
11 11
12#ifdef HAVE_CONFIG_H 12#ifdef HAVE_CONFIG_H
13#include "config.h" 13# include "config.h"
14#else 14#else
15#define PACKAGE_EXAMPLES_DIR "." 15# define __UNUSED__
16#define __UNUSED__
17#endif 16#endif
18 17
19#include <Ecore.h> 18#include <Ecore.h>
@@ -23,12 +22,6 @@
23#define WIDTH (400) 22#define WIDTH (400)
24#define HEIGHT (400) 23#define HEIGHT (400)
25 24
26static const char *edje_file_path = PACKAGE_EXAMPLES_DIR "/table.edj";
27
28static Ecore_Evas *ee;
29static Evas *evas;
30static Evas_Object *bg, *edje_obj, *rects[4];
31
32static void 25static void
33_on_delete(Ecore_Evas *ee __UNUSED__) 26_on_delete(Ecore_Evas *ee __UNUSED__)
34{ 27{
@@ -38,7 +31,7 @@ _on_delete(Ecore_Evas *ee __UNUSED__)
38/* Try to get the number of columns and rows of the table 31/* Try to get the number of columns and rows of the table
39 * and print them. */ 32 * and print them. */
40static void 33static void
41_columns_rows_print(void) 34_columns_rows_print(Evas_Object *edje_obj)
42{ 35{
43 int cols, rows; 36 int cols, rows;
44 37
@@ -52,10 +45,18 @@ _columns_rows_print(void)
52/* here just to keep our example's window size and table items 45/* here just to keep our example's window size and table items
53 * size in synchrony. */ 46 * size in synchrony. */
54static void 47static void
55_canvas_resize_cb(Ecore_Evas *ee) 48_on_canvas_resize(Ecore_Evas *ee)
56{ 49{
57 int i, w, h; 50 Evas_Object *bg;
58 51 Evas_Object *edje_obj;
52 Evas_Object **rects;
53 int i;
54 int w;
55 int h;
56
57 bg = ecore_evas_data_get(ee, "background");
58 edje_obj = ecore_evas_data_get(ee, "edje_obj");
59 rects = ecore_evas_data_get(ee, "rects");
59 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 60 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
60 61
61 evas_object_resize(bg, w, h); 62 evas_object_resize(bg, w, h);
@@ -68,9 +69,13 @@ _canvas_resize_cb(Ecore_Evas *ee)
68/* Mouse button 1 = remove the clicked item 69/* Mouse button 1 = remove the clicked item
69 * any other button = remove all items. */ 70 * any other button = remove all items. */
70static void 71static void
71_on_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info) 72_on_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_info)
72{ 73{
73 Evas_Event_Mouse_Down *ev = event_info; 74 Evas_Event_Mouse_Down *ev;
75 Evas_Object *edje_obj;
76
77 ev = (Evas_Event_Mouse_Down *)event_info;
78 edje_obj = (Evas_Object *)data;
74 79
75 if (ev->button != 1) 80 if (ev->button != 1)
76 edje_object_part_table_clear(edje_obj, "table_part", EINA_TRUE); 81 edje_object_part_table_clear(edje_obj, "table_part", EINA_TRUE);
@@ -78,11 +83,11 @@ _on_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info)
78 fprintf(stderr, "Cannot remove the selected rectangle\n"); 83 fprintf(stderr, "Cannot remove the selected rectangle\n");
79 84
80 evas_object_del(obj); 85 evas_object_del(obj);
81 _columns_rows_print(); 86 _columns_rows_print(edje_obj);
82} 87}
83 88
84static void 89static void
85_rects_create(void) 90_rects_create(Evas *evas, Evas_Object **rects, Evas_Object *edje_obj)
86{ 91{
87 int i; 92 int i;
88 93
@@ -93,26 +98,48 @@ _rects_create(void)
93 evas_object_size_hint_weight_set(rects[i], 1.0, 1.0); 98 evas_object_size_hint_weight_set(rects[i], 1.0, 1.0);
94 evas_object_show(rects[i]); 99 evas_object_show(rects[i]);
95 evas_object_event_callback_add(rects[i], EVAS_CALLBACK_MOUSE_DOWN, 100 evas_object_event_callback_add(rects[i], EVAS_CALLBACK_MOUSE_DOWN,
96 _on_mouse_down, NULL); 101 _on_mouse_down, edje_obj);
97 } 102 }
98} 103}
99 104
100int 105int
101main(void) 106main(int argc __UNUSED__, char *argv[])
102{ 107{
103 int i; 108 char edje_file_path[PATH_MAX];
104 109 const char *edje_file = "table.edj";
105 ecore_evas_init(); 110 Ecore_Evas *ee;
106 edje_init(); 111 Evas *evas;
112 Evas_Object *bg;
113 Evas_Object *edje_obj;
114 Evas_Object *rects[4];
115 Eina_Prefix *pfx;
116
117 if (!ecore_evas_init())
118 return EXIT_FAILURE;
119
120 if (!edje_init())
121 goto shutdown_ecore_evas;
122
123 pfx = eina_prefix_new(argv[0], main,
124 "EDJE_EXAMPLES",
125 "edje/examples",
126 edje_file,
127 PACKAGE_BIN_DIR,
128 PACKAGE_LIB_DIR,
129 PACKAGE_DATA_DIR,
130 PACKAGE_DATA_DIR);
131 if (!pfx)
132 goto shutdown_edje;
107 133
108 /* this will give you a window with an Evas canvas under the first 134 /* this will give you a window with an Evas canvas under the first
109 * engine available */ 135 * engine available */
110 ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); 136 ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
137 if (!ee)
138 goto free_prefix;
111 139
112 ecore_evas_callback_delete_request_set(ee, _on_delete); 140 ecore_evas_callback_delete_request_set(ee, _on_delete);
113 ecore_evas_callback_resize_set(ee, _canvas_resize_cb); 141 ecore_evas_callback_resize_set(ee, _on_canvas_resize);
114 ecore_evas_title_set(ee, "Edje Table Example"); 142 ecore_evas_title_set(ee, "Edje Table Example");
115 ecore_evas_show(ee);
116 143
117 evas = ecore_evas_get(ee); 144 evas = ecore_evas_get(ee);
118 145
@@ -121,15 +148,20 @@ main(void)
121 evas_object_move(bg, 0, 0); /* at canvas' origin */ 148 evas_object_move(bg, 0, 0); /* at canvas' origin */
122 evas_object_resize(bg, WIDTH, HEIGHT); /* covers full canvas */ 149 evas_object_resize(bg, WIDTH, HEIGHT); /* covers full canvas */
123 evas_object_show(bg); 150 evas_object_show(bg);
151 ecore_evas_data_set(ee, "background", bg);
124 152
125 edje_obj = edje_object_add(evas); 153 edje_obj = edje_object_add(evas);
126 154
155 snprintf(edje_file_path, sizeof(edje_file_path),
156 "%s/examples/%s", eina_prefix_data_get(pfx), edje_file);
127 edje_object_file_set(edje_obj, edje_file_path, "example_table"); 157 edje_object_file_set(edje_obj, edje_file_path, "example_table");
128 evas_object_move(edje_obj, 0, 0); /* at canvas' origin */ 158 evas_object_move(edje_obj, 0, 0); /* at canvas' origin */
129 evas_object_resize(edje_obj, WIDTH, HEIGHT); 159 evas_object_resize(edje_obj, WIDTH, HEIGHT);
130 evas_object_show(edje_obj); 160 evas_object_show(edje_obj);
161 ecore_evas_data_set(ee, "edje_obj", edje_obj);
131 162
132 _rects_create(); 163 _rects_create(evas, rects, edje_obj);
164 ecore_evas_data_set(ee, "rects", rects);
133 165
134 /* Colouring the rectangles */ 166 /* Colouring the rectangles */
135 evas_object_color_set(rects[0], 255, 0, 0, 255); 167 evas_object_color_set(rects[0], 255, 0, 0, 255);
@@ -154,12 +186,25 @@ main(void)
154 1, 1, 1, 1)) 186 1, 1, 1, 1))
155 fprintf(stderr, "Cannot add the rectangle 4 to table\n"); 187 fprintf(stderr, "Cannot add the rectangle 4 to table\n");
156 188
157 _columns_rows_print(); 189 _columns_rows_print(edje_obj);
190
191 ecore_evas_show(ee);
158 192
159 ecore_main_loop_begin(); 193 ecore_main_loop_begin();
160 194
195 eina_prefix_free(pfx);
161 ecore_evas_free(ee); 196 ecore_evas_free(ee);
162 ecore_evas_shutdown(); 197 ecore_evas_shutdown();
163 edje_shutdown(); 198 edje_shutdown();
164 return 0; 199
200 return EXIT_SUCCESS;
201
202 free_prefix:
203 eina_prefix_free(pfx);
204 shutdown_edje:
205 edje_shutdown();
206 shutdown_ecore_evas:
207 ecore_evas_shutdown();
208
209 return EXIT_FAILURE;
165} 210}
diff --git a/libraries/edje/src/examples/edje-text.c b/libraries/edje/src/examples/edje-text.c
index 0916509..5f801a2 100644
--- a/libraries/edje/src/examples/edje-text.c
+++ b/libraries/edje/src/examples/edje-text.c
@@ -10,10 +10,9 @@
10 */ 10 */
11 11
12#ifdef HAVE_CONFIG_H 12#ifdef HAVE_CONFIG_H
13#include "config.h" 13# include "config.h"
14#else 14#else
15#define PACKAGE_EXAMPLES_DIR "." 15# define __UNUSED__
16#define __UNUSED__
17#endif 16#endif
18 17
19#include <Ecore.h> 18#include <Ecore.h>
@@ -23,11 +22,6 @@
23#define WIDTH (300) 22#define WIDTH (300)
24#define HEIGHT (300) 23#define HEIGHT (300)
25 24
26static const char *edje_file_path = PACKAGE_EXAMPLES_DIR "/text.edj";
27
28static Ecore_Evas *ee;
29static Evas_Object *bg;
30
31static void 25static void
32_on_delete(Ecore_Evas *ee __UNUSED__) 26_on_delete(Ecore_Evas *ee __UNUSED__)
33{ 27{
@@ -35,27 +29,47 @@ _on_delete(Ecore_Evas *ee __UNUSED__)
35} 29}
36 30
37static void 31static void
38_cb(void *data, Evas_Object *obj, const char *part) 32_on_text_change(void *data __UNUSED__, Evas_Object *obj, const char *part)
39{ 33{
40 printf("text: %s\n", edje_object_part_text_unescaped_get(obj, part)); 34 printf("text: %s\n", edje_object_part_text_unescaped_get(obj, part));
41} 35}
42 36
43int 37int
44main(void) 38main(int argc __UNUSED__, char *argv[])
45{ 39{
46 Evas_Object *edje_obj, *rect, *obj; 40 char edje_file_path[PATH_MAX];
47 Evas *evas; 41 const char *edje_file = "text.edj";
48 42 Ecore_Evas *ee;
49 ecore_evas_init(); 43 Evas *evas;
50 edje_init(); 44 Evas_Object *bg;
45 Evas_Object *edje_obj;
46 Eina_Prefix *pfx;
47
48 if (!ecore_evas_init())
49 return EXIT_FAILURE;
50
51 if (!edje_init())
52 goto shutdown_ecore_evas;
53
54 pfx = eina_prefix_new(argv[0], main,
55 "EDJE_EXAMPLES",
56 "edje/examples",
57 edje_file,
58 PACKAGE_BIN_DIR,
59 PACKAGE_LIB_DIR,
60 PACKAGE_DATA_DIR,
61 PACKAGE_DATA_DIR);
62 if (!pfx)
63 goto shutdown_edje;
51 64
52 /* this will give you a window with an Evas canvas under the first 65 /* this will give you a window with an Evas canvas under the first
53 * engine available */ 66 * engine available */
54 ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); 67 ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
68 if (!ee)
69 goto free_prefix;
55 70
56 ecore_evas_callback_delete_request_set(ee, _on_delete); 71 ecore_evas_callback_delete_request_set(ee, _on_delete);
57 ecore_evas_title_set(ee, "Edje text Example"); 72 ecore_evas_title_set(ee, "Edje text Example");
58 ecore_evas_show(ee);
59 73
60 evas = ecore_evas_get(ee); 74 evas = ecore_evas_get(ee);
61 75
@@ -68,12 +82,14 @@ main(void)
68 82
69 edje_obj = edje_object_add(evas); 83 edje_obj = edje_object_add(evas);
70 84
85 snprintf(edje_file_path, sizeof(edje_file_path),
86 "%s/examples/%s", eina_prefix_data_get(pfx), edje_file);
71 edje_object_file_set(edje_obj, edje_file_path, "example_group"); 87 edje_object_file_set(edje_obj, edje_file_path, "example_group");
72 evas_object_move(edje_obj, 20, 20); 88 evas_object_move(edje_obj, 20, 20);
73 evas_object_resize(edje_obj, WIDTH - 40, HEIGHT - 40); 89 evas_object_resize(edje_obj, WIDTH - 40, HEIGHT - 40);
74 evas_object_show(edje_obj); 90 evas_object_show(edje_obj);
75 91
76 edje_object_text_change_cb_set(edje_obj, _cb, NULL); 92 edje_object_text_change_cb_set(edje_obj, _on_text_change, NULL);
77 edje_object_part_text_set(edje_obj, "part_one", "one"); 93 edje_object_part_text_set(edje_obj, "part_one", "one");
78 edje_object_part_text_set(edje_obj, "part_two", "<b>two"); 94 edje_object_part_text_set(edje_obj, "part_two", "<b>two");
79 95
@@ -83,10 +99,23 @@ main(void)
83 edje_object_part_text_select_none(edje_obj, "part_two"); 99 edje_object_part_text_select_none(edje_obj, "part_two");
84 printf("selection: %s\n", edje_object_part_text_selection_get(edje_obj, "part_two")); 100 printf("selection: %s\n", edje_object_part_text_selection_get(edje_obj, "part_two"));
85 101
102 ecore_evas_show(ee);
103
86 ecore_main_loop_begin(); 104 ecore_main_loop_begin();
87 105
106 eina_prefix_free(pfx);
88 ecore_evas_free(ee); 107 ecore_evas_free(ee);
89 ecore_evas_shutdown(); 108 ecore_evas_shutdown();
90 edje_shutdown(); 109 edje_shutdown();
91 return 0; 110
111 return EXIT_SUCCESS;
112
113 free_prefix:
114 eina_prefix_free(pfx);
115 shutdown_edje:
116 edje_shutdown();
117 shutdown_ecore_evas:
118 ecore_evas_shutdown();
119
120 return EXIT_FAILURE;
92} 121}
diff --git a/libraries/edje/src/examples/sigtest.c b/libraries/edje/src/examples/sigtest.c
index 6e4d85f..9538e13 100644
--- a/libraries/edje/src/examples/sigtest.c
+++ b/libraries/edje/src/examples/sigtest.c
@@ -13,35 +13,37 @@
13#define WIDTH (300) 13#define WIDTH (300)
14#define HEIGHT (300) 14#define HEIGHT (300)
15 15
16static const char *border_img_path = PACKAGE_EXAMPLES_DIR "/red.png";
17static const char *edje_file_path = PACKAGE_EXAMPLES_DIR "/sigtest.edj";
18
19static Ecore_Evas *ee;
20static Evas_Object *edje_obj;
21
22static const char commands[] = \ 16static const char commands[] = \
23 "commands are:\n" 17 "commands are:\n"
24 "\te - change te edje base\n" 18 "\te - change te edje base\n"
25 "\tl - change to lua base\n" 19 "\tl - change to lua base\n"
26 "\tm - send message\n" 20 "\tm - send message\n"
27 "\ts - send signal\n" 21 "\ts - send signal\n"
22 "\tEsc - exit\n"
28 "\th - print help\n"; 23 "\th - print help\n";
29 24
30static void 25static void
31_on_keydown(void *data __UNUSED__, 26_on_keydown(void *data,
32 Evas *evas __UNUSED__, 27 Evas *evas __UNUSED__,
33 Evas_Object *o __UNUSED__, 28 Evas_Object *o __UNUSED__,
34 void *einfo) 29 void *einfo)
35{ 30{
36 Evas_Event_Key_Down *ev = einfo; 31 Ecore_Evas *ee;
32 Evas_Event_Key_Down *ev;
33 Evas_Object *edje_obj;
34 char *edje_file_path;
35
36 ee = (Ecore_Evas *)data;
37 ev = (Evas_Event_Key_Down *)einfo;
38 edje_obj = ecore_evas_data_get(ee, "edje_obj");
39 edje_file_path = ecore_evas_data_get(ee, "file_path");
37 40
38 if (strcmp(ev->keyname, "h") == 0) 41 if (!strcmp(ev->keyname, "h"))
39 { 42 {
40 fprintf(stdout, commands); 43 fprintf(stdout, commands);
41 return; 44 return;
42 } 45 }
43 46 else if (!strcmp(ev->keyname, "e"))
44 if (strcmp(ev->keyname, "e") == 0)
45 { 47 {
46 if (!edje_object_file_set(edje_obj, edje_file_path, "plain/edje/group")) 48 if (!edje_object_file_set(edje_obj, edje_file_path, "plain/edje/group"))
47 { 49 {
@@ -55,8 +57,7 @@ _on_keydown(void *data __UNUSED__,
55 " file sigtest.edj with success!\n"); 57 " file sigtest.edj with success!\n");
56 return; 58 return;
57 } 59 }
58 60 else if (!strcmp(ev->keyname, "l"))
59 if (strcmp(ev->keyname, "l") == 0)
60 { 61 {
61 if (!edje_object_file_set(edje_obj, edje_file_path, "lua_base")) 62 if (!edje_object_file_set(edje_obj, edje_file_path, "lua_base"))
62 { 63 {
@@ -70,8 +71,7 @@ _on_keydown(void *data __UNUSED__,
70 " file sigtest.edj with success!\n"); 71 " file sigtest.edj with success!\n");
71 return; 72 return;
72 } 73 }
73 74 else if (!strcmp(ev->keyname, "m"))
74 if (strcmp(ev->keyname, "m") == 0)
75 { 75 {
76 Edje_Message_String *msg = malloc(sizeof(*msg)); 76 Edje_Message_String *msg = malloc(sizeof(*msg));
77 77
@@ -82,8 +82,7 @@ _on_keydown(void *data __UNUSED__,
82 fprintf(stdout, "C message sent\n"); 82 fprintf(stdout, "C message sent\n");
83 return; 83 return;
84 } 84 }
85 85 else if (!strcmp(ev->keyname, "s"))
86 if (strcmp(ev->keyname, "s") == 0)
87 { 86 {
88 fprintf(stdout, "\n"); 87 fprintf(stdout, "\n");
89 edje_object_signal_emit(edje_obj, "C signal 1", "Csource"); 88 edje_object_signal_emit(edje_obj, "C signal 1", "Csource");
@@ -91,10 +90,17 @@ _on_keydown(void *data __UNUSED__,
91 fprintf(stdout, "C signal sent\n"); 90 fprintf(stdout, "C signal sent\n");
92 return; 91 return;
93 } 92 }
93 else if (!strcmp(ev->keyname, "Escape"))
94 ecore_main_loop_quit();
95 else
96 {
97 printf("unhandled key: %s\n", ev->keyname);
98 fprintf(stdout, commands);
99 }
94} 100}
95 101
96static void 102static void
97_on_message(void *data, Evas_Object *obj, Edje_Message_Type type, int id, void *msg) 103_on_message(void *data __UNUSED__, Evas_Object *obj __UNUSED__, Edje_Message_Type type, int id, void *msg)
98{ 104{
99 int i; 105 int i;
100 106
@@ -207,7 +213,7 @@ _on_message(void *data, Evas_Object *obj, Edje_Message_Type type, int id, void *
207} 213}
208 214
209static void 215static void
210_on_signal(void *data, Evas_Object *obj __UNUSED__, const char *emission, const char *source) 216_on_signal(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *emission, const char *source)
211{ 217{
212 fprintf(stdout, "C::signal sig=|%s| src=|%s|\n", emission, source); 218 fprintf(stdout, "C::signal sig=|%s| src=|%s|\n", emission, source);
213} 219}
@@ -219,26 +225,43 @@ _on_delete(Ecore_Evas *ee __UNUSED__)
219} 225}
220 226
221int 227int
222main(void) 228main(int argc __UNUSED__, char *argv[])
223{ 229{
224 Evas_Object *border, *bg; 230 char border_img_path[PATH_MAX];
225 Evas *evas; 231 char edje_file_path[PATH_MAX];
232 const char *edje_file = "sigtest.edj";
233 Ecore_Evas *ee;
234 Evas *evas;
235 Evas_Object *bg;
236 Evas_Object *border;
237 Evas_Object *edje_obj;
238 Eina_Prefix *pfx;
226 239
227 if (!ecore_evas_init()) 240 if (!ecore_evas_init())
228 return EXIT_FAILURE; 241 return EXIT_FAILURE;
229 242
230 if (!edje_init()) 243 if (!edje_init())
231 return EXIT_FAILURE; 244 goto shutdown_ecore_evas;
245
246 pfx = eina_prefix_new(argv[0], main,
247 "EDJE_EXAMPLES",
248 "edje/examples",
249 edje_file,
250 PACKAGE_BIN_DIR,
251 PACKAGE_LIB_DIR,
252 PACKAGE_DATA_DIR,
253 PACKAGE_DATA_DIR);
254 if (!pfx)
255 goto shutdown_edje;
232 256
233 /* this will give you a window with an Evas canvas under the first 257 /* this will give you a window with an Evas canvas under the first
234 * engine available */ 258 * engine available */
235 ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL); 259 ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
236 if (!ee) 260 if (!ee)
237 goto error; 261 goto free_prefix;
238 262
239 ecore_evas_callback_delete_request_set(ee, _on_delete); 263 ecore_evas_callback_delete_request_set(ee, _on_delete);
240 ecore_evas_title_set(ee, "Signals and wessages tester"); 264 ecore_evas_title_set(ee, "Signals and wessages tester");
241 ecore_evas_show(ee);
242 265
243 evas = ecore_evas_get(ee); 266 evas = ecore_evas_get(ee);
244 267
@@ -250,14 +273,14 @@ main(void)
250 ecore_evas_object_associate(ee, bg, ECORE_EVAS_OBJECT_ASSOCIATE_BASE); 273 ecore_evas_object_associate(ee, bg, ECORE_EVAS_OBJECT_ASSOCIATE_BASE);
251 274
252 evas_object_focus_set(bg, EINA_TRUE); 275 evas_object_focus_set(bg, EINA_TRUE);
253 evas_object_event_callback_add(
254 bg, EVAS_CALLBACK_KEY_DOWN, _on_keydown, NULL);
255 276
256 edje_obj = edje_object_add(evas); 277 edje_obj = edje_object_add(evas);
257 278
258 edje_object_message_handler_set(edje_obj, _on_message, NULL); 279 edje_object_message_handler_set(edje_obj, _on_message, NULL);
259 edje_object_signal_callback_add(edje_obj, "*", "*", _on_signal, NULL); 280 edje_object_signal_callback_add(edje_obj, "*", "*", _on_signal, NULL);
260 281
282 snprintf(edje_file_path, sizeof(edje_file_path),
283 "%s/examples/%s", eina_prefix_data_get(pfx), edje_file);
261 if (!edje_object_file_set(edje_obj, edje_file_path, "lua_base")) 284 if (!edje_object_file_set(edje_obj, edje_file_path, "lua_base"))
262 { 285 {
263 int err = edje_object_load_error_get(edje_obj); 286 int err = edje_object_load_error_get(edje_obj);
@@ -266,7 +289,7 @@ main(void)
266 errmsg); 289 errmsg);
267 290
268 evas_object_del(edje_obj); 291 evas_object_del(edje_obj);
269 goto error_edj; 292 goto free_prefix;
270 } 293 }
271 294
272 fprintf(stdout, "Loaded Edje object bound to group 'lua_base' from" 295 fprintf(stdout, "Loaded Edje object bound to group 'lua_base' from"
@@ -275,6 +298,13 @@ main(void)
275 evas_object_move(edje_obj, 20, 20); 298 evas_object_move(edje_obj, 20, 20);
276 evas_object_resize(edje_obj, WIDTH - 40, HEIGHT - 40); 299 evas_object_resize(edje_obj, WIDTH - 40, HEIGHT - 40);
277 evas_object_show(edje_obj); 300 evas_object_show(edje_obj);
301 ecore_evas_data_set(ee, "edje_obj", edje_obj);
302 ecore_evas_data_set(ee, "file_path", edje_file_path);
303
304 evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_keydown, ee);
305
306 snprintf(border_img_path, sizeof(border_img_path),
307 "%s/edje/examples/red.png", eina_prefix_data_get(pfx));
278 308
279 /* this is a border around the Edje object above, here just to 309 /* this is a border around the Edje object above, here just to
280 * emphasize its geometry */ 310 * emphasize its geometry */
@@ -287,23 +317,25 @@ main(void)
287 evas_object_move(border, 20 - 2, 20 - 2); 317 evas_object_move(border, 20 - 2, 20 - 2);
288 evas_object_show(border); 318 evas_object_show(border);
289 319
320 fprintf(stdout, commands);
321
322 ecore_evas_show(ee);
323
290 ecore_main_loop_begin(); 324 ecore_main_loop_begin();
291 325
326 eina_prefix_free(pfx);
292 ecore_evas_free(ee); 327 ecore_evas_free(ee);
293 ecore_evas_shutdown(); 328 ecore_evas_shutdown();
294 edje_shutdown(); 329 edje_shutdown();
295 return 0;
296
297error:
298 fprintf(stderr, "You got to have at least one evas engine built"
299 " and linked up to ecore-evas for this example to run"
300 " properly.\n");
301 ecore_evas_shutdown();
302 return -1;
303 330
304error_edj: 331 return EXIT_SUCCESS;
305 fprintf(stderr, "Failed to load sigtest.edj!\n");
306 332
333 free_prefix:
334 eina_prefix_free(pfx);
335 shutdown_edje:
336 edje_shutdown();
337 shutdown_ecore_evas:
307 ecore_evas_shutdown(); 338 ecore_evas_shutdown();
308 return -2; 339
340 return EXIT_FAILURE;
309} 341}
diff --git a/libraries/edje/src/lib/Edje.h b/libraries/edje/src/lib/Edje.h
index 6413014..1449d70 100644
--- a/libraries/edje/src/lib/Edje.h
+++ b/libraries/edje/src/lib/Edje.h
@@ -5,7 +5,7 @@ These routines are used for Edje.
5 5
6@mainpage Edje Library Documentation 6@mainpage Edje Library Documentation
7@version 1.1 7@version 1.1
8@date 2003-2011 8@date 2003-2012
9 9
10Please see the @ref authors page for contact details. 10Please see the @ref authors page for contact details.
11 11
@@ -19,7 +19,7 @@ Please see the @ref authors page for contact details.
19 19
20Edje is a complex graphical design & layout library. 20Edje is a complex graphical design & layout library.
21 21
22It doesn't pretend to do containing and regular layout like a widget 22It doesn't intend to do containing and regular layout like a widget
23set, but it is the base for such components. Based on the requirements 23set, but it is the base for such components. Based on the requirements
24of Enlightenment 0.17, Edje should serve all the purposes of creating 24of Enlightenment 0.17, Edje should serve all the purposes of creating
25visual elements (borders of windows, buttons, scrollbars, etc.) and 25visual elements (borders of windows, buttons, scrollbars, etc.) and
@@ -110,197 +110,11 @@ The application using Edje will then create an object in its Evas
110canvas and set the bundle file to use, specifying the @b group name to 110canvas and set the bundle file to use, specifying the @b group name to
111use. Edje will load such information and create all the required 111use. Edje will load such information and create all the required
112children objects with the specified properties as defined in each @b 112children objects with the specified properties as defined in each @b
113part of the given group. See the following annotated example: 113part of the given group. See the following example:
114@include edje_example.c
114 115
115@code 116The above example requires the following annotated source Edje file:
116 117@include edje_example.edc
117#include <Eina.h>
118#include <Evas.h>
119#include <Ecore.h>
120#include <Ecore_Evas.h>
121#include <Edje.h>
122
123#define WIDTH 320
124#define HEIGHT 240
125
126static Evas_Object *create_my_group(Evas *canvas, const char *text)
127{
128 Evas_Object *edje;
129
130 edje = edje_object_add(canvas);
131 if (!edje)
132 {
133 EINA_LOG_CRIT("could not create edje object!");
134 return NULL;
135 }
136
137 if (!edje_object_file_set(edje, "edje_example.edj", "my_group"))
138 {
139 int err = edje_object_load_error_get(edje);
140 const char *errmsg = edje_load_error_str(err);
141 EINA_LOG_ERR("could not load 'my_group' from edje_example.edj: %s",
142 errmsg);
143
144 evas_object_del(edje);
145 return NULL;
146 }
147
148 if (text)
149 {
150 if (!edje_object_part_text_set(edje, "text", text))
151 {
152 EINA_LOG_WARN("could not set the text. "
153 "Maybe part 'text' does not exist?");
154 }
155 }
156
157 evas_object_move(edje, 0, 0);
158 evas_object_resize(edje, WIDTH, HEIGHT);
159 evas_object_show(edje);
160 return edje;
161}
162
163int main(int argc, char *argv[])
164{
165 Ecore_Evas *window;
166 Evas *canvas;
167 Evas_Object *edje;
168 const char *text;
169
170 eina_init();
171 evas_init();
172 ecore_init();
173 ecore_evas_init();
174 edje_init();
175
176 window = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
177 if (!window)
178 {
179 EINA_LOG_CRIT("could not create window.");
180 return -1;
181 }
182 canvas = ecore_evas_get(window);
183
184 text = (argc > 1) ? argv[1] : NULL;
185
186 edje = create_my_group(canvas, text);
187 if (!edje)
188 return -2;
189
190 ecore_evas_show(window);
191 ecore_main_loop_begin();
192
193 evas_object_del(edje);
194 ecore_evas_free(window);
195
196 return 0;
197}
198@endcode
199
200It requires the following source Edje file:
201@code
202// compile: edje_cc edje_example.edc
203collections {
204 group {
205 name: "my_group"; // must be the same as in edje_example.c
206
207 parts {
208 part {
209 name: "background";
210 type: RECT; // plain boring rectangle
211 mouse_events: 0; // we don't need any mouse event on the background
212
213 // just one state "default"
214 description {
215 state: "default" 0.0; // must always exist
216 color: 255 255 255 255; // white
217
218 // define part coordinates:
219
220 rel1 { // top-left point at (0, 0) [WIDTH * 0 + 0, HEIGHT * 0 + 0]
221 relative: 0.0 0.0;
222 offset: 0 0;
223 }
224 rel2 { // bottom-right point at (WIDTH * 1.0 - 1, HEIGHT * 1.0 - 1)
225 relative: 1.0 1.0;
226 offset: -1 -1;
227 }
228 }
229 }
230
231 part {
232 name: "text";
233 type: TEXT;
234 mouse_events: 1; // we want to change the color on mouse-over
235
236 // 2 states, one "default" and another "over" to be used
237 // on mouse over effect
238
239 description {
240 state: "default" 0.0;
241 color: 255 0 0 255; // red
242
243 // define part coordinates:
244
245 rel1 { // top-left at (WIDTH * 0.1 + 5, HEIGHT * 0.2 + 10)
246 relative: 0.1 0.2;
247 offset: 5 10;
248 }
249 rel2 { // bottom-right at (WIDTH * 0.9 - 6, HEIGHT * 0.8 - 11)
250 relative: 0.9 0.8;
251 offset: -6 -11;
252 }
253
254 // define text specific state details
255 text {
256 font: "Sans"; // using fontconfig name!
257 size: 10;
258 text: "hello world";
259 }
260 }
261
262 description {
263 state: "over" 0.0;
264 inherit: "default" 0.0; // copy everything from "default" at this point
265
266 color: 0 255 0 255; // override color, now it is green
267 }
268 }
269
270 // do programs to change color on text mouse in/out (over)
271 programs {
272 program {
273 // what triggers this program:
274 signal: "mouse,in";
275 source: "text";
276
277 // what this program does:
278 action: STATE_SET "over" 0.0;
279 target: "text";
280
281 // do the state-set in a nice interpolation animation
282 // using linear time in 0.1 second
283 transition: LINEAR 0.1;
284 }
285
286 program {
287 // what triggers this program:
288 signal: "mouse,out";
289 source: "text";
290
291 // what this program does:
292 action: STATE_SET "default" 0.0;
293 target: "text";
294
295 // do the state-set in a nice interpolation animation
296 // using linear time in 0.1 second
297 transition: LINEAR 0.1;
298 }
299 }
300 }
301 }
302}
303@endcode
304 118
305 119
306One should save these files as edje_example.c and edje_example.edc then: 120One should save these files as edje_example.c and edje_example.edc then:
@@ -452,6 +266,10 @@ param in edje programs
452# undef EAPI 266# undef EAPI
453#endif 267#endif
454 268
269#ifdef HAVE_ECORE_IMF
270#include <Ecore_IMF.h>
271#endif
272
455#ifdef _WIN32 273#ifdef _WIN32
456# ifdef EFL_EDJE_BUILD 274# ifdef EFL_EDJE_BUILD
457# ifdef DLL_EXPORT 275# ifdef DLL_EXPORT
@@ -778,7 +596,7 @@ typedef enum _Edje_External_Param_Type
778{ 596{
779 EDJE_EXTERNAL_PARAM_TYPE_INT, /**< Parameter value is an integer. */ 597 EDJE_EXTERNAL_PARAM_TYPE_INT, /**< Parameter value is an integer. */
780 EDJE_EXTERNAL_PARAM_TYPE_DOUBLE, /**< Parameter value is a double. */ 598 EDJE_EXTERNAL_PARAM_TYPE_DOUBLE, /**< Parameter value is a double. */
781 EDJE_EXTERNAL_PARAM_TYPE_STRING, /**< Paramater value is a string. */ 599 EDJE_EXTERNAL_PARAM_TYPE_STRING, /**< Parameter value is a string. */
782 EDJE_EXTERNAL_PARAM_TYPE_BOOL, /**< Parameter value is boolean. */ 600 EDJE_EXTERNAL_PARAM_TYPE_BOOL, /**< Parameter value is boolean. */
783 EDJE_EXTERNAL_PARAM_TYPE_CHOICE, /**< Parameter value is one of a set of 601 EDJE_EXTERNAL_PARAM_TYPE_CHOICE, /**< Parameter value is one of a set of
784 predefined string choices. */ 602 predefined string choices. */
@@ -791,10 +609,10 @@ typedef enum _Edje_External_Param_Type
791 */ 609 */
792typedef enum _Edje_External_Param_Flags 610typedef enum _Edje_External_Param_Flags
793{ 611{
794 EDJE_EXTERNAL_PARAM_FLAGS_NONE = 0, /**< Propery is incapable of operations, this is used to catch bogus flags. */ 612 EDJE_EXTERNAL_PARAM_FLAGS_NONE = 0, /**< Property is incapable of operations, this is used to catch bogus flags. */
795 EDJE_EXTERNAL_PARAM_FLAGS_GET = (1 << 0), /**< Property can be read/get. */ 613 EDJE_EXTERNAL_PARAM_FLAGS_GET = (1 << 0), /**< Property can be read/get. */
796 EDJE_EXTERNAL_PARAM_FLAGS_SET = (1 << 1), /**< Property can be written/set. This only enables edje_object_part_external_param_set() and Embryo scripts. To enable the parameter being set from state description whenever it changes state, use #EDJE_EXTERNAL_PARAM_FLAGS_STATE. */ 614 EDJE_EXTERNAL_PARAM_FLAGS_SET = (1 << 1), /**< Property can be written/set. This only enables edje_object_part_external_param_set() and Embryo scripts. To enable the parameter being set from state description whenever it changes state, use #EDJE_EXTERNAL_PARAM_FLAGS_STATE. */
797 EDJE_EXTERNAL_PARAM_FLAGS_STATE = (1 << 2), /**< Property can be set from state dsecription. */ 615 EDJE_EXTERNAL_PARAM_FLAGS_STATE = (1 << 2), /**< Property can be set from state description. */
798 EDJE_EXTERNAL_PARAM_FLAGS_CONSTRUCTOR = (1 << 3), /**< This property is only set once when the object is constructed using its value from "default" 0.0 state description. Setting this overrides #EDJE_EXTERNAL_PARAM_FLAGS_STATE. */ 616 EDJE_EXTERNAL_PARAM_FLAGS_CONSTRUCTOR = (1 << 3), /**< This property is only set once when the object is constructed using its value from "default" 0.0 state description. Setting this overrides #EDJE_EXTERNAL_PARAM_FLAGS_STATE. */
799 EDJE_EXTERNAL_PARAM_FLAGS_REGULAR = (EDJE_EXTERNAL_PARAM_FLAGS_GET | 617 EDJE_EXTERNAL_PARAM_FLAGS_REGULAR = (EDJE_EXTERNAL_PARAM_FLAGS_GET |
800 EDJE_EXTERNAL_PARAM_FLAGS_SET | 618 EDJE_EXTERNAL_PARAM_FLAGS_SET |
@@ -817,6 +635,24 @@ typedef enum _Edje_Input_Panel_Layout
817 EDJE_INPUT_PANEL_LAYOUT_PASSWORD /**< Like normal, but no auto-correct, no auto-capitalization etc. @since 1.2 */ 635 EDJE_INPUT_PANEL_LAYOUT_PASSWORD /**< Like normal, but no auto-correct, no auto-capitalization etc. @since 1.2 */
818} Edje_Input_Panel_Layout; 636} Edje_Input_Panel_Layout;
819 637
638typedef enum _Edje_Input_Panel_Lang
639{
640 EDJE_INPUT_PANEL_LANG_AUTOMATIC, /**< Automatic @since 1.2 */
641 EDJE_INPUT_PANEL_LANG_ALPHABET /**< Alphabet @since 1.2 */
642} Edje_Input_Panel_Lang;
643
644typedef enum _Edje_Input_Panel_Return_Key_Type
645{
646 EDJE_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT, /**< Default @since 1.2 */
647 EDJE_INPUT_PANEL_RETURN_KEY_TYPE_DONE, /**< Done @since 1.2 */
648 EDJE_INPUT_PANEL_RETURN_KEY_TYPE_GO, /**< Go @since 1.2 */
649 EDJE_INPUT_PANEL_RETURN_KEY_TYPE_JOIN, /**< Join @since 1.2 */
650 EDJE_INPUT_PANEL_RETURN_KEY_TYPE_LOGIN, /**< Login @since 1.2 */
651 EDJE_INPUT_PANEL_RETURN_KEY_TYPE_NEXT, /**< Next @since 1.2 */
652 EDJE_INPUT_PANEL_RETURN_KEY_TYPE_SEARCH, /**< Search or magnifier icon @since 1.2 */
653 EDJE_INPUT_PANEL_RETURN_KEY_TYPE_SEND /**< Send @since 1.2 */
654} Edje_Input_Panel_Return_Key_Type;
655
820/** 656/**
821 * @brief Converts type identifier to string nicer representation. 657 * @brief Converts type identifier to string nicer representation.
822 * 658 *
@@ -886,18 +722,18 @@ struct _Edje_External_Param_Info
886 used. */ 722 used. */
887 union { 723 union {
888 struct { 724 struct {
889 int def, /**< Default value for the paramter. */ 725 int def, /**< Default value for the parameter. */
890 min, /**< Minimum value it can have. */ 726 min, /**< Minimum value it can have. */
891 max, /**< Maximum value it can have. */ 727 max, /**< Maximum value it can have. */
892 step; /**< Values will be a multiple of this. */ 728 step; /**< Values will be a multiple of this. */
893 } i; /**< Info about integer type parametrs. Use #EDJE_EXTERNAL_INT_UNSET 729 } i; /**< Info about integer type parameters. Use #EDJE_EXTERNAL_INT_UNSET
894 on any of them to indicate they are not defined.*/ 730 on any of them to indicate they are not defined.*/
895 struct { 731 struct {
896 double def, /**< Default value for the paramter. */ 732 double def, /**< Default value for the parameter. */
897 min, /**< Minimum value it can have. */ 733 min, /**< Minimum value it can have. */
898 max, /**< Maximum value it can have. */ 734 max, /**< Maximum value it can have. */
899 step; /**< Values will be a multiple of this. */ 735 step; /**< Values will be a multiple of this. */
900 } d; /**< Info about double type parametrs. Use 736 } d; /**< Info about double type parameters. Use
901#EDJE_EXTERNAL_DOUBLE_UNSET on any of them to indicate they are not defined.*/ 737#EDJE_EXTERNAL_DOUBLE_UNSET on any of them to indicate they are not defined.*/
902 struct { 738 struct {
903 const char *def; /**< Default value. */ 739 const char *def; /**< Default value. */
@@ -1054,6 +890,7 @@ typedef void (*Edje_Signal_Cb) (void *data, Evas_Object *obj, c
1054typedef void (*Edje_Text_Change_Cb) (void *data, Evas_Object *obj, const char *part); 890typedef void (*Edje_Text_Change_Cb) (void *data, Evas_Object *obj, const char *part);
1055typedef void (*Edje_Message_Handler_Cb) (void *data, Evas_Object *obj, Edje_Message_Type type, int id, void *msg); /**< Edje message handler callback functions's prototype definition. @c data will have the auxiliary data pointer set at the time the callback registration. @c obj will be a pointer the Edje object where the message comes from. @c type will identify the type of the given message and @c msg will be a pointer the message's contents, de facto, which depend on @c type. */ 891typedef void (*Edje_Message_Handler_Cb) (void *data, Evas_Object *obj, Edje_Message_Type type, int id, void *msg); /**< Edje message handler callback functions's prototype definition. @c data will have the auxiliary data pointer set at the time the callback registration. @c obj will be a pointer the Edje object where the message comes from. @c type will identify the type of the given message and @c msg will be a pointer the message's contents, de facto, which depend on @c type. */
1056typedef void (*Edje_Text_Filter_Cb) (void *data, Evas_Object *obj, const char *part, Edje_Text_Filter_Type type, char **text); 892typedef void (*Edje_Text_Filter_Cb) (void *data, Evas_Object *obj, const char *part, Edje_Text_Filter_Type type, char **text);
893typedef void (*Edje_Markup_Filter_Cb) (void *data, Evas_Object *obj, const char *part, char **text);
1057typedef Evas_Object *(*Edje_Item_Provider_Cb) (void *data, Evas_Object *obj, const char *part, const char *item); 894typedef Evas_Object *(*Edje_Item_Provider_Cb) (void *data, Evas_Object *obj, const char *part, const char *item);
1058 895
1059/** 896/**
@@ -1187,7 +1024,7 @@ EAPI const char *edje_fontset_append_get (void);
1187 * edje_object_scale_set(), that factor will @b override the global 1024 * edje_object_scale_set(), that factor will @b override the global
1188 * one. 1025 * one.
1189 * 1026 *
1190 * Scaling affects the values of mininum/maximum @b part sizes, which 1027 * Scaling affects the values of minimum/maximum @b part sizes, which
1191 * are @b multiplied by it. Font sizes are scaled, too. 1028 * are @b multiplied by it. Font sizes are scaled, too.
1192 * 1029 *
1193 * @warning Only parts which, at EDC level, had the @c "scale" 1030 * @warning Only parts which, at EDC level, had the @c "scale"
@@ -1244,7 +1081,7 @@ EAPI void edje_password_show_last_timeout_set(double password_show_last_timeout)
1244 * 1081 *
1245 * @param obj A handle to an Edje object 1082 * @param obj A handle to an Edje object
1246 * @param scale The scaling factor (the default value is @c 0.0, 1083 * @param scale The scaling factor (the default value is @c 0.0,
1247 * meaning indivinual scaling @b not set) 1084 * meaning individual scaling @b not set)
1248 * 1085 *
1249 * This function sets an @b individual scaling factor on the @a obj 1086 * This function sets an @b individual scaling factor on the @a obj
1250 * Edje object. This property (or Edje's global scaling factor, when 1087 * Edje object. This property (or Edje's global scaling factor, when
@@ -1663,9 +1500,9 @@ EAPI void edje_box_layout_register (const char *name, Evas_Object
1663 * 1500 *
1664 * @note You can get a callback every time edje re-calculates the object 1501 * @note You can get a callback every time edje re-calculates the object
1665 * (either due to animation or some kind of signal or input). This is called 1502 * (either due to animation or some kind of signal or input). This is called
1666 * in-line just after the recalculation has occured. It is a good idea not 1503 * in-line just after the recalculation has occurred. It is a good idea not
1667 * to go and delete or alter the object inside this callbacks, simply make 1504 * to go and delete or alter the object inside this callbacks, simply make
1668 * a note that the recalculation has taken place and then do somethnig about 1505 * a note that the recalculation has taken place and then do something about
1669 * it outside the callback. to register a callback use code like: 1506 * it outside the callback. to register a callback use code like:
1670 * 1507 *
1671 * @code 1508 * @code
@@ -1883,7 +1720,7 @@ EAPI Eina_Bool edje_object_preload (Evas_Object *obj, Eina_Bool c
1883 * buttons on an interface, you'd be registering for notifications on 1720 * buttons on an interface, you'd be registering for notifications on
1884 * events of mouse buttons being pressed down on either of those parts 1721 * events of mouse buttons being pressed down on either of those parts
1885 * (those events all have the @c "mouse,down," common prefix on their 1722 * (those events all have the @c "mouse,down," common prefix on their
1886 * names, with a suffix giving the button number). The actual emisson 1723 * names, with a suffix giving the button number). The actual emission
1887 * and source strings of an event will be passed in as the @a emission 1724 * and source strings of an event will be passed in as the @a emission
1888 * and @a source parameters of the callback function (e.g. @c 1725 * and @a source parameters of the callback function (e.g. @c
1889 * "mouse,down,2" and @c "button.close"), for each of those events. 1726 * "mouse,down,2" and @c "button.close"), for each of those events.
@@ -2214,6 +2051,27 @@ EAPI Eina_Bool edje_object_text_class_set (Evas_Object *obj, const c
2214EAPI void edje_object_size_min_get (const Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh); 2051EAPI void edje_object_size_min_get (const Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
2215 2052
2216/** 2053/**
2054 * @brief Edje will automatically update the size hints on itself.
2055 *
2056 * @param obj A handle to an Edje object.
2057 * @param update Wether or not update the size hints.
2058 *
2059 * By default edje doesn't set size hints on itself. With this function
2060 * call, it will do so if update is true. Be carefully, it cost a lot to
2061 * trigger this feature as it will recalc the object every time it make
2062 * sense to be sure that's its minimal size hint is always accurate.
2063 */
2064EAPI void edje_object_update_hints_set(Evas_Object *obj, Eina_Bool update);
2065
2066/**
2067 * @brief Wether or not Edje will update size hints on itself.
2068 *
2069 * @param obj A handle to an Edje object.
2070 * @return @c true if does, @c false if it doesn't.
2071 */
2072EAPI Eina_Bool edje_object_update_hints_get(Evas_Object *obj);
2073
2074/**
2217 * @brief Get the maximum size specified -- as an EDC property -- for a 2075 * @brief Get the maximum size specified -- as an EDC property -- for a
2218 * given Edje object 2076 * given Edje object
2219 * 2077 *
@@ -2362,12 +2220,12 @@ EAPI Eina_Bool edje_object_part_exists (const Evas_Object *obj, c
2362 * @return A pointer to the Evas object implementing the given part, 2220 * @return A pointer to the Evas object implementing the given part,
2363 * or @c NULL on failure (e.g. the given part doesn't exist) 2221 * or @c NULL on failure (e.g. the given part doesn't exist)
2364 * 2222 *
2365 * This function gets a pointer the Evas object corresponding to a 2223 * This function gets a pointer of the Evas object corresponding to a
2366 * given part in the @p obj object's group. 2224 * given part in the @p obj object's group.
2367 * 2225 *
2368 * You should @b never modify the state of the returned object (with 2226 * You should @b never modify the state of the returned object (with
2369 * @c evas_object_move() or @c evas_object_hide() for example), 2227 * @c evas_object_move() or @c evas_object_hide() for example),
2370 * because it's meant to be managed be Edje, solely. You are safe to 2228 * because it's meant to be managed by Edje, solely. You are safe to
2371 * query information about its current state (with @c 2229 * query information about its current state (with @c
2372 * evas_object_visible_get() or @c evas_object_color_get() for 2230 * evas_object_visible_get() or @c evas_object_color_get() for
2373 * example), though. 2231 * example), though.
@@ -2448,6 +2306,43 @@ EAPI Eina_Bool edje_object_part_text_set (Evas_Object *obj, const c
2448EAPI const char *edje_object_part_text_get (const Evas_Object *obj, const char *part); 2306EAPI const char *edje_object_part_text_get (const Evas_Object *obj, const char *part);
2449 2307
2450/** 2308/**
2309 * @brief Set the style of the
2310 *
2311 * @param obj A valid Evas_Object handle
2312 * @param part The part name
2313 * @param style The style to set (textblock conventions).
2314 *
2315 * This function sets the style associated with the textblock part.
2316 *
2317 * @since 1.2.0
2318 */
2319EAPI void edje_object_part_text_style_user_push(Evas_Object *obj, const char *part, const char *style);
2320
2321/**
2322 * @brief Return the text of the object part.
2323 *
2324 * @param obj A valid Evas_Object handle
2325 * @param part The part name
2326 *
2327 * @return The text string
2328 *
2329 * This function returns the style associated with the textblock part.
2330 *
2331 * @since 1.2.0
2332 */
2333EAPI const char *edje_object_part_text_style_user_peek(const Evas_Object *obj, const char *part);
2334
2335/**
2336 * @brief Delete the top style form the user style stack.
2337 *
2338 * @param obj A valid Evas_Object handle
2339 * @param part The part name
2340 *
2341 * @since 1.2.0
2342 */
2343EAPI void edje_object_part_text_style_user_pop(Evas_Object *obj, const char *part);
2344
2345/**
2451 * @brief Sets the raw (non escaped) text for an object part. 2346 * @brief Sets the raw (non escaped) text for an object part.
2452 * 2347 *
2453 * @param obj A valid Evas Object handle 2348 * @param obj A valid Evas Object handle
@@ -2615,6 +2510,15 @@ EAPI Eina_Bool edje_object_part_text_item_geometry_get (const Evas_
2615EAPI void edje_object_part_text_cursor_geometry_get (const Evas_Object *obj, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); 2510EAPI void edje_object_part_text_cursor_geometry_get (const Evas_Object *obj, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
2616 2511
2617/** 2512/**
2513 * @brief Deletes the selection and emits a change event.
2514 *
2515 * @param obj A valid Evas_Object handle
2516 * @param part The part name
2517 * @since 1.2.0
2518 */
2519EAPI void edje_object_part_text_user_insert (const Evas_Object *obj, const char *part, const char *text);
2520
2521/**
2618 * @brief Enables selection if the entry is an EXPLICIT selection mode 2522 * @brief Enables selection if the entry is an EXPLICIT selection mode
2619 * type. 2523 * type.
2620 * 2524 *
@@ -2813,8 +2717,33 @@ EAPI void edje_object_part_text_cursor_pos_set (Evas_Ob
2813EAPI int edje_object_part_text_cursor_pos_get (const Evas_Object *obj, const char *part, Edje_Cursor cur); 2717EAPI int edje_object_part_text_cursor_pos_get (const Evas_Object *obj, const char *part, Edje_Cursor cur);
2814 2718
2815/** 2719/**
2720 * @brief Reset the input method context if needed.
2721 *
2722 * This can be necessary in the case where modifying the buffer would confuse on-going input method behavior
2723 *
2724 * @param obj A valid Evas_Object handle
2725 * @param part The part name
2726 * @since 1.2.0
2727 */
2728EAPI void edje_object_part_text_imf_context_reset (const Evas_Object *obj, const char *part);
2729
2730/**
2731 * @brief Get the input method context in entry.
2732 *
2733 * If ecore_imf was not available when edje was compiled, this function returns NULL
2734 * otherwise, the returned pointer is an Ecore_IMF *
2735 *
2736 * @param obj A valid Evas_Object handle
2737 * @param part The part name
2738 *
2739 * @return The input method context (Ecore_IMF_Context *) in entry
2740 * @since 1.2.0
2741 */
2742EAPI void *edje_object_part_text_imf_context_get (const Evas_Object *obj, const char *part);
2743
2744/**
2816 * @brief Set the layout of the input panel. 2745 * @brief Set the layout of the input panel.
2817 * 2746 *
2818 * The layout of the input panel or virtual keyboard can make it easier or 2747 * The layout of the input panel or virtual keyboard can make it easier or
2819 * harder to enter content. This allows you to hint what kind of input you 2748 * harder to enter content. This allows you to hint what kind of input you
2820 * are expecting to enter and thus have the input panel automatically 2749 * are expecting to enter and thus have the input panel automatically
@@ -2825,7 +2754,7 @@ EAPI int edje_object_part_text_cursor_pos_get (const E
2825 * @param layout layout type 2754 * @param layout layout type
2826 * @since 1.1 2755 * @since 1.1
2827 */ 2756 */
2828EAPI void edje_object_part_text_input_panel_layout_set (const Evas_Object *obj, const char *part, Edje_Input_Panel_Layout layout); 2757EAPI void edje_object_part_text_input_panel_layout_set (Evas_Object *obj, const char *part, Edje_Input_Panel_Layout layout);
2829 2758
2830/** 2759/**
2831 * @brief Get the layout of the input panel. 2760 * @brief Get the layout of the input panel.
@@ -2848,7 +2777,7 @@ EAPI Edje_Input_Panel_Layout edje_object_part_text_input_panel_layout_get (const
2848 * @param autocapital_type The type of autocapitalization 2777 * @param autocapital_type The type of autocapitalization
2849 * @since 1.1.0 2778 * @since 1.1.0
2850 */ 2779 */
2851EAPI void edje_object_part_text_autocapital_type_set (const Evas_Object *obj, const char *part, Edje_Text_Autocapital_Type autocapital_type); 2780EAPI void edje_object_part_text_autocapital_type_set (Evas_Object *obj, const char *part, Edje_Text_Autocapital_Type autocapital_type);
2852 2781
2853/** 2782/**
2854 * @brief Retrieves the autocapitalization type 2783 * @brief Retrieves the autocapitalization type
@@ -2861,6 +2790,26 @@ EAPI void edje_object_part_text_autocapital_type_set (const Evas_
2861EAPI Edje_Text_Autocapital_Type edje_object_part_text_autocapital_type_get (const Evas_Object *obj, const char *part); 2790EAPI Edje_Text_Autocapital_Type edje_object_part_text_autocapital_type_get (const Evas_Object *obj, const char *part);
2862 2791
2863/** 2792/**
2793 * @brief Set whether the prediction is allowed or not.
2794 *
2795 * @param obj A valid Evas_Object handle
2796 * @param part The part name
2797 * @param prediction If true, the prediction feature is allowed.
2798 * @since 1.2.0
2799 */
2800EAPI void edje_object_part_text_prediction_allow_set (Evas_Object *obj, const char *part, Eina_Bool prediction);
2801
2802/**
2803 * @brief Get whether the prediction is allowed or not.
2804 *
2805 * @param obj A valid Evas_Object handle
2806 * @param part The part name
2807 * @return EINA_TRUE if prediction feature is allowed.
2808 * @since 1.2.0
2809 */
2810EAPI Eina_Bool edje_object_part_text_prediction_allow_get (const Evas_Object *obj, const char *part);
2811
2812/**
2864 * @brief Sets the attribute to show the input panel automatically. 2813 * @brief Sets the attribute to show the input panel automatically.
2865 * 2814 *
2866 * @param obj A valid Evas_Object handle 2815 * @param obj A valid Evas_Object handle
@@ -2868,7 +2817,7 @@ EAPI Edje_Text_Autocapital_Type edje_object_part_text_autocapital_type_get (cons
2868 * @param enabled If true, the input panel is appeared when entry is clicked or has a focus 2817 * @param enabled If true, the input panel is appeared when entry is clicked or has a focus
2869 * @since 1.1.0 2818 * @since 1.1.0
2870 */ 2819 */
2871EAPI void edje_object_part_text_input_panel_enabled_set (const Evas_Object *obj, const char *part, Eina_Bool enabled); 2820EAPI void edje_object_part_text_input_panel_enabled_set (Evas_Object *obj, const char *part, Eina_Bool enabled);
2872 2821
2873/** 2822/**
2874 * @brief Retrieve the attribute to show the input panel automatically. 2823 * @brief Retrieve the attribute to show the input panel automatically.
@@ -2882,6 +2831,125 @@ EAPI void edje_object_part_text_input_panel_enabled_set (const Evas_
2882EAPI Eina_Bool edje_object_part_text_input_panel_enabled_get (const Evas_Object *obj, const char *part); 2831EAPI Eina_Bool edje_object_part_text_input_panel_enabled_get (const Evas_Object *obj, const char *part);
2883 2832
2884/** 2833/**
2834 * @brief Show the input panel (virtual keyboard) based on the input panel property such as layout, autocapital types, and so on.
2835 *
2836 * Note that input panel is shown or hidden automatically according to the focus state.
2837 * This API can be used in the case of manually controlling by using edje_object_part_text_input_panel_enabled_set.
2838 *
2839 * @param obj A valid Evas_Object handle
2840 * @param part The part name
2841 * @since 1.2.0
2842 */
2843EAPI void edje_object_part_text_input_panel_show(const Evas_Object *obj, const char *part);
2844
2845/**
2846 * @brief Hide the input panel (virtual keyboard).
2847 * @see edje_object_part_text_input_panel_show
2848 *
2849 * Note that input panel is shown or hidden automatically according to the focus state.
2850 * This API can be used in the case of manually controlling by using edje_object_part_text_input_panel_enabled_set.
2851 *
2852 * @param obj A valid Evas_Object handle
2853 * @param part The part name
2854 * @since 1.2.0
2855 */
2856EAPI void edje_object_part_text_input_panel_hide(const Evas_Object *obj, const char *part);
2857
2858/**
2859 * Set the language mode of the input panel.
2860 *
2861 * This API can be used if you want to show the Alphabet keyboard.
2862 *
2863 * @param obj A valid Evas_Object handle
2864 * @param part The part name
2865 * @param lang the language to be set to the input panel.
2866 * @since 1.2.0
2867 */
2868EAPI void edje_object_part_text_input_panel_language_set(Evas_Object *obj, const char *part, Edje_Input_Panel_Lang lang);
2869
2870/**
2871 * Get the language mode of the input panel.
2872 *
2873 * See @ref edje_object_part_text_input_panel_language_set for more details.
2874 *
2875 * @param obj A valid Evas_Object handle
2876 * @param part The part name
2877 * @return input panel language type
2878 * @since 1.2.0
2879 */
2880EAPI Edje_Input_Panel_Lang edje_object_part_text_input_panel_language_get(const Evas_Object *obj, const char *part);
2881
2882/**
2883 * Set the input panel-specific data to deliver to the input panel.
2884 *
2885 * This API is used by applications to deliver specific data to the input panel.
2886 * The data format MUST be negotiated by both application and the input panel.
2887 * The size and format of data are defined by the input panel.
2888 *
2889 * @param obj A valid Evas_Object handle
2890 * @param part The part name
2891 * @param data The specific data to be set to the input panel.
2892 * @param len the length of data, in bytes, to send to the input panel
2893 * @since 1.2.0
2894 */
2895EAPI void edje_object_part_text_input_panel_imdata_set(Evas_Object *obj, const char *part, const void *data, int len);
2896
2897/**
2898 * Get the specific data of the current active input panel.
2899 *
2900 * @param obj A valid Evas_Object handle
2901 * @param part The part name
2902 * @param data The specific data to be got from the input panel
2903 * @param len The length of data
2904 * @since 1.2.0
2905 */
2906EAPI void edje_object_part_text_input_panel_imdata_get(const Evas_Object *obj, const char *part, void *data, int *len);
2907
2908/**
2909 * Set the "return" key type. This type is used to set string or icon on the "return" key of the input panel.
2910 *
2911 * An input panel displays the string or icon associated with this type
2912 *
2913 * @param obj A valid Evas_Object handle
2914 * @param part The part name
2915 * @param return_key_type The type of "return" key on the input panel
2916 * @since 1.2.0
2917 */
2918EAPI void edje_object_part_text_input_panel_return_key_type_set(Evas_Object *obj, const char *part, Edje_Input_Panel_Return_Key_Type return_key_type);
2919
2920/**
2921 * Get the "return" key type.
2922 *
2923 * @see edje_object_part_text_input_panel_return_key_type_set() for more details
2924 *
2925 * @param obj A valid Evas_Object handle
2926 * @param part The part name
2927 * @return The type of "return" key on the input panel
2928 * @since 1.2.0
2929 */
2930EAPI Edje_Input_Panel_Return_Key_Type edje_object_part_text_input_panel_return_key_type_get(const Evas_Object *obj, const char *part);
2931
2932/**
2933 * Set the return key on the input panel to be disabled.
2934 *
2935 * @param obj A valid Evas_Object handle
2936 * @param part The part name
2937 * @param disabled The state
2938 * @since 1.2.0
2939 */
2940EAPI void edje_object_part_text_input_panel_return_key_disabled_set(Evas_Object *obj, const char *part, Eina_Bool disabled);
2941
2942/**
2943 * Get whether the return key on the input panel should be disabled or not.
2944 *
2945 * @param obj A valid Evas_Object handle
2946 * @param part The part name
2947 * @return EINA_TRUE if it should be disabled
2948 * @since 1.2.0
2949 */
2950EAPI Eina_Bool edje_object_part_text_input_panel_return_key_disabled_get(const Evas_Object *obj, const char *part);
2951
2952/**
2885 * Add a filter function for newly inserted text. 2953 * Add a filter function for newly inserted text.
2886 * 2954 *
2887 * Whenever text is inserted (not the same as set) into the given @p part, 2955 * Whenever text is inserted (not the same as set) into the given @p part,
@@ -2897,8 +2965,20 @@ EAPI Eina_Bool edje_object_part_text_input_panel_enabled_get (const Evas_
2897 * will make Edje break out of the filter cycle and reject the inserted 2965 * will make Edje break out of the filter cycle and reject the inserted
2898 * text. 2966 * text.
2899 * 2967 *
2968 * @warning This function will be deprecated because of difficulty in use.
2969 * The type(format, text, or markup) of text should be always
2970 * checked in the filter function for correct filtering.
2971 * Please use edje_object_text_markup_filter_callback_add() instead. There
2972 * is no need to check the type of text in the filter function
2973 * because the text is always markup.
2974 * @warning If you use this function with
2975 * edje_object_text_markup_filter_callback_add() together, all
2976 * Edje_Text_Filter_Cb functions and Edje_Markup_Filter_Cb functions
2977 * will be executed, and then filtered text will be inserted.
2978 *
2900 * @see edje_object_text_insert_filter_callback_del 2979 * @see edje_object_text_insert_filter_callback_del
2901 * @see edje_object_text_insert_filter_callback_del_full 2980 * @see edje_object_text_insert_filter_callback_del_full
2981 * @see edje_object_text_markup_filter_callback_add
2902 * 2982 *
2903 * @param obj A valid Evas_Object handle 2983 * @param obj A valid Evas_Object handle
2904 * @param part The part name 2984 * @param part The part name
@@ -2920,7 +3000,7 @@ EAPI void edje_object_text_insert_filter_callback_add (Evas_Ob
2920 * @param part The part name 3000 * @param part The part name
2921 * @param func The function callback to remove 3001 * @param func The function callback to remove
2922 * 3002 *
2923 * @return The user data pointer if succesful, or NULL otherwise 3003 * @return The user data pointer if successful, or NULL otherwise
2924 */ 3004 */
2925EAPI void *edje_object_text_insert_filter_callback_del (Evas_Object *obj, const char *part, Edje_Text_Filter_Cb func); 3005EAPI void *edje_object_text_insert_filter_callback_del (Evas_Object *obj, const char *part, Edje_Text_Filter_Cb func);
2926 3006
@@ -2939,11 +3019,82 @@ EAPI void *edje_object_text_insert_filter_callback_del (Evas_Ob
2939 * @param func The function callback to remove 3019 * @param func The function callback to remove
2940 * @param data The data passed to the callback function 3020 * @param data The data passed to the callback function
2941 * 3021 *
2942 * @return The same data pointer if succesful, or NULL otherwise 3022 * @return The same data pointer if successful, or NULL otherwise
2943 */ 3023 */
2944EAPI void *edje_object_text_insert_filter_callback_del_full (Evas_Object *obj, const char *part, Edje_Text_Filter_Cb func, void *data); 3024EAPI void *edje_object_text_insert_filter_callback_del_full (Evas_Object *obj, const char *part, Edje_Text_Filter_Cb func, void *data);
2945 3025
2946/** 3026/**
3027 * Add a markup filter function for newly inserted text.
3028 *
3029 * Whenever text is inserted (not the same as set) into the given @p part,
3030 * the list of markup filter functions will be called to decide if and how
3031 * the new text will be accepted.
3032 * The text parameter in the @p func filter is always markup. It can be
3033 * modified by the user and it's up to him to free the one passed if he's to
3034 * change the pointer. If doing so, the newly set text should be malloc'ed,
3035 * as once all the filters are called Edje will free it.
3036 * If the text is to be rejected, freeing it and setting the pointer to NULL
3037 * will make Edje break out of the filter cycle and reject the inserted
3038 * text.
3039 * This function is different from edje_object_text_insert_filter_callback_add()
3040 * in that the text parameter in the @p fucn filter is always markup.
3041 *
3042 * @warning If you use this function with
3043 * edje_object_text_insert_filter_callback_add() togehter, all
3044 * Edje_Text_Filter_Cb functions and Edje_Markup_Filter_Cb functions
3045 * will be executed, and then filtered text will be inserted.
3046 *
3047 * @see edje_object_text_markup_filter_callback_del
3048 * @see edje_object_text_markup_filter_callback_del_full
3049 * @see edje_object_text_insert_filter_callback_add
3050 *
3051 * @param obj A valid Evas_Object handle
3052 * @param part The part name
3053 * @param func The callback function that will act as markup filter
3054 * @param data User provided data to pass to the filter function
3055 * @since 1.2.0
3056 */
3057EAPI void edje_object_text_markup_filter_callback_add(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func, void *data);
3058
3059/**
3060 * Delete a function from the markup filter list.
3061 *
3062 * Delete the given @p func filter from the list in @p part. Returns
3063 * the user data pointer given when added.
3064 *
3065 * @see edje_object_text_markup_filter_callback_add
3066 * @see edje_object_text_markup_filter_callback_del_full
3067 *
3068 * @param obj A valid Evas_Object handle
3069 * @param part The part name
3070 * @param func The function callback to remove
3071 *
3072 * @return The user data pointer if successful, or NULL otherwise
3073 * @since 1.2.0
3074 */
3075EAPI void *edje_object_text_markup_filter_callback_del(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func);
3076
3077/**
3078 * Delete a function and matching user data from the markup filter list.
3079 *
3080 * Delete the given @p func filter and @p data user data from the list
3081 * in @p part.
3082 * Returns the user data pointer given when added.
3083 *
3084 * @see edje_object_text_markup_filter_callback_add
3085 * @see edje_object_text_markup_filter_callback_del
3086 *
3087 * @param obj A valid Evas_Object handle
3088 * @param part The part name
3089 * @param func The function callback to remove
3090 * @param data The data passed to the callback function
3091 *
3092 * @return The same data pointer if successful, or NULL otherwise
3093 * @since 1.2.0
3094 */
3095EAPI void *edje_object_text_markup_filter_callback_del_full(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func, void *data);
3096
3097/**
2947 * @brief Swallows an object into the edje. 3098 * @brief Swallows an object into the edje.
2948 * 3099 *
2949 * @param obj A valid Evas_Object handle 3100 * @param obj A valid Evas_Object handle
@@ -3244,7 +3395,7 @@ EAPI Eina_Bool edje_object_part_external_param_set (Evas_Ob
3244 * 3395 *
3245 * Parts of type external may carry extra properties that have 3396 * Parts of type external may carry extra properties that have
3246 * meanings defined by the external plugin. For instance, it may be a 3397 * meanings defined by the external plugin. For instance, it may be a
3247 * string that defines a button label. This property can be modifed by 3398 * string that defines a button label. This property can be modified by
3248 * state parameters, by explicit calls to 3399 * state parameters, by explicit calls to
3249 * edje_object_part_external_param_set() or getting the actual object 3400 * edje_object_part_external_param_set() or getting the actual object
3250 * with edje_object_part_external_object_get() and calling native 3401 * with edje_object_part_external_object_get() and calling native
@@ -3850,8 +4001,8 @@ EAPI const Edje_External_Param_Info *edje_external_param_info_get (const char
3850 * This sets the parameters of the perspective transformation. X, Y and Z 4001 * This sets the parameters of the perspective transformation. X, Y and Z
3851 * values are used. The px and py points specify the "infinite distance" point 4002 * values are used. The px and py points specify the "infinite distance" point
3852 * in the 3D conversion (where all lines converge to like when artists draw 4003 * in the 3D conversion (where all lines converge to like when artists draw
3853 * 3D by hand). The @p z0 value specifis the z value at which there is a 1:1 4004 * 3D by hand). The @p z0 value specifies the z value at which there is a 1:1
3854 * mapping between spatial coorinates and screen coordinates. Any points 4005 * mapping between spatial coordinates and screen coordinates. Any points
3855 * on this z value will not have their X and Y values modified in the transform. 4006 * on this z value will not have their X and Y values modified in the transform.
3856 * Those further away (Z value higher) will shrink into the distance, and 4007 * Those further away (Z value higher) will shrink into the distance, and
3857 * those less than this value will expand and become bigger. The @p foc value 4008 * those less than this value will expand and become bigger. The @p foc value
@@ -3861,8 +4012,8 @@ EAPI const Edje_External_Param_Info *edje_external_param_info_get (const char
3861 * control and @p foc must be greater than 0. 4012 * control and @p foc must be greater than 0.
3862 * 4013 *
3863 * @param m map to change. 4014 * @param m map to change.
3864 * @param px The pespective distance X coordinate 4015 * @param px The perspective distance X coordinate
3865 * @param py The pespective distance Y coordinate 4016 * @param py The perspective distance Y coordinate
3866 * @param z0 The "0" z plane value 4017 * @param z0 The "0" z plane value
3867 * @param foc The focal distance 4018 * @param foc The focal distance
3868 */ 4019 */
diff --git a/libraries/edje/src/lib/Makefile.in b/libraries/edje/src/lib/Makefile.in
index e67d90c..cf73390 100644
--- a/libraries/edje/src/lib/Makefile.in
+++ b/libraries/edje/src/lib/Makefile.in
@@ -230,6 +230,8 @@ PACKAGE_URL = @PACKAGE_URL@
230PACKAGE_VERSION = @PACKAGE_VERSION@ 230PACKAGE_VERSION = @PACKAGE_VERSION@
231PATH_SEPARATOR = @PATH_SEPARATOR@ 231PATH_SEPARATOR = @PATH_SEPARATOR@
232PKG_CONFIG = @PKG_CONFIG@ 232PKG_CONFIG = @PKG_CONFIG@
233PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
234PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
233PYTHON = @PYTHON@ 235PYTHON = @PYTHON@
234PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 236PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
235PYTHON_PLATFORM = @PYTHON_PLATFORM@ 237PYTHON_PLATFORM = @PYTHON_PLATFORM@
diff --git a/libraries/edje/src/lib/edje_cache.c b/libraries/edje/src/lib/edje_cache.c
index 0ce6b30..02d16b5 100644
--- a/libraries/edje/src/lib/edje_cache.c
+++ b/libraries/edje/src/lib/edje_cache.c
@@ -76,12 +76,16 @@ _edje_file_coll_open(Edje_File *edf, const char *coll)
76 edc->references = 1; 76 edc->references = 1;
77 edc->part = ce->entry; 77 edc->part = ce->entry;
78 78
79 /* For Edje file build with Edje 1.0, people expect text.align to be 0.0 0.0 */ 79 /* For Edje file build with Edje 1.0 */
80 if (edf->version <= 3 && edf->minor <= 1) 80 if (edf->version <= 3 && edf->minor <= 1)
81 { 81 {
82 /* This will preserve previous rendering */ 82 /* This will preserve previous rendering */
83 unsigned int i; 83 unsigned int i;
84 84
85 /* people expect signal to not be broadcasted */
86 edc->broadcast_signal = EINA_FALSE;
87
88 /* people expect text.align to be 0.0 0.0 */
85 for (i = 0; i < edc->parts_count; ++i) 89 for (i = 0; i < edc->parts_count; ++i)
86 { 90 {
87 if (edc->parts[i]->type == EDJE_PART_TYPE_TEXTBLOCK) 91 if (edc->parts[i]->type == EDJE_PART_TYPE_TEXTBLOCK)
diff --git a/libraries/edje/src/lib/edje_calc.c b/libraries/edje/src/lib/edje_calc.c
index 213e266..6aa6336 100644
--- a/libraries/edje/src/lib/edje_calc.c
+++ b/libraries/edje/src/lib/edje_calc.c
@@ -66,7 +66,7 @@ _edje_part_pos_set(Edje *ed, Edje_Real_Part *ep, int mode, FLOAT_T pos, FLOAT_T
66 break; 66 break;
67 case EDJE_TWEEN_MODE_DECELERATE: 67 case EDJE_TWEEN_MODE_DECELERATE:
68 npos = FROM_DOUBLE(ecore_animator_pos_map(TO_DOUBLE(pos), 68 npos = FROM_DOUBLE(ecore_animator_pos_map(TO_DOUBLE(pos),
69 ECORE_POS_MAP_DECELERATE, 69 ECORE_POS_MAP_DECELERATE,
70 0.0, 0.0)); 70 0.0, 0.0));
71 break; 71 break;
72 case EDJE_TWEEN_MODE_LINEAR: 72 case EDJE_TWEEN_MODE_LINEAR:
@@ -110,7 +110,7 @@ _edje_part_pos_set(Edje *ed, Edje_Real_Part *ep, int mode, FLOAT_T pos, FLOAT_T
110 npos = fp_pos; 110 npos = fp_pos;
111 break; 111 break;
112 } 112 }
113#endif 113#endif
114 if (npos == ep->description_pos) return; 114 if (npos == ep->description_pos) return;
115 115
116 ep->description_pos = npos; 116 ep->description_pos = npos;
@@ -564,7 +564,7 @@ _edje_part_description_apply(Edje *ed, Edje_Real_Part *ep, const char *d1, doubl
564 564
565 _edje_real_part_rel_to_apply(ed, ep, ep->param2); 565 _edje_real_part_rel_to_apply(ed, ep, ep->param2);
566 566
567 if (ep->description_pos != 0.0) 567 if (ep->description_pos > FROM_DOUBLE(0.0))
568 ep->chosen_description = epd2; 568 ep->chosen_description = epd2;
569 } 569 }
570 570
@@ -572,6 +572,7 @@ _edje_part_description_apply(Edje *ed, Edje_Real_Part *ep, const char *d1, doubl
572 ep->part->type == EDJE_PART_TYPE_EXTERNAL) 572 ep->part->type == EDJE_PART_TYPE_EXTERNAL)
573 _edje_external_recalc_apply(ed, ep, NULL, chosen_desc); 573 _edje_external_recalc_apply(ed, ep, NULL, chosen_desc);
574 574
575 ed->recalc_hints = 1;
575 ed->dirty = 1; 576 ed->dirty = 1;
576 ed->recalc_call = 1; 577 ed->recalc_call = 1;
577#ifdef EDJE_CALC_CACHE 578#ifdef EDJE_CALC_CACHE
@@ -650,6 +651,16 @@ _edje_recalc_do(Edje *ed)
650 else 651 else
651 evas_object_smart_need_recalculate_set(ed->obj, need_calc); 652 evas_object_smart_need_recalculate_set(ed->obj, need_calc);
652 ed->recalc_call = 0; 653 ed->recalc_call = 0;
654
655 if (ed->update_hints && ed->recalc_hints && !ed->calc_only)
656 {
657 Evas_Coord w, h;
658
659 ed->recalc_hints = 0;
660
661 edje_object_size_min_calc(ed->obj, &w, &h);
662 evas_object_size_hint_min_set(ed->obj, w, h);
663 }
653} 664}
654 665
655void 666void
@@ -1746,7 +1757,6 @@ _edje_part_recalc_single_min_max(FLOAT_T sc,
1746 } 1757 }
1747 } 1758 }
1748 1759
1749
1750 /* XXX TODO: remove need of EDJE_INF_MAX_H, see edje_util.c */ 1760 /* XXX TODO: remove need of EDJE_INF_MAX_H, see edje_util.c */
1751 if ((ep->swallow_params.max.h <= 0) || 1761 if ((ep->swallow_params.max.h <= 0) ||
1752 (ep->swallow_params.max.h == EDJE_INF_MAX_H)) 1762 (ep->swallow_params.max.h == EDJE_INF_MAX_H))
@@ -1810,9 +1820,9 @@ _edje_part_recalc_single_map(Edje *ed,
1810 } 1820 }
1811 params->map.center.z = 0; 1821 params->map.center.z = 0;
1812 1822
1813 params->map.rotation.x = TO_DOUBLE(desc->map.rot.x); 1823 params->map.rotation.x = desc->map.rot.x;
1814 params->map.rotation.y = TO_DOUBLE(desc->map.rot.y); 1824 params->map.rotation.y = desc->map.rot.y;
1815 params->map.rotation.z = TO_DOUBLE(desc->map.rot.z); 1825 params->map.rotation.z = desc->map.rot.z;
1816 1826
1817 if (light) 1827 if (light)
1818 { 1828 {
@@ -1907,7 +1917,7 @@ _edje_part_recalc_single(Edje *ed,
1907 sc = ed->scale; 1917 sc = ed->scale;
1908 if (sc == ZERO) sc = _edje_scale; 1918 if (sc == ZERO) sc = _edje_scale;
1909 _edje_part_recalc_single_min_max(sc, ep, desc, &minw, &minh, &maxw, &maxh); 1919 _edje_part_recalc_single_min_max(sc, ep, desc, &minw, &minh, &maxw, &maxh);
1910 1920
1911 /* relative coords of top left & bottom right */ 1921 /* relative coords of top left & bottom right */
1912 _edje_part_recalc_single_rel(ed, ep, desc, rel1_to_x, rel1_to_y, rel2_to_x, rel2_to_y, params); 1922 _edje_part_recalc_single_rel(ed, ep, desc, rel1_to_x, rel1_to_y, rel2_to_x, rel2_to_y, params);
1913 1923
@@ -1959,6 +1969,29 @@ _edje_part_recalc_single(Edje *ed,
1959 if (lminh > minh) minh = lminh; 1969 if (lminh > minh) minh = lminh;
1960 } 1970 }
1961 } 1971 }
1972 else if ((ep->part->type == EDJE_PART_TYPE_IMAGE) &&
1973 (chosen_desc->min.limit || chosen_desc->max.limit))
1974 {
1975 Evas_Coord w, h;
1976
1977 /* We only need pos to find the right image that would be displayed */
1978 /* Yes, if someone set aspect preference to SOURCE and also max,min
1979 to SOURCE, it will be under efficient, but who cares at the
1980 moment. */
1981 _edje_real_part_image_set(ed, ep, pos);
1982 evas_object_image_size_get(ep->object, &w, &h);
1983
1984 if (chosen_desc->min.limit)
1985 {
1986 if (w > minw) minw = w;
1987 if (h > minh) minh = h;
1988 }
1989 if (chosen_desc->max.limit)
1990 {
1991 if ((maxw <= 0) || (w < maxw)) maxw = w;
1992 if ((maxh <= 0) || (h < maxh)) maxh = h;
1993 }
1994 }
1962 1995
1963 /* remember what our size is BEFORE we go limit it */ 1996 /* remember what our size is BEFORE we go limit it */
1964 params->req.x = params->x; 1997 params->req.x = params->x;
@@ -2259,6 +2292,23 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
2259#endif 2292#endif
2260 return; 2293 return;
2261 } 2294 }
2295
2296 if (ep->part->scale &&
2297 ep->part->type == EDJE_PART_TYPE_GROUP &&
2298 ep->swallowed_object)
2299 {
2300 edje_object_scale_set(ep->swallowed_object, TO_DOUBLE(ed->scale));
2301
2302 if (ep->description_pos > FROM_DOUBLE(0.5) && ep->param2)
2303 {
2304 edje_object_update_hints_set(ep->swallowed_object, ep->param2->description->min.limit);
2305 }
2306 else
2307 {
2308 edje_object_update_hints_set(ep->swallowed_object, ep->param1.description->min.limit);
2309 }
2310 }
2311
2262#ifdef EDJE_CALC_CACHE 2312#ifdef EDJE_CALC_CACHE
2263 if (ep->state == ed->state && !state) 2313 if (ep->state == ed->state && !state)
2264 return ; 2314 return ;
@@ -2426,7 +2476,8 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
2426 p1, pos); 2476 p1, pos);
2427 2477
2428#ifdef EDJE_CALC_CACHE 2478#ifdef EDJE_CALC_CACHE
2429 ep->param1.state = ed->state; 2479 if (flags == FLAG_XY)
2480 ep->param1.state = ed->state;
2430#endif 2481#endif
2431 } 2482 }
2432 } 2483 }
@@ -2478,7 +2529,8 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
2478 confine_to, 2529 confine_to,
2479 p2, pos); 2530 p2, pos);
2480#ifdef EDJE_CALC_CACHE 2531#ifdef EDJE_CALC_CACHE
2481 ep->param2->state = ed->state; 2532 if (flags == FLAG_XY)
2533 ep->param2->state = ed->state;
2482#endif 2534#endif
2483 } 2535 }
2484 2536
@@ -2806,7 +2858,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
2806 } 2858 }
2807 2859
2808 evas_map_util_3d_rotate(map, 2860 evas_map_util_3d_rotate(map,
2809 pf->map.rotation.x, pf->map.rotation.y, pf->map.rotation.z, 2861 TO_DOUBLE(pf->map.rotation.x), TO_DOUBLE(pf->map.rotation.y), TO_DOUBLE(pf->map.rotation.z),
2810 pf->map.center.x, pf->map.center.y, pf->map.center.z); 2862 pf->map.center.x, pf->map.center.y, pf->map.center.z);
2811 2863
2812 // calculate light color & position etc. if there is one 2864 // calculate light color & position etc. if there is one
diff --git a/libraries/edje/src/lib/edje_data.c b/libraries/edje/src/lib/edje_data.c
index 32b17b6..46fd521 100644
--- a/libraries/edje/src/lib/edje_data.c
+++ b/libraries/edje/src/lib/edje_data.c
@@ -456,8 +456,10 @@ _edje_edd_init(void)
456 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "minmul.h", minmul.h, EDJE_T_FLOAT); \ 456 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "minmul.h", minmul.h, EDJE_T_FLOAT); \
457 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "min.w", min.w, EET_T_INT); \ 457 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "min.w", min.w, EET_T_INT); \
458 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "min.h", min.h, EET_T_INT); \ 458 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "min.h", min.h, EET_T_INT); \
459 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "min.limit", min.limit, EET_T_UCHAR); \
459 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "max.w", max.w, EET_T_INT); \ 460 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "max.w", max.w, EET_T_INT); \
460 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "max.h", max.h, EET_T_INT); \ 461 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "max.h", max.h, EET_T_INT); \
462 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "max.limit", max.limit, EET_T_UCHAR); \
461 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "step.x", step.x, EET_T_INT); \ 463 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "step.x", step.x, EET_T_INT); \
462 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "step.y", step.y, EET_T_INT); \ 464 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "step.y", step.y, EET_T_INT); \
463 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "aspect.min", aspect.min, EDJE_T_FLOAT); \ 465 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "aspect.min", aspect.min, EDJE_T_FLOAT); \
@@ -877,4 +879,5 @@ _edje_edd_init(void)
877 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_collection, Edje_Part_Collection, "script_only", script_only, EET_T_UCHAR); 879 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_collection, Edje_Part_Collection, "script_only", script_only, EET_T_UCHAR);
878 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_collection, Edje_Part_Collection, "lua_script_only", lua_script_only, EET_T_UCHAR); 880 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_collection, Edje_Part_Collection, "lua_script_only", lua_script_only, EET_T_UCHAR);
879 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_collection, Edje_Part_Collection, "prop.orientation", prop.orientation, EET_T_INT); 881 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_collection, Edje_Part_Collection, "prop.orientation", prop.orientation, EET_T_INT);
882 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_collection, Edje_Part_Collection, "broadcast_signal", broadcast_signal, EET_T_UCHAR);
880} 883}
diff --git a/libraries/edje/src/lib/edje_entry.c b/libraries/edje/src/lib/edje_entry.c
index 563497d..f94883f 100644
--- a/libraries/edje/src/lib/edje_entry.c
+++ b/libraries/edje/src/lib/edje_entry.c
@@ -12,7 +12,6 @@ typedef struct _Sel Sel;
12typedef struct _Anchor Anchor; 12typedef struct _Anchor Anchor;
13 13
14static void _edje_entry_imf_cursor_info_set(Entry *en); 14static void _edje_entry_imf_cursor_info_set(Entry *en);
15static void _edje_entry_imf_context_reset(Entry *en);
16 15
17struct _Entry 16struct _Entry
18{ 17{
@@ -29,12 +28,15 @@ struct _Entry
29 Eina_List *anchorlist; 28 Eina_List *anchorlist;
30 Eina_List *itemlist; 29 Eina_List *itemlist;
31 char *selection; 30 char *selection;
31 Edje_Input_Panel_Lang input_panel_lang;
32 Eina_Bool selecting : 1; 32 Eina_Bool selecting : 1;
33 Eina_Bool have_selection : 1; 33 Eina_Bool have_selection : 1;
34 Eina_Bool select_allow : 1; 34 Eina_Bool select_allow : 1;
35 Eina_Bool select_mod_start : 1; 35 Eina_Bool select_mod_start : 1;
36 Eina_Bool select_mod_end : 1; 36 Eina_Bool select_mod_end : 1;
37 Eina_Bool had_sel : 1; 37 Eina_Bool had_sel : 1;
38 Eina_Bool input_panel_enable : 1;
39 Eina_Bool prediction_allow : 1;
38 40
39#ifdef HAVE_ECORE_IMF 41#ifdef HAVE_ECORE_IMF
40 Eina_Bool have_preedit : 1; 42 Eina_Bool have_preedit : 1;
@@ -179,6 +181,27 @@ _edje_focus_out_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
179} 181}
180 182
181static void 183static void
184_text_filter_markup_prepend_internal(Entry *en, Evas_Textblock_Cursor *c, char *text)
185{
186 Edje_Markup_Filter_Callback *cb;
187 Eina_List *l;
188
189 EINA_LIST_FOREACH(en->rp->edje->markup_filter_callbacks, l, cb)
190 {
191 if (!strcmp(cb->part, en->rp->part->name))
192 {
193 cb->func(cb->data, en->rp->edje->obj, cb->part, &text);
194 if (!text) break;
195 }
196 }
197 if (text)
198 {
199 evas_object_textblock_text_markup_prepend(c, text);
200 free(text);
201 }
202}
203
204static void
182_text_filter_text_prepend(Entry *en, Evas_Textblock_Cursor *c, const char *text) 205_text_filter_text_prepend(Entry *en, Evas_Textblock_Cursor *c, const char *text)
183{ 206{
184 char *text2; 207 char *text2;
@@ -196,8 +219,11 @@ _text_filter_text_prepend(Entry *en, Evas_Textblock_Cursor *c, const char *text)
196 } 219 }
197 if (text2) 220 if (text2)
198 { 221 {
199 evas_textblock_cursor_text_prepend(c, text2); 222 char *markup_text;
223 markup_text = evas_textblock_text_utf8_to_markup(NULL, text2);
200 free(text2); 224 free(text2);
225 if (markup_text)
226 _text_filter_markup_prepend_internal(en, c, markup_text);
201 } 227 }
202} 228}
203 229
@@ -219,8 +245,61 @@ _text_filter_format_prepend(Entry *en, Evas_Textblock_Cursor *c, const char *tex
219 } 245 }
220 if (text2) 246 if (text2)
221 { 247 {
222 evas_textblock_cursor_format_prepend(c, text2); 248 char *s, *markup_text;
249
250 s = text2;
251 if (*s == '+')
252 {
253 s++;
254 while (*s == ' ') s++;
255 if (!s)
256 {
257 free(text2);
258 return;
259 }
260 markup_text = (char*) malloc(strlen(s) + 3);
261 if (markup_text)
262 {
263 *(markup_text) = '<';
264 strncpy((markup_text + 1), s, strlen(s));
265 *(markup_text + strlen(s) + 1) = '>';
266 *(markup_text + strlen(s) + 2) = '\0';
267 }
268 }
269 else if (s[0] == '-')
270 {
271 s++;
272 while (*s == ' ') s++;
273 if (!s)
274 {
275 free(text2);
276 return;
277 }
278 markup_text = (char*) malloc(strlen(s) + 4);
279 if (markup_text)
280 {
281 *(markup_text) = '<';
282 *(markup_text + 1) = '/';
283 strncpy((markup_text + 2), s, strlen(s));
284 *(markup_text + strlen(s) + 2) = '>';
285 *(markup_text + strlen(s) + 3) = '\0';
286 }
287 }
288 else
289 {
290 markup_text = (char*) malloc(strlen(s) + 4);
291 if (markup_text)
292 {
293 *(markup_text) = '<';
294 strncpy((markup_text + 1), s, strlen(s));
295 *(markup_text + strlen(s) + 1) = '/';
296 *(markup_text + strlen(s) + 2) = '>';
297 *(markup_text + strlen(s) + 3) = '\0';
298 }
299 }
223 free(text2); 300 free(text2);
301 if (markup_text)
302 _text_filter_markup_prepend_internal(en, c, markup_text);
224 } 303 }
225} 304}
226 305
@@ -241,10 +320,7 @@ _text_filter_markup_prepend(Entry *en, Evas_Textblock_Cursor *c, const char *tex
241 } 320 }
242 } 321 }
243 if (text2) 322 if (text2)
244 { 323 _text_filter_markup_prepend_internal(en, c, text2);
245 evas_object_textblock_text_markup_prepend(c, text2);
246 free(text2);
247 }
248} 324}
249 325
250static void 326static void
@@ -397,7 +473,7 @@ static void
397_sel_extend(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en) 473_sel_extend(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en)
398{ 474{
399 if (!en->sel_end) return; 475 if (!en->sel_end) return;
400 _edje_entry_imf_context_reset(en); 476 _edje_entry_imf_context_reset(en->rp);
401 _sel_enable(c, o, en); 477 _sel_enable(c, o, en);
402 if (!evas_textblock_cursor_compare(c, en->sel_end)) return; 478 if (!evas_textblock_cursor_compare(c, en->sel_end)) return;
403 evas_textblock_cursor_copy(c, en->sel_end); 479 evas_textblock_cursor_copy(c, en->sel_end);
@@ -413,7 +489,7 @@ static void
413_sel_preextend(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en) 489_sel_preextend(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en)
414{ 490{
415 if (!en->sel_end) return; 491 if (!en->sel_end) return;
416 _edje_entry_imf_context_reset(en); 492 _edje_entry_imf_context_reset(en->rp);
417 _sel_enable(c, o, en); 493 _sel_enable(c, o, en);
418 if (!evas_textblock_cursor_compare(c, en->sel_start)) return; 494 if (!evas_textblock_cursor_compare(c, en->sel_start)) return;
419 evas_textblock_cursor_copy(c, en->sel_start); 495 evas_textblock_cursor_copy(c, en->sel_start);
@@ -882,7 +958,7 @@ _anchors_get(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en)
882 char *p; 958 char *p;
883 an = calloc(1, sizeof(Anchor)); 959 an = calloc(1, sizeof(Anchor));
884 if (!an) 960 if (!an)
885 break; 961 break;
886 962
887 an->en = en; 963 an->en = en;
888 p = strstr(s, "href="); 964 p = strstr(s, "href=");
@@ -903,7 +979,7 @@ _anchors_get(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en)
903 { 979 {
904 s = evas_textblock_node_format_text_get(node); 980 s = evas_textblock_node_format_text_get(node);
905 if ((!strcmp(s, "- a")) || (!strcmp(s, "-a"))) 981 if ((!strcmp(s, "- a")) || (!strcmp(s, "-a")))
906 break; 982 break;
907 } 983 }
908 984
909 if (node) 985 if (node)
@@ -932,7 +1008,7 @@ _anchors_get(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en)
932 char *p; 1008 char *p;
933 an = calloc(1, sizeof(Anchor)); 1009 an = calloc(1, sizeof(Anchor));
934 if (!an) 1010 if (!an)
935 break; 1011 break;
936 1012
937 an->en = en; 1013 an->en = en;
938 an->item = 1; 1014 an->item = 1;
@@ -986,12 +1062,14 @@ _range_del_emit(Edje *ed, Evas_Textblock_Cursor *c __UNUSED__, Evas_Object *o __
986 _edje_emit(ed, "entry,changed", en->rp->part->name); 1062 _edje_emit(ed, "entry,changed", en->rp->part->name);
987 _edje_emit_full(ed, "entry,changed,user", en->rp->part->name, info, 1063 _edje_emit_full(ed, "entry,changed,user", en->rp->part->name, info,
988 _free_entry_change_info); 1064 _free_entry_change_info);
1065 _sel_clear(en->cursor, en->rp->object, en);
989} 1066}
990 1067
991static void 1068static void
992_range_del(Evas_Textblock_Cursor *c __UNUSED__, Evas_Object *o __UNUSED__, Entry *en) 1069_range_del(Evas_Textblock_Cursor *c __UNUSED__, Evas_Object *o __UNUSED__, Entry *en)
993{ 1070{
994 evas_textblock_cursor_range_delete(en->sel_start, en->sel_end); 1071 evas_textblock_cursor_range_delete(en->sel_start, en->sel_end);
1072 _sel_clear(en->cursor, en->rp->object, en);
995} 1073}
996 1074
997static void 1075static void
@@ -1041,7 +1119,7 @@ _edje_entry_hide_visible_password(Edje_Real_Part *rp)
1041 if (!strcmp(text, "+ password=off")) 1119 if (!strcmp(text, "+ password=off"))
1042 { 1120 {
1043 evas_textblock_node_format_remove_pair(rp->object, 1121 evas_textblock_node_format_remove_pair(rp->object,
1044 (Evas_Object_Textblock_Node_Format *) node); 1122 (Evas_Object_Textblock_Node_Format *) node);
1045 break; 1123 break;
1046 } 1124 }
1047 } 1125 }
@@ -1075,7 +1153,7 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1075 if ((!en) || (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) || 1153 if ((!en) || (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) ||
1076 (rp->part->entry_mode < EDJE_ENTRY_EDIT_MODE_EDITABLE)) 1154 (rp->part->entry_mode < EDJE_ENTRY_EDIT_MODE_EDITABLE))
1077 return; 1155 return;
1078 if (!ev->key) return; 1156 if (!ev->keyname) return;
1079 1157
1080#ifdef HAVE_ECORE_IMF 1158#ifdef HAVE_ECORE_IMF
1081 if (en->imf_context) 1159 if (en->imf_context)
@@ -1089,9 +1167,9 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1089 } 1167 }
1090#endif 1168#endif
1091 1169
1092 if ((!strcmp(ev->key, "Escape")) || 1170 if ((!strcmp(ev->keyname, "Escape")) ||
1093 (!strcmp(ev->key, "Return")) || (!strcmp(ev->key, "KP_Enter"))) 1171 (!strcmp(ev->keyname, "Return")) || (!strcmp(ev->keyname, "KP_Enter")))
1094 _edje_entry_imf_context_reset(en); 1172 _edje_entry_imf_context_reset(rp);
1095 1173
1096 old_cur_pos = evas_textblock_cursor_pos_get(en->cursor); 1174 old_cur_pos = evas_textblock_cursor_pos_get(en->cursor);
1097 1175
@@ -1100,13 +1178,13 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1100 shift = evas_key_modifier_is_set(ev->modifiers, "Shift"); 1178 shift = evas_key_modifier_is_set(ev->modifiers, "Shift");
1101 multiline = rp->part->multiline; 1179 multiline = rp->part->multiline;
1102 cursor_changed = EINA_FALSE; 1180 cursor_changed = EINA_FALSE;
1103 if (!strcmp(ev->key, "Escape")) 1181 if (!strcmp(ev->keyname, "Escape"))
1104 { 1182 {
1105 // dead keys here. Escape for now (should emit these) 1183 // dead keys here. Escape for now (should emit these)
1106 _edje_emit(ed, "entry,key,escape", rp->part->name); 1184 _edje_emit(ed, "entry,key,escape", rp->part->name);
1107 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1185 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1108 } 1186 }
1109 else if (!strcmp(ev->key, "Up") || !strcmp(ev->key, "KP_Up")) 1187 else if (!strcmp(ev->keyname, "Up") || !strcmp(ev->keyname, "KP_Up"))
1110 { 1188 {
1111 if (multiline) 1189 if (multiline)
1112 { 1190 {
@@ -1119,14 +1197,14 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1119 if (en->select_allow) 1197 if (en->select_allow)
1120 { 1198 {
1121 if (shift) _sel_extend(en->cursor, rp->object, en); 1199 if (shift) _sel_extend(en->cursor, rp->object, en);
1200 else _sel_clear(en->cursor, rp->object, en);
1122 } 1201 }
1123 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1202 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1124 } 1203 }
1125 _sel_clear(en->cursor, rp->object, en);
1126 _edje_emit(ed, "entry,key,up", rp->part->name); 1204 _edje_emit(ed, "entry,key,up", rp->part->name);
1127 _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name); 1205 _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name);
1128 } 1206 }
1129 else if (!strcmp(ev->key, "Down") || !strcmp(ev->key, "KP_Down")) 1207 else if (!strcmp(ev->keyname, "Down") || !strcmp(ev->keyname, "KP_Down"))
1130 { 1208 {
1131 if (multiline) 1209 if (multiline)
1132 { 1210 {
@@ -1139,14 +1217,14 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1139 if (en->select_allow) 1217 if (en->select_allow)
1140 { 1218 {
1141 if (shift) _sel_extend(en->cursor, rp->object, en); 1219 if (shift) _sel_extend(en->cursor, rp->object, en);
1220 else _sel_clear(en->cursor, rp->object, en);
1142 } 1221 }
1143 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1222 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1144 } 1223 }
1145 _sel_clear(en->cursor, rp->object, en);
1146 _edje_emit(ed, "entry,key,down", rp->part->name); 1224 _edje_emit(ed, "entry,key,down", rp->part->name);
1147 _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name); 1225 _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name);
1148 } 1226 }
1149 else if (!strcmp(ev->key, "Left") || !strcmp(ev->key, "KP_Left")) 1227 else if (!strcmp(ev->keyname, "Left") || !strcmp(ev->keyname, "KP_Left"))
1150 { 1228 {
1151 if (en->select_allow) 1229 if (en->select_allow)
1152 { 1230 {
@@ -1159,13 +1237,13 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1159 if (en->select_allow) 1237 if (en->select_allow)
1160 { 1238 {
1161 if (shift) _sel_extend(en->cursor, rp->object, en); 1239 if (shift) _sel_extend(en->cursor, rp->object, en);
1240 else _sel_clear(en->cursor, rp->object, en);
1162 } 1241 }
1163 _sel_clear(en->cursor, rp->object, en);
1164 _edje_emit(ed, "entry,key,left", rp->part->name); 1242 _edje_emit(ed, "entry,key,left", rp->part->name);
1165 _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name); 1243 _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name);
1166 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1244 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1167 } 1245 }
1168 else if (!strcmp(ev->key, "Right") || !strcmp(ev->key, "KP_Right")) 1246 else if (!strcmp(ev->keyname, "Right") || !strcmp(ev->keyname, "KP_Right"))
1169 { 1247 {
1170 if (en->select_allow) 1248 if (en->select_allow)
1171 { 1249 {
@@ -1178,13 +1256,13 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1178 if (en->select_allow) 1256 if (en->select_allow)
1179 { 1257 {
1180 if (shift) _sel_extend(en->cursor, rp->object, en); 1258 if (shift) _sel_extend(en->cursor, rp->object, en);
1259 else _sel_clear(en->cursor, rp->object, en);
1181 } 1260 }
1182 _sel_clear(en->cursor, rp->object, en);
1183 _edje_emit(ed, "entry,key,right", rp->part->name); 1261 _edje_emit(ed, "entry,key,right", rp->part->name);
1184 _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name); 1262 _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name);
1185 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1263 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1186 } 1264 }
1187 else if (!strcmp(ev->key, "BackSpace")) 1265 else if (!strcmp(ev->keyname, "BackSpace"))
1188 { 1266 {
1189 if (control && !en->have_selection) 1267 if (control && !en->have_selection)
1190 { 1268 {
@@ -1221,7 +1299,7 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1221 _edje_emit(ed, "entry,key,backspace", rp->part->name); 1299 _edje_emit(ed, "entry,key,backspace", rp->part->name);
1222 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1300 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1223 } 1301 }
1224 else if (!strcmp(ev->key, "Delete") || !strcmp(ev->key, "KP_Delete")) 1302 else if (!strcmp(ev->keyname, "Delete") || !strcmp(ev->keyname, "KP_Delete"))
1225 { 1303 {
1226 if (control) 1304 if (control)
1227 { 1305 {
@@ -1255,7 +1333,7 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1255 _edje_emit(ed, "entry,key,delete", rp->part->name); 1333 _edje_emit(ed, "entry,key,delete", rp->part->name);
1256 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1334 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1257 } 1335 }
1258 else if (!strcmp(ev->key, "Home") || !strcmp(ev->key, "KP_Home")) 1336 else if (!strcmp(ev->keyname, "Home") || !strcmp(ev->keyname, "KP_Home"))
1259 { 1337 {
1260 if (en->select_allow) 1338 if (en->select_allow)
1261 { 1339 {
@@ -1273,7 +1351,7 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1273 _edje_emit(ed, "entry,key,home", rp->part->name); 1351 _edje_emit(ed, "entry,key,home", rp->part->name);
1274 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1352 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1275 } 1353 }
1276 else if (!strcmp(ev->key, "End") || !strcmp(ev->key, "KP_End")) 1354 else if (!strcmp(ev->keyname, "End") || !strcmp(ev->keyname, "KP_End"))
1277 { 1355 {
1278 if (en->select_allow) 1356 if (en->select_allow)
1279 { 1357 {
@@ -1291,33 +1369,36 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1291 _edje_emit(ed, "entry,key,end", rp->part->name); 1369 _edje_emit(ed, "entry,key,end", rp->part->name);
1292 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1370 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1293 } 1371 }
1294 else if ((control) && (!strcmp(ev->key, "v"))) 1372 else if ((control) && (!shift) && (!strcmp(ev->keyname, "v")))
1295 { 1373 {
1296 _edje_emit(ed, "entry,paste,request", rp->part->name); 1374 _edje_emit(ed, "entry,paste,request", rp->part->name);
1297 _edje_emit(ed, "entry,paste,request,3", rp->part->name); 1375 _edje_emit(ed, "entry,paste,request,3", rp->part->name);
1298 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1376 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1299 } 1377 }
1300 else if ((control) && (!strcmp(ev->key, "a"))) 1378 else if ((control) && (!strcmp(ev->keyname, "a")))
1301 { 1379 {
1302 _edje_emit(ed, "entry,selection,all,request", rp->part->name); 1380 if (shift)
1303 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1381 {
1304 } 1382 _edje_emit(ed, "entry,selection,none,request", rp->part->name);
1305 else if ((control) && (!strcmp(ev->key, "A"))) 1383 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1306 { 1384 }
1307 _edje_emit(ed, "entry,selection,none,request", rp->part->name); 1385 else
1308 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1386 {
1387 _edje_emit(ed, "entry,selection,all,request", rp->part->name);
1388 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1389 }
1309 } 1390 }
1310 else if ((control) && ((!strcmp(ev->key, "c") || (!strcmp(ev->key, "Insert"))))) 1391 else if ((control) && (((!shift) && !strcmp(ev->keyname, "c")) || !strcmp(ev->keyname, "Insert")))
1311 { 1392 {
1312 _edje_emit(ed, "entry,copy,notify", rp->part->name); 1393 _edje_emit(ed, "entry,copy,notify", rp->part->name);
1313 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1394 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1314 } 1395 }
1315 else if ((control) && ((!strcmp(ev->key, "x") || (!strcmp(ev->key, "m"))))) 1396 else if ((control) && (!shift) && ((!strcmp(ev->keyname, "x") || (!strcmp(ev->keyname, "m")))))
1316 { 1397 {
1317 _edje_emit(ed, "entry,cut,notify", rp->part->name); 1398 _edje_emit(ed, "entry,cut,notify", rp->part->name);
1318 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1399 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1319 } 1400 }
1320 else if ((control) && (!strcmp(ev->key, "z"))) 1401 else if ((control) && (!strcmp(ev->keyname, "z")))
1321 { 1402 {
1322 if (shift) 1403 if (shift)
1323 { 1404 {
@@ -1331,19 +1412,19 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1331 } 1412 }
1332 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1413 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1333 } 1414 }
1334 else if ((control) && (!strcmp(ev->key, "y"))) 1415 else if ((control) && (!shift) && (!strcmp(ev->keyname, "y")))
1335 { 1416 {
1336 // redo 1417 // redo
1337 _edje_emit(ed, "entry,redo,request", rp->part->name); 1418 _edje_emit(ed, "entry,redo,request", rp->part->name);
1338 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1419 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1339 } 1420 }
1340 else if ((control) && (!strcmp(ev->key, "w"))) 1421 else if ((control) && (!shift) && (!strcmp(ev->keyname, "w")))
1341 { 1422 {
1342 _sel_clear(en->cursor, rp->object, en); 1423 _sel_clear(en->cursor, rp->object, en);
1343 // select current word? 1424 // select current word?
1344 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1425 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1345 } 1426 }
1346 else if (!strcmp(ev->key, "Tab")) 1427 else if (!strcmp(ev->keyname, "Tab"))
1347 { 1428 {
1348 if (multiline) 1429 if (multiline)
1349 { 1430 {
@@ -1362,7 +1443,6 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1362 _range_del_emit(ed, en->cursor, rp->object, en); 1443 _range_del_emit(ed, en->cursor, rp->object, en);
1363 info->merge = EINA_TRUE; 1444 info->merge = EINA_TRUE;
1364 } 1445 }
1365 _sel_clear(en->cursor, rp->object, en);
1366 info->change.insert.pos = 1446 info->change.insert.pos =
1367 evas_textblock_cursor_pos_get(en->cursor); 1447 evas_textblock_cursor_pos_get(en->cursor);
1368 info->change.insert.content = eina_stringshare_add("<tab/>"); 1448 info->change.insert.content = eina_stringshare_add("<tab/>");
@@ -1378,12 +1458,12 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1378 } 1458 }
1379 _edje_emit(ed, "entry,key,tab", rp->part->name); 1459 _edje_emit(ed, "entry,key,tab", rp->part->name);
1380 } 1460 }
1381 else if ((!strcmp(ev->key, "ISO_Left_Tab")) && (multiline)) 1461 else if ((!strcmp(ev->keyname, "ISO_Left_Tab")) && (multiline))
1382 { 1462 {
1383 // remove a tab 1463 // remove a tab
1384 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1464 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1385 } 1465 }
1386 else if (!strcmp(ev->key, "Prior") || !strcmp(ev->key, "KP_Prior")) 1466 else if (!strcmp(ev->keyname, "Prior") || !strcmp(ev->keyname, "KP_Prior"))
1387 { 1467 {
1388 if (en->select_allow) 1468 if (en->select_allow)
1389 { 1469 {
@@ -1394,12 +1474,12 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1394 if (en->select_allow) 1474 if (en->select_allow)
1395 { 1475 {
1396 if (shift) _sel_extend(en->cursor, rp->object, en); 1476 if (shift) _sel_extend(en->cursor, rp->object, en);
1477 else _sel_clear(en->cursor, rp->object, en);
1397 } 1478 }
1398 _sel_clear(en->cursor, rp->object, en);
1399 _edje_emit(ed, "entry,key,pgup", rp->part->name); 1479 _edje_emit(ed, "entry,key,pgup", rp->part->name);
1400 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1480 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1401 } 1481 }
1402 else if (!strcmp(ev->key, "Next") || !strcmp(ev->key, "KP_Next")) 1482 else if (!strcmp(ev->keyname, "Next") || !strcmp(ev->keyname, "KP_Next"))
1403 { 1483 {
1404 if (en->select_allow) 1484 if (en->select_allow)
1405 { 1485 {
@@ -1410,12 +1490,12 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1410 if (en->select_allow) 1490 if (en->select_allow)
1411 { 1491 {
1412 if (shift) _sel_extend(en->cursor, rp->object, en); 1492 if (shift) _sel_extend(en->cursor, rp->object, en);
1493 else _sel_clear(en->cursor, rp->object, en);
1413 } 1494 }
1414 _sel_clear(en->cursor, rp->object, en);
1415 _edje_emit(ed, "entry,key,pgdn", rp->part->name); 1495 _edje_emit(ed, "entry,key,pgdn", rp->part->name);
1416 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1496 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1417 } 1497 }
1418 else if ((!strcmp(ev->key, "Return")) || (!strcmp(ev->key, "KP_Enter"))) 1498 else if ((!strcmp(ev->keyname, "Return")) || (!strcmp(ev->keyname, "KP_Enter")))
1419 { 1499 {
1420 if (multiline) 1500 if (multiline)
1421 { 1501 {
@@ -1427,7 +1507,6 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1427 _range_del_emit(ed, en->cursor, rp->object, en); 1507 _range_del_emit(ed, en->cursor, rp->object, en);
1428 info->merge = EINA_TRUE; 1508 info->merge = EINA_TRUE;
1429 } 1509 }
1430 _sel_clear(en->cursor, rp->object, en);
1431 1510
1432 info->change.insert.pos = 1511 info->change.insert.pos =
1433 evas_textblock_cursor_pos_get(en->cursor); 1512 evas_textblock_cursor_pos_get(en->cursor);
@@ -1470,7 +1549,6 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1470 _range_del_emit(ed, en->cursor, rp->object, en); 1549 _range_del_emit(ed, en->cursor, rp->object, en);
1471 info->merge = EINA_TRUE; 1550 info->merge = EINA_TRUE;
1472 } 1551 }
1473 _sel_clear(en->cursor, rp->object, en);
1474 1552
1475 info->change.insert.pos = 1553 info->change.insert.pos =
1476 evas_textblock_cursor_pos_get(en->cursor); 1554 evas_textblock_cursor_pos_get(en->cursor);
@@ -1580,7 +1658,7 @@ _edje_part_mouse_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS
1580 } 1658 }
1581#endif 1659#endif
1582 1660
1583 _edje_entry_imf_context_reset(en); 1661 _edje_entry_imf_context_reset(rp);
1584 1662
1585 en->select_mod_start = EINA_FALSE; 1663 en->select_mod_start = EINA_FALSE;
1586 en->select_mod_end = EINA_FALSE; 1664 en->select_mod_end = EINA_FALSE;
@@ -1593,8 +1671,35 @@ _edje_part_mouse_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS
1593 if (ev->button == 2) dosel = EINA_FALSE; 1671 if (ev->button == 2) dosel = EINA_FALSE;
1594 if (dosel) 1672 if (dosel)
1595 { 1673 {
1596 // double click -> select word 1674 if (ev->flags & EVAS_BUTTON_TRIPLE_CLICK)
1597 // triple click -> select line 1675 {
1676 en->have_selection = EINA_FALSE;
1677 en->selecting = EINA_FALSE;
1678 _sel_clear(en->cursor, rp->object, en);
1679 tc = evas_object_textblock_cursor_new(rp->object);
1680 evas_textblock_cursor_copy(en->cursor, tc);
1681 evas_textblock_cursor_line_char_first(en->cursor);
1682 _sel_start(en->cursor, rp->object, en);
1683 evas_textblock_cursor_line_char_last(en->cursor);
1684 _sel_extend(en->cursor, rp->object, en);
1685
1686 goto end;
1687 }
1688 else if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
1689 {
1690 en->have_selection = EINA_FALSE;
1691 en->selecting = EINA_FALSE;
1692 _sel_clear(en->cursor, rp->object, en);
1693 tc = evas_object_textblock_cursor_new(rp->object);
1694 evas_textblock_cursor_copy(en->cursor, tc);
1695 evas_textblock_cursor_word_start(en->cursor);
1696 _sel_start(en->cursor, rp->object, en);
1697 evas_textblock_cursor_word_end(en->cursor);
1698 evas_textblock_cursor_char_next(en->cursor);
1699 _sel_extend(en->cursor, rp->object, en);
1700
1701 goto end;
1702 }
1598 } 1703 }
1599 tc = evas_object_textblock_cursor_new(rp->object); 1704 tc = evas_object_textblock_cursor_new(rp->object);
1600 evas_textblock_cursor_copy(en->cursor, tc); 1705 evas_textblock_cursor_copy(en->cursor, tc);
@@ -1695,13 +1800,14 @@ _edje_part_mouse_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS
1695 } 1800 }
1696 } 1801 }
1697 } 1802 }
1803 end:
1698 if (evas_textblock_cursor_compare(tc, en->cursor)) 1804 if (evas_textblock_cursor_compare(tc, en->cursor))
1699 { 1805 {
1700 _edje_emit(rp->edje, "cursor,changed", rp->part->name); 1806 _edje_emit(rp->edje, "cursor,changed", rp->part->name);
1701 _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name); 1807 _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name);
1702 } 1808 }
1703 evas_textblock_cursor_free(tc); 1809 evas_textblock_cursor_free(tc);
1704 1810
1705 _edje_entry_imf_cursor_info_set(en); 1811 _edje_entry_imf_cursor_info_set(en);
1706 1812
1707 _edje_entry_real_part_configure(rp); 1813 _edje_entry_real_part_configure(rp);
@@ -1724,6 +1830,8 @@ _edje_part_mouse_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED
1724 if (ev->button != 1) return; 1830 if (ev->button != 1) return;
1725 if (!rp) return; 1831 if (!rp) return;
1726 if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; 1832 if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
1833 if (ev->flags & EVAS_BUTTON_TRIPLE_CLICK) return;
1834 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) return;
1727 en = rp->entry_data; 1835 en = rp->entry_data;
1728 if ((!en) || (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) || 1836 if ((!en) || (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) ||
1729 (rp->part->entry_mode < EDJE_ENTRY_EDIT_MODE_SELECTABLE)) 1837 (rp->part->entry_mode < EDJE_ENTRY_EDIT_MODE_SELECTABLE))
@@ -1741,7 +1849,7 @@ _edje_part_mouse_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED
1741 } 1849 }
1742#endif 1850#endif
1743 1851
1744 _edje_entry_imf_context_reset(en); 1852 _edje_entry_imf_context_reset(rp);
1745 1853
1746 tc = evas_object_textblock_cursor_new(rp->object); 1854 tc = evas_object_textblock_cursor_new(rp->object);
1747 evas_textblock_cursor_copy(en->cursor, tc); 1855 evas_textblock_cursor_copy(en->cursor, tc);
@@ -1911,7 +2019,7 @@ _edje_part_mouse_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS
1911 } 2019 }
1912 evas_textblock_cursor_free(tc); 2020 evas_textblock_cursor_free(tc);
1913 2021
1914 _edje_entry_imf_context_reset(en); 2022 _edje_entry_imf_context_reset(rp);
1915 _edje_entry_imf_cursor_info_set(en); 2023 _edje_entry_imf_cursor_info_set(en);
1916 2024
1917 _edje_entry_real_part_configure(rp); 2025 _edje_entry_real_part_configure(rp);
@@ -2035,6 +2143,8 @@ _edje_entry_real_part_init(Edje_Real_Part *rp)
2035 { 2143 {
2036 evas_object_show(en->cursor_bg); 2144 evas_object_show(en->cursor_bg);
2037 evas_object_show(en->cursor_fg); 2145 evas_object_show(en->cursor_fg);
2146 en->input_panel_enable = EINA_TRUE;
2147
2038#ifdef HAVE_ECORE_IMF 2148#ifdef HAVE_ECORE_IMF
2039 ecore_imf_init(); 2149 ecore_imf_init();
2040 2150
@@ -2078,6 +2188,9 @@ _edje_entry_real_part_init(Edje_Real_Part *rp)
2078 ecore_imf_context_input_mode_set(en->imf_context, 2188 ecore_imf_context_input_mode_set(en->imf_context,
2079 rp->part->entry_mode == EDJE_ENTRY_EDIT_MODE_PASSWORD ? 2189 rp->part->entry_mode == EDJE_ENTRY_EDIT_MODE_PASSWORD ?
2080 ECORE_IMF_INPUT_MODE_INVISIBLE : ECORE_IMF_INPUT_MODE_FULL); 2190 ECORE_IMF_INPUT_MODE_INVISIBLE : ECORE_IMF_INPUT_MODE_FULL);
2191
2192 if (rp->part->entry_mode == EDJE_ENTRY_EDIT_MODE_PASSWORD)
2193 ecore_imf_context_input_panel_language_set(en->imf_context, ECORE_IMF_INPUT_PANEL_LANG_ALPHABET);
2081#endif 2194#endif
2082 } 2195 }
2083#ifdef HAVE_ECORE_IMF 2196#ifdef HAVE_ECORE_IMF
@@ -2111,9 +2224,9 @@ _edje_entry_real_part_shutdown(Edje_Real_Part *rp)
2111 { 2224 {
2112 if (en->imf_context) 2225 if (en->imf_context)
2113 { 2226 {
2114 ecore_imf_context_event_callback_del(en->imf_context, ECORE_IMF_CALLBACK_COMMIT, _edje_entry_imf_event_commit_cb); 2227 ecore_imf_context_event_callback_del(en->imf_context, ECORE_IMF_CALLBACK_COMMIT, _edje_entry_imf_event_commit_cb);
2115 ecore_imf_context_event_callback_del(en->imf_context, ECORE_IMF_CALLBACK_DELETE_SURROUNDING, _edje_entry_imf_event_delete_surrounding_cb); 2228 ecore_imf_context_event_callback_del(en->imf_context, ECORE_IMF_CALLBACK_DELETE_SURROUNDING, _edje_entry_imf_event_delete_surrounding_cb);
2116 ecore_imf_context_event_callback_del(en->imf_context, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, _edje_entry_imf_event_preedit_changed_cb); 2229 ecore_imf_context_event_callback_del(en->imf_context, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, _edje_entry_imf_event_preedit_changed_cb);
2117 2230
2118 ecore_imf_context_del(en->imf_context); 2231 ecore_imf_context_del(en->imf_context);
2119 en->imf_context = NULL; 2232 en->imf_context = NULL;
@@ -2192,7 +2305,7 @@ _edje_entry_text_markup_set(Edje_Real_Part *rp, const char *text)
2192{ 2305{
2193 Entry *en = rp->entry_data; 2306 Entry *en = rp->entry_data;
2194 if (!en) return; 2307 if (!en) return;
2195 _edje_entry_imf_context_reset(en); 2308 _edje_entry_imf_context_reset(rp);
2196 // set text as markup 2309 // set text as markup
2197 _sel_clear(en->cursor, rp->object, en); 2310 _sel_clear(en->cursor, rp->object, en);
2198 evas_object_textblock_text_markup_set(rp->object, text); 2311 evas_object_textblock_text_markup_set(rp->object, text);
@@ -2231,12 +2344,11 @@ _edje_entry_text_markup_insert(Edje_Real_Part *rp, const char *text)
2231{ 2344{
2232 Entry *en = rp->entry_data; 2345 Entry *en = rp->entry_data;
2233 if (!en) return; 2346 if (!en) return;
2234 _edje_entry_imf_context_reset(en); 2347 _edje_entry_imf_context_reset(rp);
2235 2348
2236 // prepend markup @ cursor pos 2349 // prepend markup @ cursor pos
2237 if (en->have_selection) 2350 if (en->have_selection)
2238 _range_del(en->cursor, rp->object, en); 2351 _range_del(en->cursor, rp->object, en);
2239 _sel_clear(en->cursor, rp->object, en);
2240 //xx 2352 //xx
2241// evas_object_textblock_text_markup_prepend(en->cursor, text); 2353// evas_object_textblock_text_markup_prepend(en->cursor, text);
2242 _text_filter_markup_prepend(en, en->cursor, text); 2354 _text_filter_markup_prepend(en, en->cursor, text);
@@ -2282,7 +2394,7 @@ _edje_entry_select_all(Edje_Real_Part *rp)
2282 Entry *en = rp->entry_data; 2394 Entry *en = rp->entry_data;
2283 if (!en) return; 2395 if (!en) return;
2284 2396
2285 _edje_entry_imf_context_reset(en); 2397 _edje_entry_imf_context_reset(rp);
2286 2398
2287 _sel_clear(en->cursor, rp->object, en); 2399 _sel_clear(en->cursor, rp->object, en);
2288 _curs_start(en->cursor, rp->object, en); 2400 _curs_start(en->cursor, rp->object, en);
@@ -2301,7 +2413,7 @@ _edje_entry_select_begin(Edje_Real_Part *rp)
2301 Entry *en = rp->entry_data; 2413 Entry *en = rp->entry_data;
2302 if (!en) return; 2414 if (!en) return;
2303 2415
2304 _edje_entry_imf_context_reset(en); 2416 _edje_entry_imf_context_reset(rp);
2305 2417
2306 _sel_clear(en->cursor, rp->object, en); 2418 _sel_clear(en->cursor, rp->object, en);
2307 _sel_enable(en->cursor, rp->object, en); 2419 _sel_enable(en->cursor, rp->object, en);
@@ -2318,7 +2430,7 @@ _edje_entry_select_extend(Edje_Real_Part *rp)
2318{ 2430{
2319 Entry *en = rp->entry_data; 2431 Entry *en = rp->entry_data;
2320 if (!en) return; 2432 if (!en) return;
2321 _edje_entry_imf_context_reset(en); 2433 _edje_entry_imf_context_reset(rp);
2322 _sel_extend(en->cursor, rp->object, en); 2434 _sel_extend(en->cursor, rp->object, en);
2323 2435
2324 _edje_entry_imf_cursor_info_set(en); 2436 _edje_entry_imf_cursor_info_set(en);
@@ -2440,6 +2552,35 @@ _edje_entry_cursor_geometry_get(Edje_Real_Part *rp, Evas_Coord *cx, Evas_Coord *
2440} 2552}
2441 2553
2442void 2554void
2555_edje_entry_user_insert(Edje_Real_Part *rp, const char *text)
2556{
2557 Entry *en = rp->entry_data;
2558 Edje_Entry_Change_Info *info = calloc(1, sizeof(*info));
2559 info->insert = EINA_TRUE;
2560 info->change.insert.plain_length = 1;
2561 info->change.insert.content = eina_stringshare_add(text);
2562 {
2563 char *tmp;
2564 tmp = evas_textblock_text_markup_to_utf8(rp->object,
2565 info->change.insert.content);
2566 info->change.insert.plain_length = eina_unicode_utf8_get_len(tmp);
2567 free(tmp);
2568 }
2569
2570 if (en->have_selection)
2571 {
2572 _range_del_emit(rp->edje, en->cursor, rp->object, en);
2573 info->merge = EINA_TRUE;
2574 }
2575 info->change.insert.pos = evas_textblock_cursor_pos_get(en->cursor);
2576 _text_filter_text_prepend(en, en->cursor, text);
2577 _edje_emit(rp->edje, "entry,changed", rp->part->name);
2578 _edje_emit_full(rp->edje, "entry,changed,user", rp->part->name,
2579 info, _free_entry_change_info);
2580 _edje_emit(rp->edje, "cursor,changed", rp->part->name);
2581}
2582
2583void
2443_edje_entry_select_allow_set(Edje_Real_Part *rp, Eina_Bool allow) 2584_edje_entry_select_allow_set(Edje_Real_Part *rp, Eina_Bool allow)
2444{ 2585{
2445 Entry *en = rp->entry_data; 2586 Entry *en = rp->entry_data;
@@ -2463,12 +2604,25 @@ _edje_entry_select_abort(Edje_Real_Part *rp)
2463 { 2604 {
2464 en->selecting = EINA_FALSE; 2605 en->selecting = EINA_FALSE;
2465 2606
2466 _edje_entry_imf_context_reset(en); 2607 _edje_entry_imf_context_reset(rp);
2467 _edje_entry_imf_cursor_info_set(en); 2608 _edje_entry_imf_cursor_info_set(en);
2468 _edje_entry_real_part_configure(rp); 2609 _edje_entry_real_part_configure(rp);
2469 } 2610 }
2470} 2611}
2471 2612
2613void *
2614_edje_entry_imf_context_get(Edje_Real_Part *rp)
2615{
2616 Entry *en = rp->entry_data;
2617 if (!en) return NULL;
2618
2619#ifdef HAVE_ECORE_IMF
2620 return en->imf_context;
2621#else
2622 return NULL;
2623#endif
2624}
2625
2472void 2626void
2473_edje_entry_autocapital_type_set(Edje_Real_Part *rp, Edje_Text_Autocapital_Type autocapital_type) 2627_edje_entry_autocapital_type_set(Edje_Real_Part *rp, Edje_Text_Autocapital_Type autocapital_type)
2474{ 2628{
@@ -2499,16 +2653,37 @@ _edje_entry_autocapital_type_get(Edje_Real_Part *rp)
2499} 2653}
2500 2654
2501void 2655void
2656_edje_entry_prediction_allow_set(Edje_Real_Part *rp, Eina_Bool prediction)
2657{
2658 Entry *en = rp->entry_data;
2659
2660 if (!en) return;
2661 en->prediction_allow = prediction;
2662#ifdef HAVE_ECORE_IMF
2663 if (en->imf_context)
2664 ecore_imf_context_prediction_allow_set(en->imf_context, prediction);
2665#endif
2666}
2667
2668Eina_Bool
2669_edje_entry_prediction_allow_get(Edje_Real_Part *rp)
2670{
2671 Entry *en = rp->entry_data;
2672 if (!en) return EINA_FALSE;
2673
2674 return en->prediction_allow;
2675}
2676
2677void
2502_edje_entry_input_panel_enabled_set(Edje_Real_Part *rp, Eina_Bool enabled) 2678_edje_entry_input_panel_enabled_set(Edje_Real_Part *rp, Eina_Bool enabled)
2503{ 2679{
2504 Entry *en = rp->entry_data; 2680 Entry *en = rp->entry_data;
2505 2681
2506 if (!en) return; 2682 if (!en) return;
2683 en->input_panel_enable = enabled;
2507#ifdef HAVE_ECORE_IMF 2684#ifdef HAVE_ECORE_IMF
2508 if (en->imf_context) 2685 if (en->imf_context)
2509 ecore_imf_context_input_panel_enabled_set(en->imf_context, enabled); 2686 ecore_imf_context_input_panel_enabled_set(en->imf_context, enabled);
2510#else
2511 (void) enabled;
2512#endif 2687#endif
2513} 2688}
2514 2689
@@ -2517,11 +2692,121 @@ _edje_entry_input_panel_enabled_get(Edje_Real_Part *rp)
2517{ 2692{
2518 Entry *en = rp->entry_data; 2693 Entry *en = rp->entry_data;
2519 if (!en) return EINA_FALSE; 2694 if (!en) return EINA_FALSE;
2695
2696 return en->input_panel_enable;
2697}
2698
2699void
2700_edje_entry_input_panel_show(Edje_Real_Part *rp)
2701{
2702 Entry *en = rp->entry_data;
2703
2704 if (!en) return;
2705#ifdef HAVE_ECORE_IMF
2706 if (en->imf_context)
2707 ecore_imf_context_input_panel_show(en->imf_context);
2708#endif
2709}
2710
2711void
2712_edje_entry_input_panel_hide(Edje_Real_Part *rp)
2713{
2714 Entry *en = rp->entry_data;
2715
2716 if (!en) return;
2520#ifdef HAVE_ECORE_IMF 2717#ifdef HAVE_ECORE_IMF
2521 if (en->imf_context) 2718 if (en->imf_context)
2522 return ecore_imf_context_input_panel_enabled_get(en->imf_context); 2719 ecore_imf_context_input_panel_hide(en->imf_context);
2523#endif 2720#endif
2721}
2722
2723void
2724_edje_entry_input_panel_language_set(Edje_Real_Part *rp, Edje_Input_Panel_Lang lang)
2725{
2726 Entry *en = rp->entry_data;
2524 2727
2728 if (!en) return;
2729 en->input_panel_lang = lang;
2730#ifdef HAVE_ECORE_IMF
2731 if (en->imf_context)
2732 ecore_imf_context_input_panel_language_set(en->imf_context, lang);
2733#endif
2734}
2735
2736Edje_Input_Panel_Lang
2737_edje_entry_input_panel_language_get(Edje_Real_Part *rp)
2738{
2739 Entry *en = rp->entry_data;
2740 if (!en) return EDJE_INPUT_PANEL_LANG_AUTOMATIC;
2741
2742 return en->input_panel_lang;
2743}
2744
2745void
2746_edje_entry_input_panel_imdata_set(Edje_Real_Part *rp, const void *data, int len)
2747{
2748 Entry *en = rp->entry_data;
2749 if (!en) return;
2750#ifdef HAVE_ECORE_IMF
2751 if (en->imf_context)
2752 ecore_imf_context_input_panel_imdata_set(en->imf_context, data, len);
2753#endif
2754}
2755
2756void
2757_edje_entry_input_panel_imdata_get(Edje_Real_Part *rp, void *data, int *len)
2758{
2759 Entry *en = rp->entry_data;
2760 if (!en) return;
2761#ifdef HAVE_ECORE_IMF
2762 if (en->imf_context)
2763 ecore_imf_context_input_panel_imdata_get(en->imf_context, data, len);
2764#endif
2765}
2766
2767void
2768_edje_entry_input_panel_return_key_type_set(Edje_Real_Part *rp, Edje_Input_Panel_Return_Key_Type return_key_type)
2769{
2770 Entry *en = rp->entry_data;
2771 if (!en) return;
2772#ifdef HAVE_ECORE_IMF
2773 if (en->imf_context)
2774 ecore_imf_context_input_panel_return_key_type_set(en->imf_context, return_key_type);
2775#endif
2776}
2777
2778Edje_Input_Panel_Return_Key_Type
2779_edje_entry_input_panel_return_key_type_get(Edje_Real_Part *rp)
2780{
2781 Entry *en = rp->entry_data;
2782 if (!en) return EDJE_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT;
2783#ifdef HAVE_ECORE_IMF
2784 if (en->imf_context)
2785 return ecore_imf_context_input_panel_return_key_type_get(en->imf_context);
2786#endif
2787 return EDJE_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT;
2788}
2789
2790void
2791_edje_entry_input_panel_return_key_disabled_set(Edje_Real_Part *rp, Eina_Bool disabled)
2792{
2793 Entry *en = rp->entry_data;
2794 if (!en) return;
2795#ifdef HAVE_ECORE_IMF
2796 if (en->imf_context)
2797 ecore_imf_context_input_panel_return_key_disabled_set(en->imf_context, disabled);
2798#endif
2799}
2800
2801Eina_Bool
2802_edje_entry_input_panel_return_key_disabled_get(Edje_Real_Part *rp)
2803{
2804 Entry *en = rp->entry_data;
2805 if (!en) return EINA_FALSE;
2806#ifdef HAVE_ECORE_IMF
2807 if (en->imf_context)
2808 return ecore_imf_context_input_panel_return_key_disabled_get(en->imf_context);
2809#endif
2525 return EINA_FALSE; 2810 return EINA_FALSE;
2526} 2811}
2527 2812
@@ -2568,7 +2853,7 @@ _edje_entry_cursor_next(Edje_Real_Part *rp, Edje_Cursor cur)
2568 Evas_Textblock_Cursor *c = _cursor_get(rp, cur); 2853 Evas_Textblock_Cursor *c = _cursor_get(rp, cur);
2569 if (!c) return EINA_FALSE; 2854 if (!c) return EINA_FALSE;
2570 2855
2571 _edje_entry_imf_context_reset(en); 2856 _edje_entry_imf_context_reset(rp);
2572 2857
2573 if (!evas_textblock_cursor_char_next(c)) 2858 if (!evas_textblock_cursor_char_next(c))
2574 { 2859 {
@@ -2589,7 +2874,7 @@ _edje_entry_cursor_prev(Edje_Real_Part *rp, Edje_Cursor cur)
2589 Evas_Textblock_Cursor *c = _cursor_get(rp, cur); 2874 Evas_Textblock_Cursor *c = _cursor_get(rp, cur);
2590 if (!c) return EINA_FALSE; 2875 if (!c) return EINA_FALSE;
2591 2876
2592 _edje_entry_imf_context_reset(en); 2877 _edje_entry_imf_context_reset(rp);
2593 2878
2594 if (!evas_textblock_cursor_char_prev(c)) 2879 if (!evas_textblock_cursor_char_prev(c))
2595 { 2880 {
@@ -2615,7 +2900,7 @@ _edje_entry_cursor_up(Edje_Real_Part *rp, Edje_Cursor cur)
2615 int ln; 2900 int ln;
2616 if (!c) return EINA_FALSE; 2901 if (!c) return EINA_FALSE;
2617 2902
2618 _edje_entry_imf_context_reset(en); 2903 _edje_entry_imf_context_reset(rp);
2619 2904
2620 ln = evas_textblock_cursor_line_geometry_get(c, NULL, NULL, NULL, NULL); 2905 ln = evas_textblock_cursor_line_geometry_get(c, NULL, NULL, NULL, NULL);
2621 ln--; 2906 ln--;
@@ -2649,7 +2934,7 @@ _edje_entry_cursor_down(Edje_Real_Part *rp, Edje_Cursor cur)
2649 int ln; 2934 int ln;
2650 if (!c) return EINA_FALSE; 2935 if (!c) return EINA_FALSE;
2651 2936
2652 _edje_entry_imf_context_reset(en); 2937 _edje_entry_imf_context_reset(rp);
2653 2938
2654 ln = evas_textblock_cursor_line_geometry_get(c, NULL, NULL, NULL, NULL); 2939 ln = evas_textblock_cursor_line_geometry_get(c, NULL, NULL, NULL, NULL);
2655 ln++; 2940 ln++;
@@ -2679,7 +2964,7 @@ _edje_entry_cursor_begin(Edje_Real_Part *rp, Edje_Cursor cur)
2679 Evas_Textblock_Cursor *c = _cursor_get(rp, cur); 2964 Evas_Textblock_Cursor *c = _cursor_get(rp, cur);
2680 if (!c) return; 2965 if (!c) return;
2681 2966
2682 _edje_entry_imf_context_reset(en); 2967 _edje_entry_imf_context_reset(rp);
2683 2968
2684 evas_textblock_cursor_paragraph_first(c); 2969 evas_textblock_cursor_paragraph_first(c);
2685 _sel_update(c, rp->object, rp->entry_data); 2970 _sel_update(c, rp->object, rp->entry_data);
@@ -2696,7 +2981,7 @@ _edje_entry_cursor_end(Edje_Real_Part *rp, Edje_Cursor cur)
2696 Evas_Textblock_Cursor *c = _cursor_get(rp, cur); 2981 Evas_Textblock_Cursor *c = _cursor_get(rp, cur);
2697 if (!c) return; 2982 if (!c) return;
2698 2983
2699 _edje_entry_imf_context_reset(en); 2984 _edje_entry_imf_context_reset(rp);
2700 2985
2701 _curs_end(c, rp->object, rp->entry_data); 2986 _curs_end(c, rp->object, rp->entry_data);
2702 _sel_update(c, rp->object, rp->entry_data); 2987 _sel_update(c, rp->object, rp->entry_data);
@@ -2721,7 +3006,7 @@ _edje_entry_cursor_copy(Edje_Real_Part *rp, Edje_Cursor cur, Edje_Cursor dst)
2721 evas_textblock_cursor_copy(c, d); 3006 evas_textblock_cursor_copy(c, d);
2722 _sel_update(c, rp->object, rp->entry_data); 3007 _sel_update(c, rp->object, rp->entry_data);
2723 3008
2724 _edje_entry_imf_context_reset(en); 3009 _edje_entry_imf_context_reset(rp);
2725 _edje_entry_imf_cursor_info_set(en); 3010 _edje_entry_imf_cursor_info_set(en);
2726 _edje_emit(rp->edje, "cursor,changed", rp->part->name); 3011 _edje_emit(rp->edje, "cursor,changed", rp->part->name);
2727 _edje_entry_real_part_configure(rp); 3012 _edje_entry_real_part_configure(rp);
@@ -2733,7 +3018,7 @@ _edje_entry_cursor_line_begin(Edje_Real_Part *rp, Edje_Cursor cur)
2733 Entry *en = rp->entry_data; 3018 Entry *en = rp->entry_data;
2734 Evas_Textblock_Cursor *c = _cursor_get(rp, cur); 3019 Evas_Textblock_Cursor *c = _cursor_get(rp, cur);
2735 if (!c) return; 3020 if (!c) return;
2736 _edje_entry_imf_context_reset(en); 3021 _edje_entry_imf_context_reset(rp);
2737 3022
2738 evas_textblock_cursor_line_char_first(c); 3023 evas_textblock_cursor_line_char_first(c);
2739 _sel_update(c, rp->object, rp->entry_data); 3024 _sel_update(c, rp->object, rp->entry_data);
@@ -2750,7 +3035,7 @@ _edje_entry_cursor_line_end(Edje_Real_Part *rp, Edje_Cursor cur)
2750 Entry *en = rp->entry_data; 3035 Entry *en = rp->entry_data;
2751 Evas_Textblock_Cursor *c = _cursor_get(rp, cur); 3036 Evas_Textblock_Cursor *c = _cursor_get(rp, cur);
2752 if (!c) return; 3037 if (!c) return;
2753 _edje_entry_imf_context_reset(en); 3038 _edje_entry_imf_context_reset(rp);
2754 evas_textblock_cursor_line_char_last(c); 3039 evas_textblock_cursor_line_char_last(c);
2755 _sel_update(c, rp->object, rp->entry_data); 3040 _sel_update(c, rp->object, rp->entry_data);
2756 3041
@@ -2810,9 +3095,9 @@ _edje_entry_cursor_pos_set(Edje_Real_Part *rp, Edje_Cursor cur, int pos)
2810 if (!c) return; 3095 if (!c) return;
2811 /* Abort if cursor position didn't really change */ 3096 /* Abort if cursor position didn't really change */
2812 if (evas_textblock_cursor_pos_get(c) == pos) 3097 if (evas_textblock_cursor_pos_get(c) == pos)
2813 return; 3098 return;
2814 3099
2815 _edje_entry_imf_context_reset(en); 3100 _edje_entry_imf_context_reset(rp);
2816 evas_textblock_cursor_pos_set(c, pos); 3101 evas_textblock_cursor_pos_set(c, pos);
2817 _sel_update(c, rp->object, rp->entry_data); 3102 _sel_update(c, rp->object, rp->entry_data);
2818 3103
@@ -2855,14 +3140,14 @@ _edje_entry_input_panel_layout_get(Edje_Real_Part *rp)
2855 return EDJE_INPUT_PANEL_LAYOUT_INVALID; 3140 return EDJE_INPUT_PANEL_LAYOUT_INVALID;
2856} 3141}
2857 3142
2858static void 3143void
2859_edje_entry_imf_context_reset(Entry *en) 3144_edje_entry_imf_context_reset(Edje_Real_Part *rp)
2860{ 3145{
3146 Entry *en = rp->entry_data;
3147 if (!en) return;
2861#ifdef HAVE_ECORE_IMF 3148#ifdef HAVE_ECORE_IMF
2862 if (en->imf_context) 3149 if (en->imf_context)
2863 ecore_imf_context_reset(en->imf_context); 3150 ecore_imf_context_reset(en->imf_context);
2864#else
2865 (void) en;
2866#endif 3151#endif
2867} 3152}
2868 3153
@@ -3019,7 +3304,6 @@ _edje_entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx __UN
3019 { 3304 {
3020 /* delete selected characters */ 3305 /* delete selected characters */
3021 _range_del_emit(ed, en->cursor, rp->object, en); 3306 _range_del_emit(ed, en->cursor, rp->object, en);
3022 _sel_clear(en->cursor, rp->object, en);
3023 } 3307 }
3024 3308
3025 /* delete preedit characters */ 3309 /* delete preedit characters */
diff --git a/libraries/edje/src/lib/edje_load.c b/libraries/edje/src/lib/edje_load.c
index 8fe5842..b63cd88 100644
--- a/libraries/edje/src/lib/edje_load.c
+++ b/libraries/edje/src/lib/edje_load.c
@@ -132,7 +132,7 @@ edje_file_group_exists(const char *file, const char *glob)
132 edf = _edje_cache_file_coll_open(file, NULL, &error_ret, NULL); 132 edf = _edje_cache_file_coll_open(file, NULL, &error_ret, NULL);
133 if (!edf) 133 if (!edf)
134 return EINA_FALSE; 134 return EINA_FALSE;
135 135
136 for (p = glob; *p; p++) 136 for (p = glob; *p; p++)
137 { 137 {
138 if ((*p == '*') || (*p == '?') || (*p == '[')) 138 if ((*p == '*') || (*p == '?') || (*p == '['))
@@ -141,7 +141,7 @@ edje_file_group_exists(const char *file, const char *glob)
141 break; 141 break;
142 } 142 }
143 } 143 }
144 144
145 if (is_glob) 145 if (is_glob)
146 { 146 {
147 if (!edf->collection_patterns) 147 if (!edf->collection_patterns)
@@ -149,18 +149,18 @@ edje_file_group_exists(const char *file, const char *glob)
149 Edje_Part_Collection_Directory_Entry *ce; 149 Edje_Part_Collection_Directory_Entry *ce;
150 Eina_Iterator *i; 150 Eina_Iterator *i;
151 Eina_List *l = NULL; 151 Eina_List *l = NULL;
152 152
153 i = eina_hash_iterator_data_new(edf->collection); 153 i = eina_hash_iterator_data_new(edf->collection);
154 154
155 EINA_ITERATOR_FOREACH(i, ce) 155 EINA_ITERATOR_FOREACH(i, ce)
156 l = eina_list_append(l, ce); 156 l = eina_list_append(l, ce);
157 157
158 eina_iterator_free(i); 158 eina_iterator_free(i);
159 159
160 edf->collection_patterns = edje_match_collection_dir_init(l); 160 edf->collection_patterns = edje_match_collection_dir_init(l);
161 eina_list_free(l); 161 eina_list_free(l);
162 } 162 }
163 163
164 succeed = edje_match_collection_dir_exec(edf->collection_patterns, glob); 164 succeed = edje_match_collection_dir_exec(edf->collection_patterns, glob);
165 if (edf->collection_patterns) 165 if (edf->collection_patterns)
166 { 166 {
@@ -226,6 +226,20 @@ _edje_programs_patterns_init(Edje *ed)
226 if (ssp->signals_patterns) 226 if (ssp->signals_patterns)
227 return; 227 return;
228 228
229 if (getenv("EDJE_DUMP_PROGRAMS"))
230 {
231 INF("Group '%s' programs:", ed->group);
232#define EDJE_DUMP_PROGRAM(Section) \
233 for (i = 0; i < ed->collection->programs.Section##_count; i++) \
234 INF(#Section" for ('%s', '%s')", ed->collection->programs.Section[i]->signal, ed->collection->programs.Section[i]->source);
235
236 EDJE_DUMP_PROGRAM(strcmp);
237 EDJE_DUMP_PROGRAM(strncmp);
238 EDJE_DUMP_PROGRAM(strrncmp);
239 EDJE_DUMP_PROGRAM(fnmatch);
240 EDJE_DUMP_PROGRAM(nocmp);
241 }
242
229 edje_match_program_hash_build(ed->collection->programs.strcmp, 243 edje_match_program_hash_build(ed->collection->programs.strcmp,
230 ed->collection->programs.strcmp_count, 244 ed->collection->programs.strcmp_count,
231 &ssp->exact_match); 245 &ssp->exact_match);
@@ -294,6 +308,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
294 308
295 ed->load_error = EDJE_LOAD_ERROR_NONE; 309 ed->load_error = EDJE_LOAD_ERROR_NONE;
296 _edje_file_add(ed); 310 _edje_file_add(ed);
311 ed->block_break = 0;
297 312
298 if (ed->file && ed->file->external_dir) 313 if (ed->file && ed->file->external_dir)
299 { 314 {
diff --git a/libraries/edje/src/lib/edje_lua2.c b/libraries/edje/src/lib/edje_lua2.c
index 1d167e9..fd88f31 100644
--- a/libraries/edje/src/lib/edje_lua2.c
+++ b/libraries/edje/src/lib/edje_lua2.c
@@ -6,11 +6,6 @@
6 6
7#define RASTER_FORGOT_WHY "this is here." 7#define RASTER_FORGOT_WHY "this is here."
8 8
9#ifdef _WIN32
10# define FMT_SIZE_T "%Iu"
11#else
12# define FMT_SIZE_T "%zu"
13#endif
14 9
15//--------------------------------------------------------------------------// 10//--------------------------------------------------------------------------//
16#define MAX_LUA_MEM (4 * (1024 * 1024)) 11#define MAX_LUA_MEM (4 * (1024 * 1024))
@@ -216,7 +211,7 @@ _elua_alloc(void *ud, void *ptr, size_t osize, size_t nsize)
216 ela->cur += nsize - osize; 211 ela->cur += nsize - osize;
217 if (ela->cur > ela->max) 212 if (ela->cur > ela->max)
218 { 213 {
219 ERR("Lua memory limit of " FMT_SIZE_T " bytes reached (" FMT_SIZE_T " allocated)", 214 ERR("Lua memory limit of %zu bytes reached (%zu allocated)",
220 ela->max, ela->cur); 215 ela->max, ela->cur);
221 return NULL; 216 return NULL;
222 } 217 }
@@ -228,7 +223,7 @@ _elua_alloc(void *ud, void *ptr, size_t osize, size_t nsize)
228 223
229 ptr2 = realloc(ptr, nsize); 224 ptr2 = realloc(ptr, nsize);
230 if (ptr2) return ptr2; 225 if (ptr2) return ptr2;
231 ERR("Lua cannot re-allocate " FMT_SIZE_T " bytes", nsize); 226 ERR("Lua cannot re-allocate %zu bytes", nsize);
232 return ptr2; 227 return ptr2;
233} 228}
234 229
@@ -698,7 +693,7 @@ static int
698_elua_echo(lua_State *L) // Stack usage [-0, +0, v] 693_elua_echo(lua_State *L) // Stack usage [-0, +0, v]
699{ 694{
700 const char *string = luaL_checkstring(L, 1); // Stack usage [-0, +0, v] 695 const char *string = luaL_checkstring(L, 1); // Stack usage [-0, +0, v]
701 LD("%s\n", string); 696 LD("%s", string);
702 return 0; 697 return 0;
703} 698}
704 699
@@ -2657,16 +2652,16 @@ _elua_edje_file(lua_State *L) // Stack usage [
2657 2652
2658 switch (err) 2653 switch (err)
2659 { 2654 {
2660 case EDJE_LOAD_ERROR_NONE : LE("Edje file loading errer %s %s - no error happened, but you should not see this.\n", obj->ed->file->path, group); break; 2655 case EDJE_LOAD_ERROR_NONE : LE("Edje file loading errer %s %s - no error happened, but you should not see this.", obj->ed->file->path, group); break;
2661 case EDJE_LOAD_ERROR_GENERIC : LE("Edje file loading errer %s %s - generic error.\n", obj->ed->file->path, group); break; 2656 case EDJE_LOAD_ERROR_GENERIC : LE("Edje file loading errer %s %s - generic error.", obj->ed->file->path, group); break;
2662 case EDJE_LOAD_ERROR_DOES_NOT_EXIST : LE("Edje file loading errer %s %s - file does not exist.\n", obj->ed->file->path, group); break; 2657 case EDJE_LOAD_ERROR_DOES_NOT_EXIST : LE("Edje file loading errer %s %s - file does not exist.", obj->ed->file->path, group); break;
2663 case EDJE_LOAD_ERROR_PERMISSION_DENIED : LE("Edje file loading errer %s %s - permission denied reading the file.\n", obj->ed->file->path, group); break; 2658 case EDJE_LOAD_ERROR_PERMISSION_DENIED : LE("Edje file loading errer %s %s - permission denied reading the file.", obj->ed->file->path, group); break;
2664 case EDJE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED : LE("Edje file loading errer %s %s - resource allocation failed.\n", obj->ed->file->path, group); break; 2659 case EDJE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED : LE("Edje file loading errer %s %s - resource allocation failed.", obj->ed->file->path, group); break;
2665 case EDJE_LOAD_ERROR_CORRUPT_FILE : LE("Edje file loading errer %s %s - corrupt file.\n", obj->ed->file->path, group); break; 2660 case EDJE_LOAD_ERROR_CORRUPT_FILE : LE("Edje file loading errer %s %s - corrupt file.", obj->ed->file->path, group); break;
2666 case EDJE_LOAD_ERROR_UNKNOWN_FORMAT : LE("Edje file loading errer %s %s - unknown file format.\n", obj->ed->file->path, group); break; 2661 case EDJE_LOAD_ERROR_UNKNOWN_FORMAT : LE("Edje file loading errer %s %s - unknown file format.", obj->ed->file->path, group); break;
2667 case EDJE_LOAD_ERROR_INCOMPATIBLE_FILE : LE("Edje file loading errer %s %s - incompatible file.\n", obj->ed->file->path, group); break; 2662 case EDJE_LOAD_ERROR_INCOMPATIBLE_FILE : LE("Edje file loading errer %s %s - incompatible file.", obj->ed->file->path, group); break;
2668 case EDJE_LOAD_ERROR_UNKNOWN_COLLECTION : LE("Edje file loading errer %s %s - unknown group.\n", obj->ed->file->path, group); break; 2663 case EDJE_LOAD_ERROR_UNKNOWN_COLLECTION : LE("Edje file loading errer %s %s - unknown group.", obj->ed->file->path, group); break;
2669 case EDJE_LOAD_ERROR_RECURSIVE_REFERENCE : LE("Edje file loading errer %s %s - recursive reference in group.\n", obj->ed->file->path, group); break; 2664 case EDJE_LOAD_ERROR_RECURSIVE_REFERENCE : LE("Edje file loading errer %s %s - recursive reference in group.", obj->ed->file->path, group); break;
2670 } 2665 }
2671 } 2666 }
2672 } 2667 }
@@ -2865,13 +2860,14 @@ _elua_image_image(lua_State *L) // Stack usage [
2865 } 2860 }
2866 } 2861 }
2867 2862
2868 /* Sandbox lua - Only allow access to images within the same edje file. I'm not so sure we need this level of sandboxing though. So leaving it here, just in case.
2869 if (-1 == id) 2863 if (-1 == id)
2870 { 2864 {
2871 LI("Image %s not found in our edje file, trying external image file %s.\n", key, file); 2865 LE("Image %s not found in our edje file.", key);
2866 /* Sandbox lua - Only allow access to images within the same edje file. I'm not so sure we need this level of sandboxing though. So leaving it here, just in case.
2867 LI("Image %s not found in our edje file, trying external image file %s.", key, file);
2872 evas_object_image_file_set(elo->evas_obj, file, key); 2868 evas_object_image_file_set(elo->evas_obj, file, key);
2869 */
2873 } 2870 }
2874 */
2875 } 2871 }
2876 evas_object_image_file_get(elo->evas_obj, &file, &key); 2872 evas_object_image_file_get(elo->evas_obj, &file, &key);
2877 _elua_ret(L, "$file $key", file, key); 2873 _elua_ret(L, "$file $key", file, key);
diff --git a/libraries/edje/src/lib/edje_main.c b/libraries/edje/src/lib/edje_main.c
index 5d011ad..f70efb9 100644
--- a/libraries/edje/src/lib/edje_main.c
+++ b/libraries/edje/src/lib/edje_main.c
@@ -233,6 +233,11 @@ _edje_del(Edje *ed)
233 eina_stringshare_del(cb->part); 233 eina_stringshare_del(cb->part);
234 free(cb); 234 free(cb);
235 } 235 }
236 EINA_LIST_FREE(ed->markup_filter_callbacks, cb)
237 {
238 eina_stringshare_del(cb->part);
239 free(cb);
240 }
236 241
237 if (ed->members.text_class) 242 if (ed->members.text_class)
238 { 243 {
diff --git a/libraries/edje/src/lib/edje_multisense.c b/libraries/edje/src/lib/edje_multisense.c
index f3324e7..a35b223 100644
--- a/libraries/edje/src/lib/edje_multisense.c
+++ b/libraries/edje/src/lib/edje_multisense.c
@@ -1,8 +1,3 @@
1#include "config.h"
2#include <string.h>
3#include <fcntl.h>
4#include <Eina.h>
5#include <Edje.h>
6#include "edje_private.h" 1#include "edje_private.h"
7 2
8typedef struct _Multisense_Data 3typedef struct _Multisense_Data
diff --git a/libraries/edje/src/lib/edje_private.h b/libraries/edje/src/lib/edje_private.h
index 8bf18eb..1d5aee9 100644
--- a/libraries/edje/src/lib/edje_private.h
+++ b/libraries/edje/src/lib/edje_private.h
@@ -9,18 +9,30 @@
9# define _GNU_SOURCE 9# define _GNU_SOURCE
10#endif 10#endif
11 11
12#ifdef STDC_HEADERS
13# include <stdlib.h>
14# include <stddef.h>
15#else
16# ifdef HAVE_STDLIB_H
17# include <stdlib.h>
18# endif
19#endif
12#ifdef HAVE_ALLOCA_H 20#ifdef HAVE_ALLOCA_H
13# include <alloca.h> 21# include <alloca.h>
14#elif defined __GNUC__ 22#elif !defined alloca
15# define alloca __builtin_alloca 23# ifdef __GNUC__
16#elif defined _AIX 24# define alloca __builtin_alloca
17# define alloca __alloca 25# elif defined _AIX
18#elif defined _MSC_VER 26# define alloca __alloca
19# include <malloc.h> 27# elif defined _MSC_VER
20# define alloca _alloca 28# include <malloc.h>
21#else 29# define alloca _alloca
22# include <stddef.h> 30# elif !defined HAVE_ALLOCA
31# ifdef __cplusplus
32extern "C"
33# endif
23void *alloca (size_t); 34void *alloca (size_t);
35# endif
24#endif 36#endif
25 37
26#include <string.h> 38#include <string.h>
@@ -35,6 +47,8 @@ void *alloca (size_t);
35# include <unistd.h> 47# include <unistd.h>
36#endif 48#endif
37 49
50#include <fcntl.h>
51
38#include <lua.h> 52#include <lua.h>
39#include <lualib.h> 53#include <lualib.h>
40#include <lauxlib.h> 54#include <lauxlib.h>
@@ -62,7 +76,7 @@ void *alloca (size_t);
62 76
63#include "Edje.h" 77#include "Edje.h"
64 78
65EAPI extern int _edje_default_log_dom ; 79EAPI extern int _edje_default_log_dom ;
66 80
67#ifdef EDJE_DEFAULT_LOG_COLOR 81#ifdef EDJE_DEFAULT_LOG_COLOR
68# undef EDJE_DEFAULT_LOG_COLOR 82# undef EDJE_DEFAULT_LOG_COLOR
@@ -84,6 +98,10 @@ EAPI extern int _edje_default_log_dom ;
84# undef CRIT 98# undef CRIT
85#endif 99#endif
86#define CRIT(...) EINA_LOG_DOM_CRIT(_edje_default_log_dom, __VA_ARGS__) 100#define CRIT(...) EINA_LOG_DOM_CRIT(_edje_default_log_dom, __VA_ARGS__)
101#ifdef DBG
102# undef DBG
103#endif
104#define DBG(...) EINA_LOG_DOM_DBG(_edje_default_log_dom, __VA_ARGS__)
87#ifdef __GNUC__ 105#ifdef __GNUC__
88# if __GNUC__ >= 4 106# if __GNUC__ >= 4
89// BROKEN in gcc 4 on amd64 107// BROKEN in gcc 4 on amd64
@@ -173,7 +191,7 @@ struct _Edje_Smart_Api
173/* increment this when you add new feature to edje file format without 191/* increment this when you add new feature to edje file format without
174 * breaking backward compatibility. 192 * breaking backward compatibility.
175 */ 193 */
176#define EDJE_FILE_MINOR 2 194#define EDJE_FILE_MINOR 3
177 195
178/* FIXME: 196/* FIXME:
179 * 197 *
@@ -218,6 +236,7 @@ struct _Edje_Position
218struct _Edje_Size 236struct _Edje_Size
219{ 237{
220 int w, h; 238 int w, h;
239 Eina_Bool limit; /* should we limit ourself to the size of the source */
221}; 240};
222 241
223struct _Edje_Rectangle 242struct _Edje_Rectangle
@@ -322,6 +341,7 @@ typedef struct _Edje_Var_Timer Edje_Var_Timer;
322typedef struct _Edje_Var_Pool Edje_Var_Pool; 341typedef struct _Edje_Var_Pool Edje_Var_Pool;
323typedef struct _Edje_Signal_Source_Char Edje_Signal_Source_Char; 342typedef struct _Edje_Signal_Source_Char Edje_Signal_Source_Char;
324typedef struct _Edje_Text_Insert_Filter_Callback Edje_Text_Insert_Filter_Callback; 343typedef struct _Edje_Text_Insert_Filter_Callback Edje_Text_Insert_Filter_Callback;
344typedef struct _Edje_Markup_Filter_Callback Edje_Markup_Filter_Callback;
325 345
326#define EDJE_INF_MAX_W 100000 346#define EDJE_INF_MAX_W 100000
327#define EDJE_INF_MAX_H 100000 347#define EDJE_INF_MAX_H 100000
@@ -612,6 +632,8 @@ struct _Edje_Program /* a conditional program to be run */
612 int src; /* part where parameter is being retrieved */ 632 int src; /* part where parameter is being retrieved */
613 int dst; /* part where parameter is being stored */ 633 int dst; /* part where parameter is being stored */
614 } param; 634 } param;
635
636 Eina_Bool exec : 1;
615}; 637};
616 638
617struct _Edje_Program_Target /* the target of an action */ 639struct _Edje_Program_Target /* the target of an action */
@@ -752,6 +774,8 @@ struct _Edje_Part_Collection
752 774
753 unsigned char lua_script_only; 775 unsigned char lua_script_only;
754 776
777 unsigned char broadcast_signal;
778
755 unsigned char checked : 1; 779 unsigned char checked : 1;
756}; 780};
757 781
@@ -839,7 +863,7 @@ struct _Edje_Part_Description_Common
839 unsigned char have; 863 unsigned char have;
840 FLOAT_T w, h; 864 FLOAT_T w, h;
841 } minmul; 865 } minmul;
842 866
843 Edje_Size min, max; 867 Edje_Size min, max;
844 Edje_Position step; /* size stepping by n pixels, 0 = none */ 868 Edje_Position step; /* size stepping by n pixels, 0 = none */
845 Edje_Aspect_Prefer aspect; 869 Edje_Aspect_Prefer aspect;
@@ -1074,6 +1098,7 @@ struct _Edje
1074 Edje_Real_Part *focused_part; 1098 Edje_Real_Part *focused_part;
1075 Eina_List *subobjs; 1099 Eina_List *subobjs;
1076 Eina_List *text_insert_filter_callbacks; 1100 Eina_List *text_insert_filter_callbacks;
1101 Eina_List *markup_filter_callbacks;
1077 void *script_only_data; 1102 void *script_only_data;
1078 1103
1079 int table_programs_size; 1104 int table_programs_size;
@@ -1145,6 +1170,8 @@ struct _Edje
1145#endif 1170#endif
1146 unsigned int have_mapped_part : 1; 1171 unsigned int have_mapped_part : 1;
1147 unsigned int recalc_call : 1; 1172 unsigned int recalc_call : 1;
1173 unsigned int update_hints : 1;
1174 unsigned int recalc_hints : 1;
1148}; 1175};
1149 1176
1150struct _Edje_Calc_Params 1177struct _Edje_Calc_Params
@@ -1179,7 +1206,7 @@ struct _Edje_Calc_Params
1179 int x, y, z; 1206 int x, y, z;
1180 } center; // 12 1207 } center; // 12
1181 struct { 1208 struct {
1182 double x, y, z; 1209 FLOAT_T x, y, z;
1183 } rotation; // 24 1210 } rotation; // 24
1184 struct { 1211 struct {
1185 int x, y, z; 1212 int x, y, z;
@@ -1334,6 +1361,13 @@ struct _Edje_Text_Insert_Filter_Callback
1334 void *data; 1361 void *data;
1335}; 1362};
1336 1363
1364struct _Edje_Markup_Filter_Callback
1365{
1366 const char *part;
1367 Edje_Markup_Filter_Cb func;
1368 void *data;
1369};
1370
1337struct _Edje_Pending_Program 1371struct _Edje_Pending_Program
1338{ 1372{
1339 Edje *edje; 1373 Edje *edje;
@@ -1907,10 +1941,11 @@ const Eina_List *_edje_entry_anchors_list(Edje_Real_Part *rp);
1907Eina_Bool _edje_entry_item_geometry_get(Edje_Real_Part *rp, const char *item, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch); 1941Eina_Bool _edje_entry_item_geometry_get(Edje_Real_Part *rp, const char *item, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
1908const Eina_List *_edje_entry_items_list(Edje_Real_Part *rp); 1942const Eina_List *_edje_entry_items_list(Edje_Real_Part *rp);
1909void _edje_entry_cursor_geometry_get(Edje_Real_Part *rp, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch); 1943void _edje_entry_cursor_geometry_get(Edje_Real_Part *rp, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
1944void _edje_entry_user_insert(Edje_Real_Part *rp, const char *text);
1910void _edje_entry_select_allow_set(Edje_Real_Part *rp, Eina_Bool allow); 1945void _edje_entry_select_allow_set(Edje_Real_Part *rp, Eina_Bool allow);
1911Eina_Bool _edje_entry_select_allow_get(const Edje_Real_Part *rp); 1946Eina_Bool _edje_entry_select_allow_get(const Edje_Real_Part *rp);
1912void _edje_entry_select_abort(Edje_Real_Part *rp); 1947void _edje_entry_select_abort(Edje_Real_Part *rp);
1913 1948void *_edje_entry_imf_context_get(Edje_Real_Part *rp);
1914Eina_Bool _edje_entry_cursor_next(Edje_Real_Part *rp, Edje_Cursor cur); 1949Eina_Bool _edje_entry_cursor_next(Edje_Real_Part *rp, Edje_Cursor cur);
1915Eina_Bool _edje_entry_cursor_prev(Edje_Real_Part *rp, Edje_Cursor cur); 1950Eina_Bool _edje_entry_cursor_prev(Edje_Real_Part *rp, Edje_Cursor cur);
1916Eina_Bool _edje_entry_cursor_up(Edje_Real_Part *rp, Edje_Cursor cur); 1951Eina_Bool _edje_entry_cursor_up(Edje_Real_Part *rp, Edje_Cursor cur);
@@ -1925,12 +1960,25 @@ Eina_Bool _edje_entry_cursor_is_visible_format_get(Edje_Real_Part *rp, Edje_Curs
1925char *_edje_entry_cursor_content_get(Edje_Real_Part *rp, Edje_Cursor cur); 1960char *_edje_entry_cursor_content_get(Edje_Real_Part *rp, Edje_Cursor cur);
1926void _edje_entry_cursor_pos_set(Edje_Real_Part *rp, Edje_Cursor cur, int pos); 1961void _edje_entry_cursor_pos_set(Edje_Real_Part *rp, Edje_Cursor cur, int pos);
1927int _edje_entry_cursor_pos_get(Edje_Real_Part *rp, Edje_Cursor cur); 1962int _edje_entry_cursor_pos_get(Edje_Real_Part *rp, Edje_Cursor cur);
1963void _edje_entry_imf_context_reset(Edje_Real_Part *rp);
1928void _edje_entry_input_panel_layout_set(Edje_Real_Part *rp, Edje_Input_Panel_Layout layout); 1964void _edje_entry_input_panel_layout_set(Edje_Real_Part *rp, Edje_Input_Panel_Layout layout);
1929Edje_Input_Panel_Layout _edje_entry_input_panel_layout_get(Edje_Real_Part *rp); 1965Edje_Input_Panel_Layout _edje_entry_input_panel_layout_get(Edje_Real_Part *rp);
1930void _edje_entry_autocapital_type_set(Edje_Real_Part *rp, Edje_Text_Autocapital_Type autocapital_type); 1966void _edje_entry_autocapital_type_set(Edje_Real_Part *rp, Edje_Text_Autocapital_Type autocapital_type);
1931Edje_Text_Autocapital_Type _edje_entry_autocapital_type_get(Edje_Real_Part *rp); 1967Edje_Text_Autocapital_Type _edje_entry_autocapital_type_get(Edje_Real_Part *rp);
1968void _edje_entry_prediction_allow_set(Edje_Real_Part *rp, Eina_Bool prediction);
1969Eina_Bool _edje_entry_prediction_allow_get(Edje_Real_Part *rp);
1932void _edje_entry_input_panel_enabled_set(Edje_Real_Part *rp, Eina_Bool enabled); 1970void _edje_entry_input_panel_enabled_set(Edje_Real_Part *rp, Eina_Bool enabled);
1933Eina_Bool _edje_entry_input_panel_enabled_get(Edje_Real_Part *rp); 1971Eina_Bool _edje_entry_input_panel_enabled_get(Edje_Real_Part *rp);
1972void _edje_entry_input_panel_show(Edje_Real_Part *rp);
1973void _edje_entry_input_panel_hide(Edje_Real_Part *rp);
1974void _edje_entry_input_panel_language_set(Edje_Real_Part *rp, Edje_Input_Panel_Lang lang);
1975Edje_Input_Panel_Lang _edje_entry_input_panel_language_get(Edje_Real_Part *rp);
1976void _edje_entry_input_panel_imdata_set(Edje_Real_Part *rp, const void *data, int len);
1977void _edje_entry_input_panel_imdata_get(Edje_Real_Part *rp, void *data, int *len);
1978void _edje_entry_input_panel_return_key_type_set(Edje_Real_Part *rp, Edje_Input_Panel_Return_Key_Type return_key_type);
1979Edje_Input_Panel_Return_Key_Type _edje_entry_input_panel_return_key_type_get(Edje_Real_Part *rp);
1980void _edje_entry_input_panel_return_key_disabled_set(Edje_Real_Part *rp, Eina_Bool disabled);
1981Eina_Bool _edje_entry_input_panel_return_key_disabled_get(Edje_Real_Part *rp);
1934 1982
1935void _edje_external_init(); 1983void _edje_external_init();
1936void _edje_external_shutdown(); 1984void _edje_external_shutdown();
diff --git a/libraries/edje/src/lib/edje_program.c b/libraries/edje/src/lib/edje_program.c
index d80c7c9..d631364 100644
--- a/libraries/edje/src/lib/edje_program.c
+++ b/libraries/edje/src/lib/edje_program.c
@@ -531,7 +531,7 @@ _edje_program_run(Edje *ed, Edje_Program *pr, Eina_Bool force, const char *ssig,
531 } 531 }
532 532
533 if (rp->program) 533 if (rp->program)
534 _edje_program_end(ed, rp->program); 534 _edje_program_end(ed, rp->program);
535 _edje_part_description_apply(ed, rp, 535 _edje_part_description_apply(ed, rp,
536 rp->param1.description->state.name, 536 rp->param1.description->state.name,
537 rp->param1.description->state.value, 537 rp->param1.description->state.value,
@@ -570,7 +570,7 @@ _edje_program_run(Edje *ed, Edje_Program *pr, Eina_Bool force, const char *ssig,
570 if (rp) 570 if (rp)
571 { 571 {
572 if (rp->program) 572 if (rp->program)
573 _edje_program_end(ed, rp->program); 573 _edje_program_end(ed, rp->program);
574 _edje_part_description_apply(ed, rp, 574 _edje_part_description_apply(ed, rp,
575 pr->state, 575 pr->state,
576 pr->value, 576 pr->value,
@@ -873,8 +873,11 @@ _edje_emit_full(Edje *ed, const char *sig, const char *src, void *data, void (*f
873{ 873{
874 Edje_Message_Signal emsg; 874 Edje_Message_Signal emsg;
875 const char *sep; 875 const char *sep;
876 Eina_Bool broadcast;
876 877
878 if (!ed->collection) return;
877 if (ed->delete_me) return; 879 if (ed->delete_me) return;
880 broadcast = ed->collection->broadcast_signal;
878 881
879 sep = strchr(sig, EDJE_PART_PATH_SEPARATOR); 882 sep = strchr(sig, EDJE_PART_PATH_SEPARATOR);
880 883
@@ -958,6 +961,7 @@ _edje_emit_full(Edje *ed, const char *sig, const char *src, void *data, void (*f
958 if (!ed2) goto end; 961 if (!ed2) goto end;
959 962
960 _edje_emit(ed2, newsig, src); 963 _edje_emit(ed2, newsig, src);
964 broadcast = EINA_FALSE;
961 break; 965 break;
962 966
963 case EDJE_PART_TYPE_EXTERNAL: 967 case EDJE_PART_TYPE_EXTERNAL:
@@ -976,6 +980,7 @@ _edje_emit_full(Edje *ed, const char *sig, const char *src, void *data, void (*f
976 if (!ed2) goto end; 980 if (!ed2) goto end;
977 _edje_emit(ed2, newsig, src); 981 _edje_emit(ed2, newsig, src);
978 } 982 }
983 broadcast = EINA_FALSE;
979 break ; 984 break ;
980 985
981 case EDJE_PART_TYPE_BOX: 986 case EDJE_PART_TYPE_BOX:
@@ -988,6 +993,7 @@ _edje_emit_full(Edje *ed, const char *sig, const char *src, void *data, void (*f
988 ed2 = _edje_fetch(child); 993 ed2 = _edje_fetch(child);
989 if (!ed2) goto end; 994 if (!ed2) goto end;
990 _edje_emit(ed2, newsig, src); 995 _edje_emit(ed2, newsig, src);
996 broadcast = EINA_FALSE;
991 } 997 }
992 break ; 998 break ;
993 999
@@ -1012,7 +1018,10 @@ _edje_emit_full(Edje *ed, const char *sig, const char *src, void *data, void (*f
1012 emsg.data = NULL; 1018 emsg.data = NULL;
1013 } 1019 }
1014/* new sends code */ 1020/* new sends code */
1015 edje_object_message_send(ed->obj, EDJE_MESSAGE_SIGNAL, 0, &emsg); 1021 if (broadcast)
1022 edje_object_message_send(ed->obj, EDJE_MESSAGE_SIGNAL, 0, &emsg);
1023 else
1024 _edje_message_send(ed, EDJE_QUEUE_SCRIPT, EDJE_MESSAGE_SIGNAL, 0, &emsg);
1016/* old send code - use api now 1025/* old send code - use api now
1017 _edje_message_send(ed, EDJE_QUEUE_SCRIPT, EDJE_MESSAGE_SIGNAL, 0, &emsg); 1026 _edje_message_send(ed, EDJE_QUEUE_SCRIPT, EDJE_MESSAGE_SIGNAL, 0, &emsg);
1018 EINA_LIST_FOREACH(ed->subobjs, l, obj) 1027 EINA_LIST_FOREACH(ed->subobjs, l, obj)
@@ -1037,12 +1046,8 @@ _edje_emit_full(Edje *ed, const char *sig, const char *src, void *data, void (*f
1037 1046
1038struct _Edje_Program_Data 1047struct _Edje_Program_Data
1039{ 1048{
1040#ifdef EDJE_PROGRAM_CACHE
1041 Eina_List *matches; 1049 Eina_List *matches;
1042 int matched;
1043#endif
1044 Edje *ed; 1050 Edje *ed;
1045 const char *signal;
1046 const char *source; 1051 const char *source;
1047}; 1052};
1048 1053
@@ -1056,33 +1061,16 @@ static Eina_Bool _edje_glob_callback(Edje_Program *pr, void *dt)
1056 { 1061 {
1057 rp = _edje_real_part_get(data->ed, pr->filter.part ? pr->filter.part : data->source); 1062 rp = _edje_real_part_get(data->ed, pr->filter.part ? pr->filter.part : data->source);
1058 if (rp) 1063 if (rp)
1059 exec = (rp->chosen_description->state.name == pr->filter.state); 1064 exec = (rp->chosen_description->state.name == pr->filter.state);
1060 } 1065 }
1061 1066
1062#ifdef EDJE_PROGRAM_CACHE 1067 pr->exec = exec;
1063 data->matched++;
1064#endif
1065
1066 if (exec)
1067 _edje_program_run(data->ed, pr, 0, data->signal, data->source);
1068 1068
1069 if (_edje_block_break(data->ed))
1070 {
1071#ifdef EDJE_PROGRAM_CACHE
1072 eina_list_free(data->matches);
1073 data->matches = NULL;
1074#endif
1075 return EINA_TRUE;
1076 }
1077
1078#ifdef EDJE_PROGRAM_CACHE
1079 data->matches = eina_list_append(data->matches, pr); 1069 data->matches = eina_list_append(data->matches, pr);
1080#endif
1081 1070
1082 return EINA_FALSE; 1071 return EINA_FALSE;
1083} 1072}
1084 1073
1085
1086void 1074void
1087_edje_callbacks_patterns_clean(Edje *ed) 1075_edje_callbacks_patterns_clean(Edje *ed)
1088{ 1076{
@@ -1127,7 +1115,7 @@ _edje_emit_handle(Edje *ed, const char *sig, const char *src,
1127 1115
1128 if (ed->collection && ed->L) 1116 if (ed->collection && ed->L)
1129 _edje_lua2_script_func_signal(ed, sig, src); 1117 _edje_lua2_script_func_signal(ed, sig, src);
1130 1118
1131 if (ed->collection) 1119 if (ed->collection)
1132 { 1120 {
1133#ifdef EDJE_PROGRAM_CACHE 1121#ifdef EDJE_PROGRAM_CACHE
@@ -1156,11 +1144,11 @@ _edje_emit_handle(Edje *ed, const char *sig, const char *src,
1156 1144
1157 if (eina_hash_find(ec->prog_cache.no_matches, tmps)) 1145 if (eina_hash_find(ec->prog_cache.no_matches, tmps))
1158 { 1146 {
1159 done = 1; 1147 done = 1;
1160 } 1148 }
1161 else if ((matches = eina_hash_find(ec->prog_cache.matches, tmps))) 1149 else if ((matches = eina_hash_find(ec->prog_cache.matches, tmps)))
1162 { 1150 {
1163 EINA_LIST_FOREACH(matches, l, pr) 1151 EINA_LIST_FOREACH(matches, l, pr)
1164 { 1152 {
1165 Eina_Bool exec = EINA_TRUE; 1153 Eina_Bool exec = EINA_TRUE;
1166 1154
@@ -1169,10 +1157,12 @@ _edje_emit_handle(Edje *ed, const char *sig, const char *src,
1169 Edje_Real_Part *rp; 1157 Edje_Real_Part *rp;
1170 1158
1171 rp = _edje_real_part_get(ed, pr->filter.part ? pr->filter.part : src); 1159 rp = _edje_real_part_get(ed, pr->filter.part ? pr->filter.part : src);
1172 if (rp) 1160 if (rp && !rp->program)
1173 exec = (rp->chosen_description->state.name == pr->filter.state); 1161 exec = (rp->chosen_description->state.name == pr->filter.state);
1174 } 1162 }
1175 1163
1164 pr->exec = exec;
1165#if 0
1176 if (exec) 1166 if (exec)
1177 { 1167 {
1178 _edje_program_run(ed, pr, 0, sig, src); 1168 _edje_program_run(ed, pr, 0, sig, src);
@@ -1181,7 +1171,19 @@ _edje_emit_handle(Edje *ed, const char *sig, const char *src,
1181 goto break_prog; 1171 goto break_prog;
1182 } 1172 }
1183 } 1173 }
1174#endif
1184 } 1175 }
1176
1177 EINA_LIST_FOREACH(matches, l, pr)
1178 if (pr->exec)
1179 {
1180 _edje_program_run(ed, pr, 0, sig, src);
1181 if (_edje_block_break(ed))
1182 {
1183 goto break_prog;
1184 }
1185 }
1186
1185 done = 1; 1187 done = 1;
1186 } 1188 }
1187 } 1189 }
@@ -1192,11 +1194,8 @@ _edje_emit_handle(Edje *ed, const char *sig, const char *src,
1192 1194
1193 data.ed = ed; 1195 data.ed = ed;
1194 data.source = src; 1196 data.source = src;
1195 data.signal = sig;
1196#ifdef EDJE_PROGRAM_CACHE
1197 data.matched = 0;
1198 data.matches = NULL; 1197 data.matches = NULL;
1199#endif 1198
1200 if (ed->table_programs_size > 0) 1199 if (ed->table_programs_size > 0)
1201 { 1200 {
1202 const Eina_List *match; 1201 const Eina_List *match;
@@ -1218,12 +1217,29 @@ _edje_emit_handle(Edje *ed, const char *sig, const char *src,
1218 ed->patterns.programs.exact_match); 1217 ed->patterns.programs.exact_match);
1219 EINA_LIST_FOREACH(match, l, pr) 1218 EINA_LIST_FOREACH(match, l, pr)
1220 _edje_glob_callback(pr, &data); 1219 _edje_glob_callback(pr, &data);
1220
1221#ifdef EDJE_PROGRAM_CACHE
1222 EINA_LIST_FOREACH(data.matches, l, pr)
1223#else
1224 EINA_LIST_FREE(data.matches, pr)
1225#endif
1226 {
1227 if (pr->exec)
1228 _edje_program_run(ed, pr, 0, sig, src);
1229
1230 if (_edje_block_break(ed))
1231 {
1232 eina_list_free(data.matches);
1233 data.matches = NULL;
1234 goto break_prog;
1235 }
1236 }
1221 } 1237 }
1222 1238
1223#ifdef EDJE_PROGRAM_CACHE 1239#ifdef EDJE_PROGRAM_CACHE
1224 if (tmps) 1240 if (tmps)
1225 { 1241 {
1226 if (data.matched == 0) 1242 if (data.matches == NULL)
1227 { 1243 {
1228 if (!ec->prog_cache.no_matches) 1244 if (!ec->prog_cache.no_matches)
1229 ec->prog_cache.no_matches = eina_hash_string_superfast_new(NULL); 1245 ec->prog_cache.no_matches = eina_hash_string_superfast_new(NULL);
diff --git a/libraries/edje/src/lib/edje_util.c b/libraries/edje/src/lib/edje_util.c
index 2205ba3..4ce22b5 100644
--- a/libraries/edje/src/lib/edje_util.c
+++ b/libraries/edje/src/lib/edje_util.c
@@ -905,7 +905,7 @@ edje_object_part_exists(const Evas_Object *obj, const char *part)
905 905
906 ed = _edje_fetch(obj); 906 ed = _edje_fetch(obj);
907 if ((!ed) || (!part)) return EINA_FALSE; 907 if ((!ed) || (!part)) return EINA_FALSE;
908 rp = _edje_real_part_recursive_get(ed, (char *)part); 908 rp = _edje_real_part_recursive_get(ed, part);
909 if (!rp) return EINA_FALSE; 909 if (!rp) return EINA_FALSE;
910 return EINA_TRUE; 910 return EINA_TRUE;
911} 911}
@@ -922,7 +922,7 @@ edje_object_part_object_get(const Evas_Object *obj, const char *part)
922 /* Need to recalc before providing the object. */ 922 /* Need to recalc before providing the object. */
923 _edje_recalc_do(ed); 923 _edje_recalc_do(ed);
924 924
925 rp = _edje_real_part_recursive_get(ed, (char *)part); 925 rp = _edje_real_part_recursive_get(ed, part);
926 if (!rp) return NULL; 926 if (!rp) return NULL;
927 return rp->object; 927 return rp->object;
928} 928}
@@ -946,7 +946,7 @@ edje_object_part_geometry_get(const Evas_Object *obj, const char *part, Evas_Coo
946 /* Need to recalc before providing the object. */ 946 /* Need to recalc before providing the object. */
947 _edje_recalc_do(ed); 947 _edje_recalc_do(ed);
948 948
949 rp = _edje_real_part_recursive_get(ed, (char *)part); 949 rp = _edje_real_part_recursive_get(ed, part);
950 if (!rp) 950 if (!rp)
951 { 951 {
952 if (x) *x = 0; 952 if (x) *x = 0;
@@ -1014,6 +1014,7 @@ _edje_object_part_text_raw_set(Evas_Object *obj, Edje_Real_Part *rp, const char
1014 if (text) rp->text.text = eina_stringshare_add(text); 1014 if (text) rp->text.text = eina_stringshare_add(text);
1015 rp->edje->dirty = 1; 1015 rp->edje->dirty = 1;
1016 rp->edje->recalc_call = 1; 1016 rp->edje->recalc_call = 1;
1017 rp->edje->recalc_hints = 1;
1017#ifdef EDJE_CALC_CACHE 1018#ifdef EDJE_CALC_CACHE
1018 rp->invalidate = 1; 1019 rp->invalidate = 1;
1019#endif 1020#endif
@@ -1058,6 +1059,63 @@ _edje_object_part_text_raw_append(Evas_Object *obj, Edje_Real_Part *rp, const ch
1058 return EINA_TRUE; 1059 return EINA_TRUE;
1059} 1060}
1060 1061
1062EAPI void
1063edje_object_part_text_style_user_push(Evas_Object *obj, const char *part,
1064 const char *style)
1065{
1066 Edje *ed;
1067 Edje_Real_Part *rp;
1068 Evas_Textblock_Style *ts;
1069
1070 ed = _edje_fetch(obj);
1071 if ((!ed) || (!part) || (!style)) return;
1072 rp = _edje_real_part_recursive_get(ed, part);
1073 if (!rp) return;
1074 if (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) return;
1075
1076 ts = evas_textblock_style_new();
1077 evas_textblock_style_set(ts, style);
1078 evas_object_textblock_style_user_push(rp->object, ts);
1079 evas_textblock_style_free(ts);
1080 ed->recalc_hints = 1;
1081}
1082
1083EAPI void
1084edje_object_part_text_style_user_pop(Evas_Object *obj, const char *part)
1085{
1086 Edje *ed;
1087 Edje_Real_Part *rp;
1088
1089 ed = _edje_fetch(obj);
1090 if ((!ed) || (!part)) return;
1091 rp = _edje_real_part_recursive_get(ed, part);
1092 if (!rp) return;
1093 if (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) return;
1094
1095 evas_object_textblock_style_user_pop(rp->object);
1096 ed->recalc_hints = 1;
1097}
1098
1099EAPI const char *
1100edje_object_part_text_style_user_peek(const Evas_Object *obj, const char *part)
1101{
1102 Edje *ed;
1103 Edje_Real_Part *rp;
1104 const Evas_Textblock_Style *ts;
1105
1106 ed = _edje_fetch(obj);
1107 if ((!ed) || (!part)) return NULL;
1108 rp = _edje_real_part_recursive_get(ed, part);
1109 if (!rp) return NULL;
1110 if (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) return NULL;
1111
1112 ts = evas_object_textblock_style_user_peek(rp->object);
1113 if (ts)
1114 return evas_textblock_style_get(ts);
1115 else
1116 return NULL;
1117}
1118
1061EAPI Eina_Bool 1119EAPI Eina_Bool
1062edje_object_part_text_set(Evas_Object *obj, const char *part, const char *text) 1120edje_object_part_text_set(Evas_Object *obj, const char *part, const char *text)
1063{ 1121{
@@ -1066,7 +1124,7 @@ edje_object_part_text_set(Evas_Object *obj, const char *part, const char *text)
1066 1124
1067 ed = _edje_fetch(obj); 1125 ed = _edje_fetch(obj);
1068 if ((!ed) || (!part)) return EINA_FALSE; 1126 if ((!ed) || (!part)) return EINA_FALSE;
1069 rp = _edje_real_part_recursive_get(ed, (char *)part); 1127 rp = _edje_real_part_recursive_get(ed, part);
1070 if (!rp) return EINA_FALSE; 1128 if (!rp) return EINA_FALSE;
1071 if ((rp->part->type != EDJE_PART_TYPE_TEXT) && 1129 if ((rp->part->type != EDJE_PART_TYPE_TEXT) &&
1072 (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK)) return EINA_FALSE; 1130 (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK)) return EINA_FALSE;
@@ -1085,7 +1143,7 @@ edje_object_part_text_get(const Evas_Object *obj, const char *part)
1085 /* Need to recalc before providing the object. */ 1143 /* Need to recalc before providing the object. */
1086 _edje_recalc_do(ed); 1144 _edje_recalc_do(ed);
1087 1145
1088 rp = _edje_real_part_recursive_get(ed, (char *)part); 1146 rp = _edje_real_part_recursive_get(ed, part);
1089 if (!rp) return NULL; 1147 if (!rp) return NULL;
1090 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1148 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1091 return _edje_entry_text_get(rp); 1149 return _edje_entry_text_get(rp);
@@ -1241,7 +1299,7 @@ edje_object_part_text_unescaped_get(const Evas_Object *obj, const char *part)
1241 /* Need to recalc before providing the object. */ 1299 /* Need to recalc before providing the object. */
1242 _edje_recalc_do(ed); 1300 _edje_recalc_do(ed);
1243 1301
1244 rp = _edje_real_part_recursive_get(ed, (char *)part); 1302 rp = _edje_real_part_recursive_get(ed, part);
1245 if (!rp) return NULL; 1303 if (!rp) return NULL;
1246 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1304 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1247 { 1305 {
@@ -1268,7 +1326,7 @@ edje_object_part_text_selection_get(const Evas_Object *obj, const char *part)
1268 1326
1269 ed = _edje_fetch(obj); 1327 ed = _edje_fetch(obj);
1270 if ((!ed) || (!part)) return NULL; 1328 if ((!ed) || (!part)) return NULL;
1271 rp = _edje_real_part_recursive_get(ed, (char *)part); 1329 rp = _edje_real_part_recursive_get(ed, part);
1272 if (!rp) return NULL; 1330 if (!rp) return NULL;
1273 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1331 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1274 return _edje_entry_selection_get(rp); 1332 return _edje_entry_selection_get(rp);
@@ -1283,7 +1341,7 @@ edje_object_part_text_select_none(const Evas_Object *obj, const char *part)
1283 1341
1284 ed = _edje_fetch(obj); 1342 ed = _edje_fetch(obj);
1285 if ((!ed) || (!part)) return; 1343 if ((!ed) || (!part)) return;
1286 rp = _edje_real_part_recursive_get(ed, (char *)part); 1344 rp = _edje_real_part_recursive_get(ed, part);
1287 if (!rp) return; 1345 if (!rp) return;
1288 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1346 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1289 _edje_entry_select_none(rp); 1347 _edje_entry_select_none(rp);
@@ -1297,7 +1355,7 @@ edje_object_part_text_select_all(const Evas_Object *obj, const char *part)
1297 1355
1298 ed = _edje_fetch(obj); 1356 ed = _edje_fetch(obj);
1299 if ((!ed) || (!part)) return; 1357 if ((!ed) || (!part)) return;
1300 rp = _edje_real_part_recursive_get(ed, (char *)part); 1358 rp = _edje_real_part_recursive_get(ed, part);
1301 if (!rp) return; 1359 if (!rp) return;
1302 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1360 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1303 _edje_entry_select_all(rp); 1361 _edje_entry_select_all(rp);
@@ -1311,13 +1369,14 @@ edje_object_part_text_insert(Evas_Object *obj, const char *part, const char *tex
1311 1369
1312 ed = _edje_fetch(obj); 1370 ed = _edje_fetch(obj);
1313 if ((!ed) || (!part)) return; 1371 if ((!ed) || (!part)) return;
1314 rp = _edje_real_part_recursive_get(ed, (char *)part); 1372 rp = _edje_real_part_recursive_get(ed, part);
1315 if (!rp) return; 1373 if (!rp) return;
1316 if ((rp->part->type != EDJE_PART_TYPE_TEXTBLOCK)) return; 1374 if ((rp->part->type != EDJE_PART_TYPE_TEXTBLOCK)) return;
1317 if (rp->part->entry_mode <= EDJE_ENTRY_EDIT_MODE_NONE) return; 1375 if (rp->part->entry_mode <= EDJE_ENTRY_EDIT_MODE_NONE) return;
1318 _edje_entry_text_markup_insert(rp, text); 1376 _edje_entry_text_markup_insert(rp, text);
1319 rp->edje->dirty = 1; 1377 rp->edje->dirty = 1;
1320 rp->edje->recalc_call = 1; 1378 rp->edje->recalc_call = 1;
1379 rp->edje->recalc_hints = 1;
1321#ifdef EDJE_CALC_CACHE 1380#ifdef EDJE_CALC_CACHE
1322 rp->invalidate = 1; 1381 rp->invalidate = 1;
1323#endif 1382#endif
@@ -1334,12 +1393,13 @@ edje_object_part_text_append(Evas_Object *obj, const char *part, const char *tex
1334 1393
1335 ed = _edje_fetch(obj); 1394 ed = _edje_fetch(obj);
1336 if ((!ed) || (!part)) return; 1395 if ((!ed) || (!part)) return;
1337 rp = _edje_real_part_recursive_get(ed, (char *)part); 1396 rp = _edje_real_part_recursive_get(ed, part);
1338 if (!rp) return; 1397 if (!rp) return;
1339 if ((rp->part->type != EDJE_PART_TYPE_TEXTBLOCK)) return; 1398 if ((rp->part->type != EDJE_PART_TYPE_TEXTBLOCK)) return;
1340 _edje_object_part_text_raw_append(obj, rp, part, text); 1399 _edje_object_part_text_raw_append(obj, rp, part, text);
1341 rp->edje->dirty = 1; 1400 rp->edje->dirty = 1;
1342 rp->edje->recalc_call = 1; 1401 rp->edje->recalc_call = 1;
1402 rp->edje->recalc_hints = 1;
1343#ifdef EDJE_CALC_CACHE 1403#ifdef EDJE_CALC_CACHE
1344 rp->invalidate = 1; 1404 rp->invalidate = 1;
1345#endif 1405#endif
@@ -1356,7 +1416,7 @@ edje_object_part_text_anchor_list_get(const Evas_Object *obj, const char *part)
1356 1416
1357 ed = _edje_fetch(obj); 1417 ed = _edje_fetch(obj);
1358 if ((!ed) || (!part)) return NULL; 1418 if ((!ed) || (!part)) return NULL;
1359 rp = _edje_real_part_recursive_get(ed, (char *)part); 1419 rp = _edje_real_part_recursive_get(ed, part);
1360 if (!rp) return NULL; 1420 if (!rp) return NULL;
1361 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1421 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1362 return _edje_entry_anchors_list(rp); 1422 return _edje_entry_anchors_list(rp);
@@ -1371,7 +1431,7 @@ edje_object_part_text_anchor_geometry_get(const Evas_Object *obj, const char *pa
1371 1431
1372 ed = _edje_fetch(obj); 1432 ed = _edje_fetch(obj);
1373 if ((!ed) || (!part)) return NULL; 1433 if ((!ed) || (!part)) return NULL;
1374 rp = _edje_real_part_recursive_get(ed, (char *)part); 1434 rp = _edje_real_part_recursive_get(ed, part);
1375 if (!rp) return NULL; 1435 if (!rp) return NULL;
1376 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1436 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1377 return _edje_entry_anchor_geometry_get(rp, anchor); 1437 return _edje_entry_anchor_geometry_get(rp, anchor);
@@ -1386,7 +1446,7 @@ edje_object_part_text_item_list_get(const Evas_Object *obj, const char *part)
1386 1446
1387 ed = _edje_fetch(obj); 1447 ed = _edje_fetch(obj);
1388 if ((!ed) || (!part)) return NULL; 1448 if ((!ed) || (!part)) return NULL;
1389 rp = _edje_real_part_recursive_get(ed, (char *)part); 1449 rp = _edje_real_part_recursive_get(ed, part);
1390 if (!rp) return NULL; 1450 if (!rp) return NULL;
1391 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1451 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1392 return _edje_entry_items_list(rp); 1452 return _edje_entry_items_list(rp);
@@ -1401,7 +1461,7 @@ edje_object_part_text_item_geometry_get(const Evas_Object *obj, const char *part
1401 1461
1402 ed = _edje_fetch(obj); 1462 ed = _edje_fetch(obj);
1403 if ((!ed) || (!part)) return EINA_FALSE; 1463 if ((!ed) || (!part)) return EINA_FALSE;
1404 rp = _edje_real_part_recursive_get(ed, (char *)part); 1464 rp = _edje_real_part_recursive_get(ed, part);
1405 if (!rp) return EINA_FALSE; 1465 if (!rp) return EINA_FALSE;
1406 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1466 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1407 return _edje_entry_item_geometry_get(rp, item, cx, cy, cw, ch); 1467 return _edje_entry_item_geometry_get(rp, item, cx, cy, cw, ch);
@@ -1420,7 +1480,7 @@ edje_object_part_text_cursor_geometry_get(const Evas_Object *obj, const char *pa
1420 if (w) *w = 0; 1480 if (w) *w = 0;
1421 if (h) *h = 0; 1481 if (h) *h = 0;
1422 if ((!ed) || (!part)) return; 1482 if ((!ed) || (!part)) return;
1423 rp = _edje_real_part_recursive_get(ed, (char *)part); 1483 rp = _edje_real_part_recursive_get(ed, part);
1424 if (!rp) return; 1484 if (!rp) return;
1425 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1485 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1426 { 1486 {
@@ -1432,6 +1492,20 @@ edje_object_part_text_cursor_geometry_get(const Evas_Object *obj, const char *pa
1432} 1492}
1433 1493
1434EAPI void 1494EAPI void
1495edje_object_part_text_user_insert(const Evas_Object *obj, const char *part, const char *text)
1496{
1497 Edje *ed;
1498 Edje_Real_Part *rp;
1499
1500 ed = _edje_fetch(obj);
1501 if ((!ed) || (!part)) return;
1502 rp = _edje_real_part_recursive_get(ed, part);
1503 if (!rp) return;
1504 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1505 _edje_entry_user_insert(rp, text);
1506}
1507
1508EAPI void
1435edje_object_part_text_select_allow_set(const Evas_Object *obj, const char *part, Eina_Bool allow) 1509edje_object_part_text_select_allow_set(const Evas_Object *obj, const char *part, Eina_Bool allow)
1436{ 1510{
1437 Edje *ed; 1511 Edje *ed;
@@ -1439,7 +1513,7 @@ edje_object_part_text_select_allow_set(const Evas_Object *obj, const char *part,
1439 1513
1440 ed = _edje_fetch(obj); 1514 ed = _edje_fetch(obj);
1441 if ((!ed) || (!part)) return; 1515 if ((!ed) || (!part)) return;
1442 rp = _edje_real_part_recursive_get(ed, (char *)part); 1516 rp = _edje_real_part_recursive_get(ed, part);
1443 if (!rp) return; 1517 if (!rp) return;
1444 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1518 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1445 _edje_entry_select_allow_set(rp, allow); 1519 _edje_entry_select_allow_set(rp, allow);
@@ -1453,7 +1527,7 @@ edje_object_part_text_select_abort(const Evas_Object *obj, const char *part)
1453 1527
1454 ed = _edje_fetch(obj); 1528 ed = _edje_fetch(obj);
1455 if ((!ed) || (!part)) return; 1529 if ((!ed) || (!part)) return;
1456 rp = _edje_real_part_recursive_get(ed, (char *)part); 1530 rp = _edje_real_part_recursive_get(ed, part);
1457 if (!rp) return; 1531 if (!rp) return;
1458 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1532 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1459 _edje_entry_select_abort(rp); 1533 _edje_entry_select_abort(rp);
@@ -1467,7 +1541,7 @@ edje_object_part_text_select_begin(const Evas_Object *obj, const char *part)
1467 1541
1468 ed = _edje_fetch(obj); 1542 ed = _edje_fetch(obj);
1469 if ((!ed) || (!part)) return; 1543 if ((!ed) || (!part)) return;
1470 rp = _edje_real_part_recursive_get(ed, (char *)part); 1544 rp = _edje_real_part_recursive_get(ed, part);
1471 if (!rp) return; 1545 if (!rp) return;
1472 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1546 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1473 _edje_entry_select_begin(rp); 1547 _edje_entry_select_begin(rp);
@@ -1481,12 +1555,30 @@ edje_object_part_text_select_extend(const Evas_Object *obj, const char *part)
1481 1555
1482 ed = _edje_fetch(obj); 1556 ed = _edje_fetch(obj);
1483 if ((!ed) || (!part)) return; 1557 if ((!ed) || (!part)) return;
1484 rp = _edje_real_part_recursive_get(ed, (char *)part); 1558 rp = _edje_real_part_recursive_get(ed, part);
1485 if (!rp) return; 1559 if (!rp) return;
1486 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1560 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1487 _edje_entry_select_extend(rp); 1561 _edje_entry_select_extend(rp);
1488} 1562}
1489 1563
1564EAPI void *
1565edje_object_part_text_imf_context_get(const Evas_Object *obj, const char *part)
1566{
1567 Edje *ed;
1568 Edje_Real_Part *rp;
1569
1570 ed = _edje_fetch(obj);
1571 if ((!ed) || (!part)) return NULL;
1572
1573 rp = _edje_real_part_recursive_get(ed, (char *)part);
1574 if (!rp) return NULL;
1575
1576 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1577 return _edje_entry_imf_context_get(rp);
1578 else
1579 return NULL;
1580}
1581
1490EAPI Eina_Bool 1582EAPI Eina_Bool
1491edje_object_part_text_cursor_next(Evas_Object *obj, const char *part, Edje_Cursor cur) 1583edje_object_part_text_cursor_next(Evas_Object *obj, const char *part, Edje_Cursor cur)
1492{ 1584{
@@ -1495,7 +1587,7 @@ edje_object_part_text_cursor_next(Evas_Object *obj, const char *part, Edje_Curso
1495 1587
1496 ed = _edje_fetch(obj); 1588 ed = _edje_fetch(obj);
1497 if ((!ed) || (!part)) return EINA_FALSE; 1589 if ((!ed) || (!part)) return EINA_FALSE;
1498 rp = _edje_real_part_recursive_get(ed, (char *)part); 1590 rp = _edje_real_part_recursive_get(ed, part);
1499 if (!rp) return EINA_FALSE; 1591 if (!rp) return EINA_FALSE;
1500 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1592 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1501 { 1593 {
@@ -1512,7 +1604,7 @@ edje_object_part_text_cursor_prev(Evas_Object *obj, const char *part, Edje_Curso
1512 1604
1513 ed = _edje_fetch(obj); 1605 ed = _edje_fetch(obj);
1514 if ((!ed) || (!part)) return EINA_FALSE; 1606 if ((!ed) || (!part)) return EINA_FALSE;
1515 rp = _edje_real_part_recursive_get(ed, (char *)part); 1607 rp = _edje_real_part_recursive_get(ed, part);
1516 if (!rp) return EINA_FALSE; 1608 if (!rp) return EINA_FALSE;
1517 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1609 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1518 { 1610 {
@@ -1529,7 +1621,7 @@ edje_object_part_text_cursor_up(Evas_Object *obj, const char *part, Edje_Cursor
1529 1621
1530 ed = _edje_fetch(obj); 1622 ed = _edje_fetch(obj);
1531 if ((!ed) || (!part)) return EINA_FALSE; 1623 if ((!ed) || (!part)) return EINA_FALSE;
1532 rp = _edje_real_part_recursive_get(ed, (char *)part); 1624 rp = _edje_real_part_recursive_get(ed, part);
1533 if (!rp) return EINA_FALSE; 1625 if (!rp) return EINA_FALSE;
1534 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1626 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1535 { 1627 {
@@ -1546,7 +1638,7 @@ edje_object_part_text_cursor_down(Evas_Object *obj, const char *part, Edje_Curso
1546 1638
1547 ed = _edje_fetch(obj); 1639 ed = _edje_fetch(obj);
1548 if ((!ed) || (!part)) return EINA_FALSE; 1640 if ((!ed) || (!part)) return EINA_FALSE;
1549 rp = _edje_real_part_recursive_get(ed, (char *)part); 1641 rp = _edje_real_part_recursive_get(ed, part);
1550 if (!rp) return EINA_FALSE; 1642 if (!rp) return EINA_FALSE;
1551 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1643 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1552 { 1644 {
@@ -1563,7 +1655,7 @@ edje_object_part_text_cursor_begin_set(Evas_Object *obj, const char *part, Edje_
1563 1655
1564 ed = _edje_fetch(obj); 1656 ed = _edje_fetch(obj);
1565 if ((!ed) || (!part)) return; 1657 if ((!ed) || (!part)) return;
1566 rp = _edje_real_part_recursive_get(ed, (char *)part); 1658 rp = _edje_real_part_recursive_get(ed, part);
1567 if (!rp) return; 1659 if (!rp) return;
1568 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1660 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1569 { 1661 {
@@ -1579,7 +1671,7 @@ edje_object_part_text_cursor_end_set(Evas_Object *obj, const char *part, Edje_Cu
1579 1671
1580 ed = _edje_fetch(obj); 1672 ed = _edje_fetch(obj);
1581 if ((!ed) || (!part)) return; 1673 if ((!ed) || (!part)) return;
1582 rp = _edje_real_part_recursive_get(ed, (char *)part); 1674 rp = _edje_real_part_recursive_get(ed, part);
1583 if (!rp) return; 1675 if (!rp) return;
1584 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1676 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1585 { 1677 {
@@ -1595,7 +1687,7 @@ edje_object_part_text_cursor_copy(Evas_Object *obj, const char *part, Edje_Curso
1595 1687
1596 ed = _edje_fetch(obj); 1688 ed = _edje_fetch(obj);
1597 if ((!ed) || (!part)) return; 1689 if ((!ed) || (!part)) return;
1598 rp = _edje_real_part_recursive_get(ed, (char *)part); 1690 rp = _edje_real_part_recursive_get(ed, part);
1599 if (!rp) return; 1691 if (!rp) return;
1600 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1692 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1601 { 1693 {
@@ -1611,7 +1703,7 @@ edje_object_part_text_cursor_line_begin_set(Evas_Object *obj, const char *part,
1611 1703
1612 ed = _edje_fetch(obj); 1704 ed = _edje_fetch(obj);
1613 if ((!ed) || (!part)) return; 1705 if ((!ed) || (!part)) return;
1614 rp = _edje_real_part_recursive_get(ed, (char *)part); 1706 rp = _edje_real_part_recursive_get(ed, part);
1615 if (!rp) return; 1707 if (!rp) return;
1616 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1708 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1617 { 1709 {
@@ -1627,7 +1719,7 @@ edje_object_part_text_cursor_line_end_set(Evas_Object *obj, const char *part, Ed
1627 1719
1628 ed = _edje_fetch(obj); 1720 ed = _edje_fetch(obj);
1629 if ((!ed) || (!part)) return; 1721 if ((!ed) || (!part)) return;
1630 rp = _edje_real_part_recursive_get(ed, (char *)part); 1722 rp = _edje_real_part_recursive_get(ed, part);
1631 if (!rp) return; 1723 if (!rp) return;
1632 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1724 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1633 { 1725 {
@@ -1644,7 +1736,7 @@ edje_object_part_text_cursor_coord_set(Evas_Object *obj, const char *part,
1644 1736
1645 ed = _edje_fetch(obj); 1737 ed = _edje_fetch(obj);
1646 if ((!ed) || (!part)) return EINA_FALSE; 1738 if ((!ed) || (!part)) return EINA_FALSE;
1647 rp = _edje_real_part_recursive_get(ed, (char *)part); 1739 rp = _edje_real_part_recursive_get(ed, part);
1648 if (!rp) return EINA_FALSE; 1740 if (!rp) return EINA_FALSE;
1649 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1741 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1650 { 1742 {
@@ -1661,7 +1753,7 @@ edje_object_part_text_cursor_is_format_get(const Evas_Object *obj, const char *p
1661 1753
1662 ed = _edje_fetch(obj); 1754 ed = _edje_fetch(obj);
1663 if ((!ed) || (!part)) return EINA_FALSE; 1755 if ((!ed) || (!part)) return EINA_FALSE;
1664 rp = _edje_real_part_recursive_get(ed, (char *)part); 1756 rp = _edje_real_part_recursive_get(ed, part);
1665 if (!rp) return EINA_FALSE; 1757 if (!rp) return EINA_FALSE;
1666 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1758 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1667 { 1759 {
@@ -1678,7 +1770,7 @@ edje_object_part_text_cursor_is_visible_format_get(const Evas_Object *obj, const
1678 1770
1679 ed = _edje_fetch(obj); 1771 ed = _edje_fetch(obj);
1680 if ((!ed) || (!part)) return 0; 1772 if ((!ed) || (!part)) return 0;
1681 rp = _edje_real_part_recursive_get(ed, (char *)part); 1773 rp = _edje_real_part_recursive_get(ed, part);
1682 if (!rp) return 0; 1774 if (!rp) return 0;
1683 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1775 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1684 { 1776 {
@@ -1738,7 +1830,7 @@ edje_object_part_text_cursor_pos_get(const Evas_Object *obj, const char *part, E
1738} 1830}
1739 1831
1740EAPI void 1832EAPI void
1741edje_object_part_text_input_panel_layout_set(const Evas_Object *obj, const char *part, Edje_Input_Panel_Layout layout) 1833edje_object_part_text_imf_context_reset(const Evas_Object *obj, const char *part)
1742{ 1834{
1743 Edje *ed; 1835 Edje *ed;
1744 Edje_Real_Part *rp; 1836 Edje_Real_Part *rp;
@@ -1749,7 +1841,23 @@ edje_object_part_text_input_panel_layout_set(const Evas_Object *obj, const char
1749 if (!rp) return; 1841 if (!rp) return;
1750 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1842 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1751 { 1843 {
1752 return _edje_entry_input_panel_layout_set(rp, layout); 1844 _edje_entry_imf_context_reset(rp);
1845 }
1846}
1847
1848EAPI void
1849edje_object_part_text_input_panel_layout_set(Evas_Object *obj, const char *part, Edje_Input_Panel_Layout layout)
1850{
1851 Edje *ed;
1852 Edje_Real_Part *rp;
1853
1854 ed = _edje_fetch(obj);
1855 if ((!ed) || (!part)) return;
1856 rp = _edje_real_part_recursive_get(ed, part);
1857 if (!rp) return;
1858 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1859 {
1860 _edje_entry_input_panel_layout_set(rp, layout);
1753 } 1861 }
1754} 1862}
1755 1863
@@ -1771,14 +1879,14 @@ edje_object_part_text_input_panel_layout_get(const Evas_Object *obj, const char
1771} 1879}
1772 1880
1773EAPI void 1881EAPI void
1774edje_object_part_text_autocapital_type_set(const Evas_Object *obj, const char *part, Edje_Text_Autocapital_Type autocapital_type) 1882edje_object_part_text_autocapital_type_set(Evas_Object *obj, const char *part, Edje_Text_Autocapital_Type autocapital_type)
1775{ 1883{
1776 Edje *ed; 1884 Edje *ed;
1777 Edje_Real_Part *rp; 1885 Edje_Real_Part *rp;
1778 1886
1779 ed = _edje_fetch(obj); 1887 ed = _edje_fetch(obj);
1780 if ((!ed) || (!part)) return; 1888 if ((!ed) || (!part)) return;
1781 rp = _edje_real_part_recursive_get(ed, (char *)part); 1889 rp = _edje_real_part_recursive_get(ed, part);
1782 if (!rp) return; 1890 if (!rp) return;
1783 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1891 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1784 { 1892 {
@@ -1794,7 +1902,7 @@ edje_object_part_text_autocapital_type_get(const Evas_Object *obj, const char *p
1794 1902
1795 ed = _edje_fetch(obj); 1903 ed = _edje_fetch(obj);
1796 if ((!ed) || (!part)) return EDJE_TEXT_AUTOCAPITAL_TYPE_NONE; 1904 if ((!ed) || (!part)) return EDJE_TEXT_AUTOCAPITAL_TYPE_NONE;
1797 rp = _edje_real_part_recursive_get(ed, (char *)part); 1905 rp = _edje_real_part_recursive_get(ed, part);
1798 if (!rp) return EDJE_TEXT_AUTOCAPITAL_TYPE_NONE; 1906 if (!rp) return EDJE_TEXT_AUTOCAPITAL_TYPE_NONE;
1799 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1907 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1800 { 1908 {
@@ -1804,7 +1912,40 @@ edje_object_part_text_autocapital_type_get(const Evas_Object *obj, const char *p
1804} 1912}
1805 1913
1806EAPI void 1914EAPI void
1807edje_object_part_text_input_panel_enabled_set(const Evas_Object *obj, const char *part, Eina_Bool enabled) 1915edje_object_part_text_prediction_allow_set(Evas_Object *obj, const char *part, Eina_Bool prediction)
1916{
1917 Edje *ed;
1918 Edje_Real_Part *rp;
1919
1920 ed = _edje_fetch(obj);
1921 if ((!ed) || (!part)) return;
1922 rp = _edje_real_part_recursive_get(ed, part);
1923 if (!rp) return;
1924 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1925 {
1926 _edje_entry_prediction_allow_set(rp, prediction);
1927 }
1928}
1929
1930EAPI Eina_Bool
1931edje_object_part_text_prediction_allow_get(const Evas_Object *obj, const char *part)
1932{
1933 Edje *ed;
1934 Edje_Real_Part *rp;
1935
1936 ed = _edje_fetch(obj);
1937 if ((!ed) || (!part)) return EINA_FALSE;
1938 rp = _edje_real_part_recursive_get(ed, part);
1939 if (!rp) return EINA_FALSE;
1940 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1941 {
1942 return _edje_entry_prediction_allow_get(rp);
1943 }
1944 return EINA_FALSE;
1945}
1946
1947EAPI void
1948edje_object_part_text_input_panel_enabled_set(Evas_Object *obj, const char *part, Eina_Bool enabled)
1808{ 1949{
1809 Edje *ed; 1950 Edje *ed;
1810 Edje_Real_Part *rp; 1951 Edje_Real_Part *rp;
@@ -1815,7 +1956,7 @@ edje_object_part_text_input_panel_enabled_set(const Evas_Object *obj, const char
1815 if (!rp) return; 1956 if (!rp) return;
1816 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE) 1957 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1817 { 1958 {
1818 return _edje_entry_input_panel_enabled_set(rp, enabled); 1959 _edje_entry_input_panel_enabled_set(rp, enabled);
1819 } 1960 }
1820} 1961}
1821 1962
@@ -1837,6 +1978,165 @@ edje_object_part_text_input_panel_enabled_get(const Evas_Object *obj, const char
1837} 1978}
1838 1979
1839EAPI void 1980EAPI void
1981edje_object_part_text_input_panel_show(const Evas_Object *obj, const char *part)
1982{
1983 Edje *ed;
1984 Edje_Real_Part *rp;
1985
1986 ed = _edje_fetch(obj);
1987 if ((!ed) || (!part)) return;
1988 rp = _edje_real_part_recursive_get(ed, part);
1989 if (!rp) return;
1990 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
1991 _edje_entry_input_panel_show(rp);
1992}
1993
1994EAPI void
1995edje_object_part_text_input_panel_hide(const Evas_Object *obj, const char *part)
1996{
1997 Edje *ed;
1998 Edje_Real_Part *rp;
1999
2000 ed = _edje_fetch(obj);
2001 if ((!ed) || (!part)) return;
2002 rp = _edje_real_part_recursive_get(ed, part);
2003 if (!rp) return;
2004 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
2005 _edje_entry_input_panel_hide(rp);
2006}
2007
2008EAPI void
2009edje_object_part_text_input_panel_language_set(Evas_Object *obj, const char *part, Edje_Input_Panel_Lang lang)
2010{
2011 Edje *ed;
2012 Edje_Real_Part *rp;
2013
2014 ed = _edje_fetch(obj);
2015 if ((!ed) || (!part)) return;
2016 rp = _edje_real_part_recursive_get(ed, part);
2017 if (!rp) return;
2018 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
2019 {
2020 _edje_entry_input_panel_language_set(rp, lang);
2021 }
2022}
2023
2024EAPI Edje_Input_Panel_Lang
2025edje_object_part_text_input_panel_language_get(const Evas_Object *obj, const char *part)
2026{
2027 Edje *ed;
2028 Edje_Real_Part *rp;
2029
2030 ed = _edje_fetch(obj);
2031 if ((!ed) || (!part)) return EDJE_INPUT_PANEL_LANG_AUTOMATIC;
2032 rp = _edje_real_part_recursive_get(ed, part);
2033 if (!rp) return EDJE_INPUT_PANEL_LANG_AUTOMATIC;
2034 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
2035 {
2036 return _edje_entry_input_panel_language_get(rp);
2037 }
2038 return EDJE_INPUT_PANEL_LANG_AUTOMATIC;
2039}
2040
2041EAPI void
2042edje_object_part_text_input_panel_imdata_set(Evas_Object *obj, const char *part, const void *data, int len)
2043{
2044 Edje *ed;
2045 Edje_Real_Part *rp;
2046
2047 ed = _edje_fetch(obj);
2048 if ((!ed) || (!part)) return;
2049 rp = _edje_real_part_recursive_get(ed, part);
2050 if (!rp) return;
2051 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
2052 {
2053 _edje_entry_input_panel_imdata_set(rp, data, len);
2054 }
2055}
2056
2057EAPI void
2058edje_object_part_text_input_panel_imdata_get(const Evas_Object *obj, const char *part, void *data, int *len)
2059{
2060 Edje *ed;
2061 Edje_Real_Part *rp;
2062
2063 ed = _edje_fetch(obj);
2064 if ((!ed) || (!part)) return;
2065 rp = _edje_real_part_recursive_get(ed, part);
2066 if (!rp) return;
2067 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
2068 {
2069 _edje_entry_input_panel_imdata_get(rp, data, len);
2070 }
2071}
2072
2073EAPI void
2074edje_object_part_text_input_panel_return_key_type_set(Evas_Object *obj, const char *part, Edje_Input_Panel_Return_Key_Type return_key_type)
2075{
2076 Edje *ed;
2077 Edje_Real_Part *rp;
2078
2079 ed = _edje_fetch(obj);
2080 if ((!ed) || (!part)) return;
2081 rp = _edje_real_part_recursive_get(ed, part);
2082 if (!rp) return;
2083 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
2084 {
2085 _edje_entry_input_panel_return_key_type_set(rp, return_key_type);
2086 }
2087}
2088
2089EAPI Edje_Input_Panel_Return_Key_Type
2090edje_object_part_text_input_panel_return_key_type_get(const Evas_Object *obj, const char *part)
2091{
2092 Edje *ed;
2093 Edje_Real_Part *rp;
2094
2095 ed = _edje_fetch(obj);
2096 if ((!ed) || (!part)) return EDJE_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT;
2097 rp = _edje_real_part_recursive_get(ed, part);
2098 if (!rp) return EDJE_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT;
2099 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
2100 {
2101 return _edje_entry_input_panel_return_key_type_get(rp);
2102 }
2103 return EDJE_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT;
2104}
2105
2106EAPI void
2107edje_object_part_text_input_panel_return_key_disabled_set(Evas_Object *obj, const char *part, Eina_Bool disabled)
2108{
2109 Edje *ed;
2110 Edje_Real_Part *rp;
2111
2112 ed = _edje_fetch(obj);
2113 if ((!ed) || (!part)) return;
2114 rp = _edje_real_part_recursive_get(ed, part);
2115 if (!rp) return;
2116 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
2117 {
2118 _edje_entry_input_panel_return_key_disabled_set(rp, disabled);
2119 }
2120}
2121
2122EAPI Eina_Bool
2123edje_object_part_text_input_panel_return_key_disabled_get(const Evas_Object *obj, const char *part)
2124{
2125 Edje *ed;
2126 Edje_Real_Part *rp;
2127
2128 ed = _edje_fetch(obj);
2129 if ((!ed) || (!part)) return EINA_FALSE;
2130 rp = _edje_real_part_recursive_get(ed, part);
2131 if (!rp) return EINA_FALSE;
2132 if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
2133 {
2134 return _edje_entry_input_panel_return_key_disabled_get(rp);
2135 }
2136 return EINA_FALSE;
2137}
2138
2139EAPI void
1840edje_object_text_insert_filter_callback_add(Evas_Object *obj, const char *part, Edje_Text_Filter_Cb func, void *data) 2140edje_object_text_insert_filter_callback_add(Evas_Object *obj, const char *part, Edje_Text_Filter_Cb func, void *data)
1841{ 2141{
1842 Edje *ed; 2142 Edje *ed;
@@ -1901,6 +2201,71 @@ edje_object_text_insert_filter_callback_del_full(Evas_Object *obj, const char *p
1901 return NULL; 2201 return NULL;
1902} 2202}
1903 2203
2204EAPI void
2205edje_object_text_markup_filter_callback_add(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func, void *data)
2206{
2207 Edje *ed;
2208 Edje_Markup_Filter_Callback *cb;
2209
2210 ed = _edje_fetch(obj);
2211 if ((!ed) || (!part)) return;
2212 cb = calloc(1, sizeof(Edje_Markup_Filter_Callback));
2213 cb->part = eina_stringshare_add(part);
2214 cb->func = func;
2215 cb->data = (void *)data;
2216 ed->markup_filter_callbacks =
2217 eina_list_append(ed->markup_filter_callbacks, cb);
2218}
2219
2220EAPI void *
2221edje_object_text_markup_filter_callback_del(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func)
2222{
2223 Edje *ed;
2224 Edje_Markup_Filter_Callback *cb;
2225 Eina_List *l;
2226
2227 ed = _edje_fetch(obj);
2228 if ((!ed) || (!part)) return NULL;
2229 EINA_LIST_FOREACH(ed->markup_filter_callbacks, l, cb)
2230 {
2231 if ((!strcmp(cb->part, part)) && (cb->func == func))
2232 {
2233 void *data = cb->data;
2234 ed->markup_filter_callbacks =
2235 eina_list_remove_list(ed->markup_filter_callbacks, l);
2236 eina_stringshare_del(cb->part);
2237 free(cb);
2238 return data;
2239 }
2240 }
2241 return NULL;
2242}
2243
2244EAPI void *
2245edje_object_text_markup_filter_callback_del_full(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func, void *data)
2246{
2247 Edje *ed;
2248 Edje_Markup_Filter_Callback *cb;
2249 Eina_List *l;
2250
2251 ed = _edje_fetch(obj);
2252 if ((!ed) || (!part)) return NULL;
2253 EINA_LIST_FOREACH(ed->markup_filter_callbacks, l, cb)
2254 {
2255 if ((!strcmp(cb->part, part)) && (cb->func == func) &&
2256 (cb->data == data))
2257 {
2258 void *tmp = cb->data;
2259 ed->markup_filter_callbacks =
2260 eina_list_remove_list(ed->markup_filter_callbacks, l);
2261 eina_stringshare_del(cb->part);
2262 free(cb);
2263 return tmp;
2264 }
2265 }
2266 return NULL;
2267}
2268
1904EAPI Eina_Bool 2269EAPI Eina_Bool
1905edje_object_part_swallow(Evas_Object *obj, const char *part, Evas_Object *obj_swallow) 2270edje_object_part_swallow(Evas_Object *obj, const char *part, Evas_Object *obj_swallow)
1906{ 2271{
@@ -1927,8 +2292,12 @@ edje_object_part_swallow(Evas_Object *obj, const char *part, Evas_Object *obj_sw
1927 edje_object_part_unswallow(rp->edje->obj, obj_swallow); 2292 edje_object_part_unswallow(rp->edje->obj, obj_swallow);
1928 } 2293 }
1929 2294
1930 rp = _edje_real_part_recursive_get(ed, (char *)part); 2295 rp = _edje_real_part_recursive_get(ed, part);
1931 if (!rp) return EINA_FALSE; 2296 if (!rp)
2297 {
2298 DBG("cannot swallow part %s: part not exist!", part);
2299 return EINA_FALSE;
2300 }
1932 if (rp->part->type != EDJE_PART_TYPE_SWALLOW) 2301 if (rp->part->type != EDJE_PART_TYPE_SWALLOW)
1933 { 2302 {
1934 ERR("cannot swallow part %s: not swallow type!", rp->part->name); 2303 ERR("cannot swallow part %s: not swallow type!", rp->part->name);
@@ -2261,7 +2630,7 @@ edje_object_part_swallow_get(const Evas_Object *obj, const char *part)
2261 /* Need to recalc before providing the object. */ 2630 /* Need to recalc before providing the object. */
2262 _edje_recalc_do(ed); 2631 _edje_recalc_do(ed);
2263 2632
2264 rp = _edje_real_part_recursive_get(ed, (char *)part); 2633 rp = _edje_real_part_recursive_get(ed, part);
2265 if (!rp) return NULL; 2634 if (!rp) return NULL;
2266 return rp->swallowed_object; 2635 return rp->swallowed_object;
2267} 2636}
@@ -2353,8 +2722,8 @@ EAPI Eina_Bool
2353edje_object_parts_extends_calc(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) 2722edje_object_parts_extends_calc(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
2354{ 2723{
2355 Edje *ed; 2724 Edje *ed;
2356 Evas_Coord x1 = INT_MAX, y1 = INT_MAX; 2725 Evas_Coord xx1 = INT_MAX, yy1 = INT_MAX;
2357 Evas_Coord x2 = 0, y2 = 0; 2726 Evas_Coord xx2 = 0, yy2 = 0;
2358 unsigned int i; 2727 unsigned int i;
2359 2728
2360 ed = _edje_fetch(obj); 2729 ed = _edje_fetch(obj);
@@ -2386,18 +2755,18 @@ edje_object_parts_extends_calc(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, E
2386 rpx2 = rpx1 + rp->w; 2755 rpx2 = rpx1 + rp->w;
2387 rpy2 = rpy1 + rp->h; 2756 rpy2 = rpy1 + rp->h;
2388 2757
2389 if (x1 > rpx1) x1 = rpx1; 2758 if (xx1 > rpx1) xx1 = rpx1;
2390 if (y1 > rpy1) y1 = rpy1; 2759 if (yy1 > rpy1) yy1 = rpy1;
2391 if (x2 < rpx2) x2 = rpx2; 2760 if (xx2 < rpx2) xx2 = rpx2;
2392 if (y2 < rpy2) y2 = rpy2; 2761 if (yy2 < rpy2) yy2 = rpy2;
2393 } 2762 }
2394 2763
2395 ed->calc_only = 0; 2764 ed->calc_only = 0;
2396 2765
2397 if (x) *x = x1; 2766 if (x) *x = xx1;
2398 if (y) *y = y1; 2767 if (y) *y = yy1;
2399 if (w) *w = x2 - x1; 2768 if (w) *w = xx2 - xx1;
2400 if (h) *h = y2 - y1; 2769 if (h) *h = yy2 - yy1;
2401 2770
2402 return EINA_TRUE; 2771 return EINA_TRUE;
2403} 2772}
@@ -2448,6 +2817,7 @@ edje_object_size_min_restricted_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Co
2448 maxh = 0; 2817 maxh = 0;
2449 } 2818 }
2450 pep = NULL; 2819 pep = NULL;
2820 has_non_fixed_tb = EINA_FALSE;
2451 for (i = 0; i < ed->table_parts_size; i++) 2821 for (i = 0; i < ed->table_parts_size; i++)
2452 { 2822 {
2453 Edje_Real_Part *ep; 2823 Edje_Real_Part *ep;
@@ -2569,7 +2939,7 @@ edje_object_part_state_get(const Evas_Object *obj, const char *part, double *val
2569 /* Need to recalc before providing the object. */ 2939 /* Need to recalc before providing the object. */
2570 _edje_recalc_do(ed); 2940 _edje_recalc_do(ed);
2571 2941
2572 rp = _edje_real_part_recursive_get(ed, (char *)part); 2942 rp = _edje_real_part_recursive_get(ed, part);
2573 if (!rp) 2943 if (!rp)
2574 { 2944 {
2575 if (val_ret) *val_ret = 0; 2945 if (val_ret) *val_ret = 0;
@@ -2609,7 +2979,7 @@ edje_object_part_drag_dir_get(const Evas_Object *obj, const char *part)
2609 /* Need to recalc before providing the object. */ 2979 /* Need to recalc before providing the object. */
2610 _edje_recalc_do(ed); 2980 _edje_recalc_do(ed);
2611 2981
2612 rp = _edje_real_part_recursive_get(ed, (char *)part); 2982 rp = _edje_real_part_recursive_get(ed, part);
2613 if (!rp) return EDJE_DRAG_DIR_NONE; 2983 if (!rp) return EDJE_DRAG_DIR_NONE;
2614 if ((rp->part->dragable.x) && (rp->part->dragable.y)) return EDJE_DRAG_DIR_XY; 2984 if ((rp->part->dragable.x) && (rp->part->dragable.y)) return EDJE_DRAG_DIR_XY;
2615 else if (rp->part->dragable.x) return EDJE_DRAG_DIR_X; 2985 else if (rp->part->dragable.x) return EDJE_DRAG_DIR_X;
@@ -2625,7 +2995,7 @@ edje_object_part_drag_value_set(Evas_Object *obj, const char *part, double dx, d
2625 2995
2626 ed = _edje_fetch(obj); 2996 ed = _edje_fetch(obj);
2627 if ((!ed) || (!part)) return EINA_FALSE; 2997 if ((!ed) || (!part)) return EINA_FALSE;
2628 rp = _edje_real_part_recursive_get(ed, (char *)part); 2998 rp = _edje_real_part_recursive_get(ed, part);
2629 if (!rp) return EINA_FALSE; 2999 if (!rp) return EINA_FALSE;
2630 if (!rp->drag) return EINA_FALSE; 3000 if (!rp->drag) return EINA_FALSE;
2631 if (rp->drag->down.count > 0) return EINA_FALSE; 3001 if (rp->drag->down.count > 0) return EINA_FALSE;
@@ -2666,7 +3036,7 @@ edje_object_part_drag_value_get(const Evas_Object *obj, const char *part, double
2666 /* Need to recalc before providing the object. */ 3036 /* Need to recalc before providing the object. */
2667 _edje_recalc_do(ed); 3037 _edje_recalc_do(ed);
2668 3038
2669 rp = _edje_real_part_recursive_get(ed, (char *)part); 3039 rp = _edje_real_part_recursive_get(ed, part);
2670 if (!rp || !rp->drag) 3040 if (!rp || !rp->drag)
2671 { 3041 {
2672 if (dx) *dx = 0; 3042 if (dx) *dx = 0;
@@ -2690,7 +3060,7 @@ edje_object_part_drag_size_set(Evas_Object *obj, const char *part, double dw, do
2690 3060
2691 ed = _edje_fetch(obj); 3061 ed = _edje_fetch(obj);
2692 if ((!ed) || (!part)) return EINA_FALSE; 3062 if ((!ed) || (!part)) return EINA_FALSE;
2693 rp = _edje_real_part_recursive_get(ed, (char *)part); 3063 rp = _edje_real_part_recursive_get(ed, part);
2694 if (!rp) return EINA_FALSE; 3064 if (!rp) return EINA_FALSE;
2695 if (!rp->drag) return EINA_FALSE; 3065 if (!rp->drag) return EINA_FALSE;
2696 if (dw < 0.0) dw = 0.0; 3066 if (dw < 0.0) dw = 0.0;
@@ -2726,7 +3096,7 @@ edje_object_part_drag_size_get(const Evas_Object *obj, const char *part, double
2726 /* Need to recalc before providing the object. */ 3096 /* Need to recalc before providing the object. */
2727 _edje_recalc_do(ed); 3097 _edje_recalc_do(ed);
2728 3098
2729 rp = _edje_real_part_recursive_get(ed, (char *)part); 3099 rp = _edje_real_part_recursive_get(ed, part);
2730 if (!rp || !rp->drag) 3100 if (!rp || !rp->drag)
2731 { 3101 {
2732 if (dw) *dw = 0; 3102 if (dw) *dw = 0;
@@ -2746,7 +3116,7 @@ edje_object_part_drag_step_set(Evas_Object *obj, const char *part, double dx, do
2746 3116
2747 ed = _edje_fetch(obj); 3117 ed = _edje_fetch(obj);
2748 if ((!ed) || (!part)) return EINA_FALSE; 3118 if ((!ed) || (!part)) return EINA_FALSE;
2749 rp = _edje_real_part_recursive_get(ed, (char *)part); 3119 rp = _edje_real_part_recursive_get(ed, part);
2750 if (!rp) return EINA_FALSE; 3120 if (!rp) return EINA_FALSE;
2751 if (!rp->drag) return EINA_FALSE; 3121 if (!rp->drag) return EINA_FALSE;
2752 if (dx < 0.0) dx = 0.0; 3122 if (dx < 0.0) dx = 0.0;
@@ -2778,7 +3148,7 @@ edje_object_part_drag_step_get(const Evas_Object *obj, const char *part, double
2778 /* Need to recalc before providing the object. */ 3148 /* Need to recalc before providing the object. */
2779 _edje_recalc_do(ed); 3149 _edje_recalc_do(ed);
2780 3150
2781 rp = _edje_real_part_recursive_get(ed, (char *)part); 3151 rp = _edje_real_part_recursive_get(ed, part);
2782 if (!rp || !rp->drag) 3152 if (!rp || !rp->drag)
2783 { 3153 {
2784 if (dx) *dx = 0; 3154 if (dx) *dx = 0;
@@ -2798,7 +3168,7 @@ edje_object_part_drag_page_set(Evas_Object *obj, const char *part, double dx, do
2798 3168
2799 ed = _edje_fetch(obj); 3169 ed = _edje_fetch(obj);
2800 if ((!ed) || (!part)) return EINA_FALSE; 3170 if ((!ed) || (!part)) return EINA_FALSE;
2801 rp = _edje_real_part_recursive_get(ed, (char *)part); 3171 rp = _edje_real_part_recursive_get(ed, part);
2802 if (!rp) return EINA_FALSE; 3172 if (!rp) return EINA_FALSE;
2803 if (!rp->drag) return EINA_FALSE; 3173 if (!rp->drag) return EINA_FALSE;
2804 if (dx < 0.0) dx = 0.0; 3174 if (dx < 0.0) dx = 0.0;
@@ -2830,7 +3200,7 @@ edje_object_part_drag_page_get(const Evas_Object *obj, const char *part, double
2830 /* Need to recalc before providing the object. */ 3200 /* Need to recalc before providing the object. */
2831 _edje_recalc_do(ed); 3201 _edje_recalc_do(ed);
2832 3202
2833 rp = _edje_real_part_recursive_get(ed, (char *)part); 3203 rp = _edje_real_part_recursive_get(ed, part);
2834 if (!rp || !rp->drag) 3204 if (!rp || !rp->drag)
2835 { 3205 {
2836 if (dx) *dx = 0; 3206 if (dx) *dx = 0;
@@ -2851,7 +3221,7 @@ edje_object_part_drag_step(Evas_Object *obj, const char *part, double dx, double
2851 3221
2852 ed = _edje_fetch(obj); 3222 ed = _edje_fetch(obj);
2853 if ((!ed) || (!part)) return EINA_FALSE; 3223 if ((!ed) || (!part)) return EINA_FALSE;
2854 rp = _edje_real_part_recursive_get(ed, (char *)part); 3224 rp = _edje_real_part_recursive_get(ed, part);
2855 if (!rp) return EINA_FALSE; 3225 if (!rp) return EINA_FALSE;
2856 if (!rp->drag) return EINA_FALSE; 3226 if (!rp->drag) return EINA_FALSE;
2857 if (rp->drag->down.count > 0) return EINA_FALSE; 3227 if (rp->drag->down.count > 0) return EINA_FALSE;
@@ -2881,7 +3251,7 @@ edje_object_part_drag_page(Evas_Object *obj, const char *part, double dx, double
2881 3251
2882 ed = _edje_fetch(obj); 3252 ed = _edje_fetch(obj);
2883 if ((!ed) || (!part)) return EINA_FALSE; 3253 if ((!ed) || (!part)) return EINA_FALSE;
2884 rp = _edje_real_part_recursive_get(ed, (char *)part); 3254 rp = _edje_real_part_recursive_get(ed, part);
2885 if (!rp) return EINA_FALSE; 3255 if (!rp) return EINA_FALSE;
2886 if (!rp->drag) return EINA_FALSE; 3256 if (!rp->drag) return EINA_FALSE;
2887 if (rp->drag->down.count > 0) return EINA_FALSE; 3257 if (rp->drag->down.count > 0) return EINA_FALSE;
@@ -3557,9 +3927,21 @@ edje_object_preload(Evas_Object *obj, Eina_Bool cancel)
3557 else if (ep->type == EDJE_PART_TYPE_GROUP) 3927 else if (ep->type == EDJE_PART_TYPE_GROUP)
3558 { 3928 {
3559 if (rp->swallowed_object) { 3929 if (rp->swallowed_object) {
3560 edje_object_signal_callback_del(rp->swallowed_object, EDJE_PRELOAD_EMISSION, EDJE_PRELOAD_SOURCE, _edje_object_signal_preload_cb); 3930 char *tmp;
3561 edje_object_signal_callback_add(rp->swallowed_object, EDJE_PRELOAD_EMISSION, EDJE_PRELOAD_SOURCE, _edje_object_signal_preload_cb, ed); 3931
3562 edje_object_preload(rp->swallowed_object, cancel); 3932 if (rp->part->name)
3933 {
3934 tmp = alloca(strlen(rp->part->name) + 2);
3935 sprintf(tmp, "%s:", rp->part->name);
3936
3937 edje_object_signal_callback_del(obj, EDJE_PRELOAD_EMISSION, tmp, _edje_object_signal_preload_cb);
3938 edje_object_signal_callback_add(obj, EDJE_PRELOAD_EMISSION, tmp, _edje_object_signal_preload_cb, ed);
3939 edje_object_preload(rp->swallowed_object, cancel);
3940 }
3941 else
3942 {
3943 ed->preload_count--;
3944 }
3563 3945
3564 count--; 3946 count--;
3565 } 3947 }
@@ -3574,6 +3956,30 @@ edje_object_preload(Evas_Object *obj, Eina_Bool cancel)
3574 return EINA_TRUE; 3956 return EINA_TRUE;
3575} 3957}
3576 3958
3959EAPI void
3960edje_object_update_hints_set(Evas_Object *obj, Eina_Bool update)
3961{
3962 Edje *ed;
3963
3964 ed = _edje_fetch(obj);
3965 if (!ed) return ;
3966 if (ed->update_hints == !!update) return ;
3967
3968 ed->update_hints = !!update;
3969 if (update) ed->recalc_hints = 1;
3970}
3971
3972EAPI Eina_Bool
3973edje_object_update_hints_get(Evas_Object *obj)
3974{
3975 Edje *ed;
3976
3977 ed = _edje_fetch(obj);
3978 if (!ed) return EINA_FALSE;
3979
3980 return ed->update_hints;
3981}
3982
3577Eina_Bool 3983Eina_Bool
3578_edje_real_part_table_pack(Edje_Real_Part *rp, Evas_Object *child_obj, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan) 3984_edje_real_part_table_pack(Edje_Real_Part *rp, Evas_Object *child_obj, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan)
3579{ 3985{
@@ -4037,9 +4443,11 @@ _edje_real_part_swallow_hints_update(Edje_Real_Part *rp)
4037 { 4443 {
4038 Evas_Coord w, h; 4444 Evas_Coord w, h;
4039 4445
4446#if 0
4040 edje_object_size_min_get(rp->swallowed_object, &w, &h); 4447 edje_object_size_min_get(rp->swallowed_object, &w, &h);
4041 rp->swallow_params.min.w = w; 4448 rp->swallow_params.min.w = w;
4042 rp->swallow_params.min.h = h; 4449 rp->swallow_params.min.h = h;
4450#endif
4043 edje_object_size_max_get(rp->swallowed_object, &w, &h); 4451 edje_object_size_max_get(rp->swallowed_object, &w, &h);
4044 rp->swallow_params.max.w = w; 4452 rp->swallow_params.max.w = w;
4045 rp->swallow_params.max.h = h; 4453 rp->swallow_params.max.h = h;
@@ -4050,8 +4458,10 @@ _edje_real_part_swallow_hints_update(Edje_Real_Part *rp)
4050 Evas_Coord w, h; 4458 Evas_Coord w, h;
4051 4459
4052 evas_object_geometry_get(rp->swallowed_object, NULL, NULL, &w, &h); 4460 evas_object_geometry_get(rp->swallowed_object, NULL, NULL, &w, &h);
4461#if 0
4053 rp->swallow_params.min.w = w; 4462 rp->swallow_params.min.w = w;
4054 rp->swallow_params.min.h = h; 4463 rp->swallow_params.min.h = h;
4464#endif
4055 rp->swallow_params.max.w = w; 4465 rp->swallow_params.max.w = w;
4056 rp->swallow_params.max.h = h; 4466 rp->swallow_params.max.h = h;
4057 } 4467 }
@@ -4127,6 +4537,7 @@ _edje_real_part_swallow(Edje_Real_Part *rp,
4127 _edje_real_part_swallow_hints_update(rp); 4537 _edje_real_part_swallow_hints_update(rp);
4128 rp->edje->dirty = 1; 4538 rp->edje->dirty = 1;
4129 rp->edje->recalc_call = 1; 4539 rp->edje->recalc_call = 1;
4540 rp->edje->recalc_hints = 1;
4130 _edje_recalc(rp->edje); 4541 _edje_recalc(rp->edje);
4131 return; 4542 return;
4132 } 4543 }
@@ -4171,6 +4582,7 @@ _edje_real_part_swallow(Edje_Real_Part *rp,
4171 4582
4172 rp->edje->dirty = 1; 4583 rp->edje->dirty = 1;
4173 rp->edje->recalc_call = 1; 4584 rp->edje->recalc_call = 1;
4585 rp->edje->recalc_hints = 1;
4174 _edje_recalc(rp->edje); 4586 _edje_recalc(rp->edje);
4175} 4587}
4176 4588
diff --git a/libraries/edje/src/modules/Makefile.in b/libraries/edje/src/modules/Makefile.in
index 5e81050..55c47d6 100644
--- a/libraries/edje/src/modules/Makefile.in
+++ b/libraries/edje/src/modules/Makefile.in
@@ -193,6 +193,8 @@ PACKAGE_URL = @PACKAGE_URL@
193PACKAGE_VERSION = @PACKAGE_VERSION@ 193PACKAGE_VERSION = @PACKAGE_VERSION@
194PATH_SEPARATOR = @PATH_SEPARATOR@ 194PATH_SEPARATOR = @PATH_SEPARATOR@
195PKG_CONFIG = @PKG_CONFIG@ 195PKG_CONFIG = @PKG_CONFIG@
196PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
197PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
196PYTHON = @PYTHON@ 198PYTHON = @PYTHON@
197PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 199PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
198PYTHON_PLATFORM = @PYTHON_PLATFORM@ 200PYTHON_PLATFORM = @PYTHON_PLATFORM@
diff --git a/libraries/edje/src/modules/alsa_snd_player/Makefile.in b/libraries/edje/src/modules/alsa_snd_player/Makefile.in
index 1fe2fb1..ce68f41 100644
--- a/libraries/edje/src/modules/alsa_snd_player/Makefile.in
+++ b/libraries/edje/src/modules/alsa_snd_player/Makefile.in
@@ -210,6 +210,8 @@ PACKAGE_URL = @PACKAGE_URL@
210PACKAGE_VERSION = @PACKAGE_VERSION@ 210PACKAGE_VERSION = @PACKAGE_VERSION@
211PATH_SEPARATOR = @PATH_SEPARATOR@ 211PATH_SEPARATOR = @PATH_SEPARATOR@
212PKG_CONFIG = @PKG_CONFIG@ 212PKG_CONFIG = @PKG_CONFIG@
213PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
214PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
213PYTHON = @PYTHON@ 215PYTHON = @PYTHON@
214PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 216PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
215PYTHON_PLATFORM = @PYTHON_PLATFORM@ 217PYTHON_PLATFORM = @PYTHON_PLATFORM@
diff --git a/libraries/edje/src/modules/eet_snd_reader/Makefile.in b/libraries/edje/src/modules/eet_snd_reader/Makefile.in
index 12d0487..f4d99bb 100644
--- a/libraries/edje/src/modules/eet_snd_reader/Makefile.in
+++ b/libraries/edje/src/modules/eet_snd_reader/Makefile.in
@@ -211,6 +211,8 @@ PACKAGE_URL = @PACKAGE_URL@
211PACKAGE_VERSION = @PACKAGE_VERSION@ 211PACKAGE_VERSION = @PACKAGE_VERSION@
212PATH_SEPARATOR = @PATH_SEPARATOR@ 212PATH_SEPARATOR = @PATH_SEPARATOR@
213PKG_CONFIG = @PKG_CONFIG@ 213PKG_CONFIG = @PKG_CONFIG@
214PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
215PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
214PYTHON = @PYTHON@ 216PYTHON = @PYTHON@
215PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 217PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
216PYTHON_PLATFORM = @PYTHON_PLATFORM@ 218PYTHON_PLATFORM = @PYTHON_PLATFORM@
diff --git a/libraries/edje/src/modules/multisense_factory/Makefile.in b/libraries/edje/src/modules/multisense_factory/Makefile.in
index 8fbc0aa..ed0c3e4 100644
--- a/libraries/edje/src/modules/multisense_factory/Makefile.in
+++ b/libraries/edje/src/modules/multisense_factory/Makefile.in
@@ -208,6 +208,8 @@ PACKAGE_URL = @PACKAGE_URL@
208PACKAGE_VERSION = @PACKAGE_VERSION@ 208PACKAGE_VERSION = @PACKAGE_VERSION@
209PATH_SEPARATOR = @PATH_SEPARATOR@ 209PATH_SEPARATOR = @PATH_SEPARATOR@
210PKG_CONFIG = @PKG_CONFIG@ 210PKG_CONFIG = @PKG_CONFIG@
211PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
212PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
211PYTHON = @PYTHON@ 213PYTHON = @PYTHON@
212PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 214PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
213PYTHON_PLATFORM = @PYTHON_PLATFORM@ 215PYTHON_PLATFORM = @PYTHON_PLATFORM@
diff --git a/libraries/edje/src/tests/Makefile.in b/libraries/edje/src/tests/Makefile.in
index ff5193e..f610548 100644
--- a/libraries/edje/src/tests/Makefile.in
+++ b/libraries/edje/src/tests/Makefile.in
@@ -189,6 +189,8 @@ PACKAGE_URL = @PACKAGE_URL@
189PACKAGE_VERSION = @PACKAGE_VERSION@ 189PACKAGE_VERSION = @PACKAGE_VERSION@
190PATH_SEPARATOR = @PATH_SEPARATOR@ 190PATH_SEPARATOR = @PATH_SEPARATOR@
191PKG_CONFIG = @PKG_CONFIG@ 191PKG_CONFIG = @PKG_CONFIG@
192PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
193PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
192PYTHON = @PYTHON@ 194PYTHON = @PYTHON@
193PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 195PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
194PYTHON_PLATFORM = @PYTHON_PLATFORM@ 196PYTHON_PLATFORM = @PYTHON_PLATFORM@
diff --git a/libraries/edje/utils/Makefile.in b/libraries/edje/utils/Makefile.in
index 4df8fbd..4c05fe5 100644
--- a/libraries/edje/utils/Makefile.in
+++ b/libraries/edje/utils/Makefile.in
@@ -177,6 +177,8 @@ PACKAGE_URL = @PACKAGE_URL@
177PACKAGE_VERSION = @PACKAGE_VERSION@ 177PACKAGE_VERSION = @PACKAGE_VERSION@
178PATH_SEPARATOR = @PATH_SEPARATOR@ 178PATH_SEPARATOR = @PATH_SEPARATOR@
179PKG_CONFIG = @PKG_CONFIG@ 179PKG_CONFIG = @PKG_CONFIG@
180PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
181PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
180PYTHON = @PYTHON@ 182PYTHON = @PYTHON@
181PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 183PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
182PYTHON_PLATFORM = @PYTHON_PLATFORM@ 184PYTHON_PLATFORM = @PYTHON_PLATFORM@
generated by cgit v1.1 at 2024-07-05 08:59:27 +0000