svn update: 55556 (latest:55556)

diff --git a/AUTHORS b/AUTHORS
index a82c8d8..fde96ed 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -11,3 +11,4 @@ Fabiano Fidêncio <fidencio@profusion.mobi>
 Jihoon Kim <jihoon48.kim@samsung.com>
 Tiago Falcão <tiago@profusion.mobi>
 Davide Andreoli <dave@gurumeditation.it>
+Sebastian Dransfeld <sd@tango.flipp.net>

diff --git a/configure.ac b/configure.ac
index e9b7dde..88212bd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -287,12 +287,29 @@ PKG_CHECK_MODULES([ECORE_IMF],
 # Dependencies for the binaries
 
 if test "x$have_edje_cc" = "xyes"; then
-   PKG_CHECK_MODULES([ECORE_FILE], [ecore-file >= 1.0.0])
-   PKG_CHECK_MODULES([ECORE_EVAS], [ecore-evas >= 1.0.0])
+   PKG_CHECK_MODULES([EDJE_CC], [ecore-file >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.0.0 eina >= 1.0.0])
+   EDJE_CC_LIBS="${EDJE_CC_LIBS} ${LUA_LIBS} ${lua_libs}"
+fi
+
+if test "x$have_edje_decc" = "xyes"; then
+   PKG_CHECK_MODULES([EDJE_DECC], [ecore-file >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.0.0 eina >= 1.0.0])
 fi
 
 if test "x$have_edje_player" = "xyes"; then
-   PKG_CHECK_MODULES([ECORE_EVAS], [ecore-evas >= 1.0.0])
+   PKG_CHECK_MODULES([EDJE_PLAYER], [ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eina >= 1.0.0])
+fi
+
+if test "x$have_edje_convert" = "xyes"; then
+   PKG_CHECK_MODULES([EDJE_CONVERT], [eet >= 1.0.0 eina >= 1.0.0])
+   EDJE_CONVERT_LIBS="${EDJE_CONVERT_LIBS} ${LUA_LIBS} ${lua_libs}"
+fi
+
+if test "x$have_edje_inspector" = "xyes"; then
+   PKG_CHECK_MODULES([EDJE_INSPECTOR], [ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eina >= 1.0.0])
+fi
+
+if test "x$have_edje_external_inspector" = "xyes"; then
+   PKG_CHECK_MODULES([EDJE_EXTERNAL_INSPECTOR], [ecore >= 1.0.0 evas >= 1.0.0 eina >= 1.0.0])
 fi
 
 

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 2d29210..e3214f6 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,18 +1,6 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-AM_CPPFLAGS = \
--I$(top_srcdir) \
--I$(top_srcdir)/src/bin \
--I$(top_srcdir)/src/lib \
--DPACKAGE_BIN_DIR=\"$(bindir)\" \
--DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-@EDJE_CFLAGS@ \
-@ECORE_EVAS_CFLAGS@ \
-@ECORE_FILE_CFLAGS@ \
-@EVIL_CFLAGS@
-
 bin_SCRIPTS = @EDJE_RECC_PRG@
 
 bin_PROGRAMS = @EDJE_CC_PRG@ @EDJE_DECC_PRG@ @EDJE_PLAYER_PRG@ @EDJE_CONVERT_PRG@ @EDJE_INSPECTOR_PRG@ @EDJE_EXTERNAL_INSPECTOR_PRG@
@@ -28,7 +16,14 @@ edje_cc_handlers.c \
 edje_cc_sources.c \
 edje_prefix.c
 
-edje_cc_LDADD = $(top_builddir)/src/lib/libedje.la $(ECORE_EVAS_LIBS) $(EVIL_LIBS)
+edje_cc_CPPFLAGS = \
+-I$(top_srcdir)/src/bin \
+-I$(top_srcdir)/src/lib \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+@EDJE_CFLAGS@ @EDJE_CC_CFLAGS@ @EVIL_CFLAGS@
+edje_cc_LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_CC_LIBS@ @EVIL_LIBS@ -lm
 edje_cc_LDFLAGS = @lt_enable_auto_import@
 
 
@@ -38,23 +33,43 @@ edje_decc.h \
 edje_cc_mem.c \
 edje_cc_sources.c
 
-edje_decc_LDADD = $(top_builddir)/src/lib/libedje.la $(ECORE_EVAS_LIBS) $(ECORE_FILE_LIBS)
+edje_decc_CPPFLAGS = \
+-I$(top_srcdir)/src/bin \
+-I$(top_srcdir)/src/lib \
+@EDJE_CFLAGS@ @EDJE_DECC_CFLAGS@ @EVIL_CFLAGS@
+edje_decc_LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_DECC_LIBS@
 edje_decc_LDFLAGS = @lt_enable_auto_import@
 
 edje_player_SOURCES = edje_player.c
-edje_player_LDADD = $(top_builddir)/src/lib/libedje.la $(ECORE_EVAS_LIBS) $(EVIL_LIBS)
+edje_player_CPPFLAGS = \
+-I$(top_srcdir)/src/bin \
+-I$(top_srcdir)/src/lib \
+@EDJE_PLAYER_CFLAGS@ @EVIL_CFLAGS@
+edje_player_LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_PLAYER_LIBS@ @EVIL_LIBS@
 edje_player_LDFLAGS = @lt_enable_auto_import@
 
 edje_convert_SOURCES = edje_convert.c edje_convert_main.c edje_data_convert.c
-edje_convert_LDADD = $(top_builddir)/src/lib/libedje.la $(EVIL_LIBS) $(ECORE_EVAS_LIBS) $(EVIL_LIBS)
+edje_convert_CPPFLAGS = \
+-I$(top_srcdir)/src/bin \
+-I$(top_srcdir)/src/lib \
+@EDJE_CFLAGS@ @EDJE_CONVERT_CFLAGS@
+edje_convert_LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_CONVERT_LIBS@
 edje_convert_LDFLAGS = @lt_enable_auto_import@
 
 edje_inspector_SOURCES = edje_inspector.c
-edje_inspector_LDADD = $(top_builddir)/src/lib/libedje.la $(EVIL_LIBS) $(ECORE_EVAS_LIBS) $(EVIL_LIBS)
+edje_inspector_CPPFLAGS = \
+-I$(top_srcdir)/src/bin \
+-I$(top_srcdir)/src/lib \
+@EDJE_INSPECTOR_CFLAGS@
+edje_inspector_LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_INSPECTOR_LIBS@
 edje_inspector_LDFLAGS = @lt_enable_auto_import@
 
 edje_external_inspector_SOURCES = edje_external_inspector.c
-edje_external_inspector_LDADD = $(top_builddir)/src/lib/libedje.la $(EVIL_LIBS) $(ECORE_EVAS_LIBS) $(EVIL_LIBS)
+edje_external_inspector_CPPFLAGS = \
+-I$(top_srcdir)/src/bin \
+-I$(top_srcdir)/src/lib \
+@EDJE_EXTERNAL_INSPECTOR_CFLAGS@
+edje_external_inspector_LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_EXTERNAL_INSPECTOR_LIBS@
 edje_external_inspector_LDFLAGS = @lt_enable_auto_import@
 
 

diff --git a/src/bin/edje_cc_handlers.c b/src/bin/edje_cc_handlers.c
index e34ae49..8904c45 100644 (file)
--- a/src/bin/edje_cc_handlers.c
+++ b/src/bin/edje_cc_handlers.c
@@ -6911,6 +6911,8 @@ st_collections_group_programs_program_target(void)
          data_queue_part_lookup(pc, name, &(et->id));
        else if (ep->action == EDJE_ACTION_TYPE_FOCUS_SET)
          data_queue_part_lookup(pc, name, &(et->id));
+       else if (ep->action == EDJE_ACTION_TYPE_FOCUS_OBJECT)
+         data_queue_part_lookup(pc, name, &(et->id));
        else
          {
             ERR("%s: Error. parse error %s:%i. "

diff --git a/src/lib/Edje.h b/src/lib/Edje.h
index 120e3c2..c0d2d7f 100644 (file)
--- a/src/lib/Edje.h
+++ b/src/lib/Edje.h
@@ -1,7 +1,9 @@
 #ifndef _EDJE_H
 #define _EDJE_H
 
-#include <stdint.h>
+#ifndef _MSC_VER
+# include <stdint.h>
+#endif
 #include <math.h>
 #include <float.h>
 #include <limits.h>

diff --git a/src/lib/edje_box_layout.c b/src/lib/edje_box_layout.c
index 5a30c1d..3585046 100644 (file)
--- a/src/lib/edje_box_layout.c
+++ b/src/lib/edje_box_layout.c
@@ -79,8 +79,10 @@ _edje_box_layout_exec(Evas_Object *obj, Edje_Part_Box_Animation *anim)
    Edje_Transition_Animation_Data *tad;
    Evas_Coord x, y, w, h;
    Evas_Coord cur_x, cur_y, cur_w, cur_h;
+   double progress;
+
    evas_object_geometry_get(obj, &x, &y, &w, &h);
-   double progress = (anim->progress - anim->start_progress) / (1 - anim->start_progress);
+   progress = (anim->progress - anim->start_progress) / (1 - anim->start_progress);
 
    EINA_LIST_FOREACH(anim->objs, l, tad)
      {

diff --git a/src/lib/edje_calc.c b/src/lib/edje_calc.c
index 2eed526..c1aa0d0 100644 (file)
--- a/src/lib/edje_calc.c
+++ b/src/lib/edje_calc.c
@@ -847,7 +847,7 @@ _edje_part_recalc_single_text(FLOAT_T sc,
               {
                   char *font2;
                   
-                  int len = strlen(font) + sizeof("edje/fonts/") + 1;
+                  size_t len = strlen(font) + sizeof("edje/fonts/") + 1;
                   font2 = alloca(len);
                   sprintf(font2, "edje/fonts/%s", font);
                   font = font2;

diff --git a/src/lib/edje_entry.c b/src/lib/edje_entry.c
index 740b23c..e62cfcd 100644 (file)
--- a/src/lib/edje_entry.c
+++ b/src/lib/edje_entry.c
@@ -833,7 +833,7 @@ _edje_anchor_mouse_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UN
    Evas_Event_Mouse_Down *ev = event_info;
    Edje_Real_Part *rp = an->en->rp;
    char *buf, *n;
-   int len;
+   size_t len;
    int ignored;
    Entry *en;
 
@@ -866,7 +866,7 @@ _edje_anchor_mouse_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS
    Evas_Event_Mouse_Up *ev = event_info;
    Edje_Real_Part *rp = an->en->rp;
    char *buf, *n;
-   int len;
+   size_t len;
    int ignored;
    Entry *en;
 
@@ -894,7 +894,7 @@ _edje_anchor_mouse_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UN
    Evas_Event_Mouse_Move *ev = event_info;
    Edje_Real_Part *rp = an->en->rp;
    char *buf, *n;
-   int len;
+   size_t len;
    int ignored;
    Entry *en;
 
@@ -922,7 +922,7 @@ _edje_anchor_mouse_in_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS
    Evas_Event_Mouse_In *ev = event_info;
    Edje_Real_Part *rp = an->en->rp;
    char *buf, *n;
-   int len;
+   size_t len;
    int ignored;
 
    ignored = rp->part->ignore_flags & ev->event_flags;
@@ -944,7 +944,7 @@ _edje_anchor_mouse_out_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU
    Evas_Event_Mouse_Out *ev = event_info;
    Edje_Real_Part *rp = an->en->rp;
    char *buf, *n;
-   int len;
+   size_t len;
    int ignored;
 
    ignored = rp->part->ignore_flags & ev->event_flags;
@@ -2710,7 +2710,9 @@ _edje_entry_real_part_shutdown(Edje_Real_Part *rp)
    rp->entry_data = NULL;
    _sel_clear(en->cursor, rp->object, en);
    _anchors_clear(en->cursor, rp->object, en);
+#ifdef HAVE_ECORE_IMF
    _preedit_clear(en);
+#endif
    rp->edje->subobjs = eina_list_remove(rp->edje->subobjs, en->cursor_bg);
    rp->edje->subobjs = eina_list_remove(rp->edje->subobjs, en->cursor_fg);
    evas_object_del(en->cursor_bg);
@@ -3395,9 +3397,12 @@ void
 _edje_entry_cursor_copy(Edje_Real_Part *rp, Edje_Cursor cur, Edje_Cursor dst)
 {
    Entry *en = rp->entry_data;
-   Evas_Textblock_Cursor *c = _cursor_get(rp, cur);
+   Evas_Textblock_Cursor *c;
+   Evas_Textblock_Cursor *d;
+
+   c = _cursor_get(rp, cur);
    if (!c) return;
-   Evas_Textblock_Cursor *d = _cursor_get(rp, dst);
+   d = _cursor_get(rp, dst);
    if (!d) return;
    evas_textblock_cursor_copy(c, d);
    _curs_update_from_curs(c, rp->object, rp->entry_data);
@@ -3571,9 +3576,11 @@ _edje_entry_imf_event_commit_cb(void *data, int type __UNUSED__, void *event)
    else
       evas_textblock_cursor_copy(en->cursor, tc);
 
+#ifdef HAVE_ECORE_IMF
    /* delete preedit characters */
    _preedit_del(en);
    _preedit_clear(en);
+#endif
 
    if (evas_textblock_cursor_compare(en->cursor, tc))
       cursor_move = EINA_TRUE;

diff --git a/src/lib/edje_load.c b/src/lib/edje_load.c
index 5c7c778..a75ed49 100644 (file)
--- a/src/lib/edje_load.c
+++ b/src/lib/edje_load.c
@@ -1440,7 +1440,7 @@ _cb_signal_repeat(void *data, Evas_Object *obj, const char *signal, const char *
              if (origin > length)
                {
                   char *tmp;
-                  int alias_length;
+                  size_t alias_length;
 
                   alias_length = strlen(alias);
                   tmp = alloca(alias_length + origin - length + 2);

diff --git a/src/lib/edje_match.c b/src/lib/edje_match.c
index f3e0819..6f134c0 100644 (file)
--- a/src/lib/edje_match.c
+++ b/src/lib/edje_match.c
@@ -13,7 +13,7 @@ struct _Edje_States
 {
   size_t         size;
   Edje_State    *states;
-  _Bool         *has;
+  Eina_Bool     *has;
 };
 
 static void
@@ -75,7 +75,7 @@ _edje_match_states_alloc(Edje_Patterns *ppat, int n)
    for (i = 0; i < n; ++i)
      {
         l[i].states = (Edje_State *) states;
-        l[i].has = (_Bool *) has;
+        l[i].has = (Eina_Bool *) has;
 
        memset(l[i].has, 0, has_size);
 

diff --git a/src/lib/edje_private.h b/src/lib/edje_private.h
index d123585..3949d9f 100644 (file)
--- a/src/lib/edje_private.h
+++ b/src/lib/edje_private.h
@@ -29,17 +29,17 @@ void *alloca (size_t);
 #include <time.h>
 #include <sys/time.h>
 #include <errno.h>
-#include <libgen.h>
+
+#ifndef _MSC_VER
+# include <libgen.h>
+# include <unistd.h>
+#endif
 
 #include <lua.h>
 #include <lualib.h>
 #include <lauxlib.h>
 #include <setjmp.h>
 
-#ifndef _MSC_VER
-# include <unistd.h>
-#endif
-
 #ifdef HAVE_LOCALE_H
 # include <locale.h>
 #endif
@@ -1798,7 +1798,7 @@ EAPI void _edje_module_shutdown();
 static inline Eina_Bool
 edje_program_is_strncmp(const char *str)
 {
-   unsigned int length;
+   size_t length;
 
    length = strlen(str);
 

diff --git a/src/lib/edje_text.c b/src/lib/edje_text.c
index 84cbf64..67a5c5c 100644 (file)
--- a/src/lib/edje_text.c
+++ b/src/lib/edje_text.c
@@ -266,7 +266,7 @@ static const char *
 _edje_text_font_get(const char *base, const char *new, char **free_later)
 {
    const char *base_style, *new_style, *aux;
-   int font_len, style_len;
+   size_t font_len, style_len;
 
    if (base && (!new))
      return base;
@@ -283,7 +283,7 @@ _edje_text_font_get(const char *base, const char *new, char **free_later)
 
    font_len = strlen(new);
    aux = strchr(base_style, ',');
-   style_len = (aux) ? (aux - base_style) : (int) strlen(base_style);
+   style_len = (aux) ? (aux - base_style) : strlen(base_style);
 
    *free_later = malloc(font_len + style_len + 1);
    memcpy(*free_later, new, font_len);
@@ -365,7 +365,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
          {
              char *font2;
              
-             int len = strlen(font) + sizeof("edje/fonts/") + 1;
+             size_t len = strlen(font) + sizeof("edje/fonts/") + 1;
              font2 = alloca(len);
              sprintf(font2, "edje/fonts/%s", font);
              font = font2;

diff --git a/src/lib/edje_util.c b/src/lib/edje_util.c
index 1eb612c..04dc508 100644 (file)
--- a/src/lib/edje_util.c
+++ b/src/lib/edje_util.c
@@ -2749,7 +2749,7 @@ static Edje_Box_Layout *
 _edje_box_layout_external_new(const char *name, Evas_Object_Box_Layout func, void *(*layout_data_get)(void *), void (*layout_data_free)(void *), void (*free_data)(void *), void *data)
 {
    Edje_Box_Layout *l;
-   int name_len;
+   size_t name_len;
 
    name_len = strlen(name) + 1;
    l = malloc(sizeof(Edje_Box_Layout) + name_len);