Update EFL to latest beta.

41 files changed, 2897 insertions, 1080 deletions

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@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PYTHON = @PYTHON@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
 PYTHON_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@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PYTHON = @PYTHON@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
 PYTHON_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,
 void    data_queue_copied_anonymous_lookup(Edje_Part_Collection *pc, int *src, int *dest);
 void    data_queue_image_lookup(char *name, int *dest, Eina_Bool *set);
 void    data_queue_copied_image_lookup(int *src, int *dest, Eina_Bool *set);
+void    data_queue_image_remove(int *dest, Eina_Bool *set);
 void    data_queue_part_slave_lookup(int *master, int *slave);
 void    data_queue_image_slave_lookup(int *master, int *slave);
 void    data_queue_spectrum_lookup(char *name, int *dest);
@@ -155,6 +156,7 @@ void    data_process_lookups(void);
 void    data_process_scripts(void);
 void    data_process_script_lookups(void);
 
+void    part_description_image_cleanup(Edje_Part *ep);
 
 int     is_verbatim(void);
 void    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);
 static void st_collections_group_alias(void);
 static void st_collections_group_min(void);
 static void st_collections_group_max(void);
+static void st_collections_group_broadcast_signal(void);
 static void st_collections_group_data_item(void);
 static void st_collections_group_orientation(void);
 
@@ -317,6 +318,7 @@ New_Statement_Handler statement_handlers[] =
      {"collections.group.alias", st_collections_group_alias},
      {"collections.group.min", st_collections_group_min},
      {"collections.group.max", st_collections_group_max},
+     {"collections.group.broadcast_signal", st_collections_group_broadcast_signal},
      {"collections.group.orientation", st_collections_group_orientation},
      {"collections.group.data.item", st_collections_group_data_item},
      {"collections.group.limits.horizontal", st_collections_group_limits_horizontal},
@@ -833,6 +835,39 @@ _edje_part_description_fill(Edje_Part_Description_Spec_Fill *fill)
    fill->type = EDJE_FILL_TYPE_SCALE;
 }
 
+static void
+_edje_part_description_image_remove(Edje_Part_Description_Image *ed)
+{
+   unsigned int j;
+
+   if (!ed) return;
+
+   data_queue_image_remove(&(ed->image.id), &(ed->image.set));
+
+   for (j = 0; j < ed->image.tweens_count; ++j)
+     data_queue_image_remove(&(ed->image.tweens[j]->id),
+                             &(ed->image.tweens[j]->set));
+}
+
+void
+part_description_image_cleanup(Edje_Part *ep)
+{
+   Edje_Part_Description_Image *ed;
+   unsigned int j;
+
+   if (ep->type != EDJE_PART_TYPE_IMAGE)
+     return ;
+
+   ed = (Edje_Part_Description_Image*) ep->default_desc;
+   _edje_part_description_image_remove(ed);
+
+   for (j = 0; j < ep->other.desc_count; j++)
+     {
+        ed = (Edje_Part_Description_Image*) ep->other.desc[j];
+        _edje_part_description_image_remove(ed);
+     }
+}
+
 static Edje_Part_Description_Common *
 _edje_part_description_alloc(unsigned char type, const char *collection, const char *part)
 {
@@ -2118,6 +2153,7 @@ ob_collections_group(void)
    pc = mem_alloc(SZ(Edje_Part_Collection));
    edje_collections = eina_list_append(edje_collections, pc);
    pc->id = current_de->id;
+   pc->broadcast_signal = EINA_TRUE; /* This was the behaviour by default in Edje 1.1 */
 
    cd = mem_alloc(SZ(Code));
    codes = eina_list_append(codes, cd);
@@ -2139,8 +2175,10 @@ ob_collections_group(void)
 static void
 st_collections_group_name(void)
 {
+   Edje_Part_Collection_Directory_Entry *alias;
    Edje_Part_Collection_Directory_Entry *older;
    Edje_Part_Collection *current_pc;
+   Eina_List *l = NULL;
 
    check_arg_count(1);
 
@@ -2150,31 +2188,24 @@ st_collections_group_name(void)
    current_pc->part = current_de->entry;
 
    older = eina_hash_find(edje_file->collection, current_de->entry);
+   if (older) eina_hash_del(edje_file->collection, current_de->entry, older);
+   eina_hash_direct_add(edje_file->collection, current_de->entry, current_de);
+   if (!older) return;
 
-   if (older)
-     {
-        Edje_Part_Collection *pc;
-        Eina_List *l;
-        Code *cd;
-        int i = 0;
-
-        pc = eina_list_nth(edje_collections, older->id);
-        cd = eina_list_nth(codes, older->id);
-
-        eina_hash_del(edje_file->collection, current_de->entry, older);
-        edje_collections = eina_list_remove(edje_collections, pc);
-        codes = eina_list_remove(codes, cd);
-
-        EINA_LIST_FOREACH(edje_collections, l, pc)
-          {
-             older = eina_hash_find(edje_file->collection, pc->part);
-
-             pc->id = i++;
-             if (older) older->id = pc->id;
-          }
-     }
+   EINA_LIST_FOREACH(aliases, l, alias)
+     if (strcmp(alias->entry, current_de->entry) == 0)
+       {
+          Edje_Part_Collection *pc;
+
+          pc = eina_list_nth(edje_collections, older->id);
+          INF("overriding alias ('%s' => '%s') by group '%s'",
+              alias->entry, pc->part,
+              current_de->entry);
+          aliases = eina_list_remove_list(aliases, l);
+          free(alias);
+          break;
+       }
 
-   eina_hash_direct_add(edje_file->collection, current_de->entry, current_de);
 }
 
 typedef struct _Edje_List_Foreach_Data Edje_List_Foreach_Data;
@@ -2242,6 +2273,14 @@ st_collections_group_inherit(void)
             progname, file_in, line - 1, parent_name);
         exit(-1);
      }
+   if (pc2 == pc)
+     {
+        ERR("%s: Error. parse error %s:%i. You are trying to inherit '%s' from itself. That's not possible."
+            "If there is another group of the same name, you want to inherit from that group and have the"
+            "same name as that group, there is a trick ! Just put the inherit before the directive that set"
+            "the name !", progname, file_in, line - 1, parent_name);
+        exit(-1);
+     }
 
    if (pc2->data)
      {
@@ -2463,6 +2502,8 @@ static void
 st_collections_group_alias(void)
 {
    Edje_Part_Collection_Directory_Entry *alias;
+   Edje_Part_Collection_Directory_Entry *tmp;
+   Eina_List *l;
 
    check_arg_count(1);
 
@@ -2470,6 +2511,20 @@ st_collections_group_alias(void)
    alias->id = current_de->id;
    alias->entry = parse_str(0);
 
+   EINA_LIST_FOREACH(aliases, l, tmp)
+     if (strcmp(alias->entry, tmp->entry) == 0)
+       {
+          Edje_Part_Collection *pc;
+
+          pc = eina_list_nth(edje_collections, tmp->id);
+          INF("overriding alias ('%s' => '%s') to ('%s' => '%s')",
+              tmp->entry, pc->part,
+              alias->entry, current_de->entry);
+          aliases = eina_list_remove_list(aliases, l);
+          free(tmp);
+          break;
+       }
+
    aliases = eina_list_append(aliases, alias);
 }
 
@@ -2520,6 +2575,28 @@ st_collections_group_max(void)
 }
 
 /**
+   @page edcref
+   @property
+       broadcast_signal
+   @parameters
+       [broadcast]
+   @effect
+       Signal got automatically broadcasted to all sub group part. Default to
+       true since 1.1.
+   @endproperty
+*/
+static void
+st_collections_group_broadcast_signal(void)
+{
+   Edje_Part_Collection *pc;
+
+   check_arg_count(1);
+
+   pc = eina_list_data_get(eina_list_last(edje_collections));
+   pc->broadcast_signal = parse_bool(0);
+}
+
+/**
     @page edcref
     @block
         script
@@ -2947,21 +3024,57 @@ st_collections_group_parts_part_name(void)
 static void
 st_collections_group_parts_part_type(void)
 {
+   unsigned int type;
+
    check_arg_count(1);
 
-   current_part->type = parse_enum(0,
-                                   "NONE", EDJE_PART_TYPE_NONE,
-                                   "RECT", EDJE_PART_TYPE_RECTANGLE,
-                                   "TEXT", EDJE_PART_TYPE_TEXT,
-                                   "IMAGE", EDJE_PART_TYPE_IMAGE,
-                                   "SWALLOW", EDJE_PART_TYPE_SWALLOW,
-                                   "TEXTBLOCK", EDJE_PART_TYPE_TEXTBLOCK,
-                                   "GROUP", EDJE_PART_TYPE_GROUP,
-                                   "BOX", EDJE_PART_TYPE_BOX,
-                                   "TABLE", EDJE_PART_TYPE_TABLE,
-                                   "EXTERNAL", EDJE_PART_TYPE_EXTERNAL,
-                                   "PROXY", EDJE_PART_TYPE_PROXY,
-                                   NULL);
+   type = parse_enum(0,
+                     "NONE", EDJE_PART_TYPE_NONE,
+                     "RECT", EDJE_PART_TYPE_RECTANGLE,
+                     "TEXT", EDJE_PART_TYPE_TEXT,
+                     "IMAGE", EDJE_PART_TYPE_IMAGE,
+                     "SWALLOW", EDJE_PART_TYPE_SWALLOW,
+                     "TEXTBLOCK", EDJE_PART_TYPE_TEXTBLOCK,
+                     "GROUP", EDJE_PART_TYPE_GROUP,
+                     "BOX", EDJE_PART_TYPE_BOX,
+                     "TABLE", EDJE_PART_TYPE_TABLE,
+                     "EXTERNAL", EDJE_PART_TYPE_EXTERNAL,
+                     "PROXY", EDJE_PART_TYPE_PROXY,
+                     NULL);
+
+   /* handle type change of inherited part */
+   if (type != current_part->type)
+     {
+        Edje_Part_Description_Common *new, *previous;
+        Edje_Part_Collection *pc;
+        Edje_Part *ep;
+        unsigned int i;
+
+        /* we don't free old part as we don't remove all reference to them */
+        part_description_image_cleanup(current_part);
+
+        pc = eina_list_data_get(eina_list_last(edje_collections));
+        ep = current_part;
+
+        previous = ep->default_desc;
+        if (previous)
+          {
+             new = _edje_part_description_alloc(type, pc->part, ep->name);
+             memcpy(new, previous, sizeof (Edje_Part_Description_Common));
+
+             ep->default_desc = new;
+          }
+
+        for (i = 0; i < ep->other.desc_count; i++)
+          {
+             previous = ep->other.desc[i];
+             new = _edje_part_description_alloc(type, pc->part, ep->name);
+             memcpy(new, previous, sizeof (Edje_Part_Description_Common));
+             ep->other.desc[i] = new;
+          }
+     }
+
+   current_part->type = type;
 }
 
 /**
@@ -4292,6 +4405,7 @@ st_collections_group_parts_part_description_inherit(void)
 
               ied->image = iparent->image;
 
+              data_queue_image_remove(&ied->image.id, &ied->image.set);
               data_queue_copied_image_lookup(&iparent->image.id, &ied->image.id, &ied->image.set);
 
               ied->image.tweens = calloc(iparent->image.tweens_count,
@@ -4303,6 +4417,7 @@ st_collections_group_parts_part_description_inherit(void)
                    iid = iparent->image.tweens[i];
 
                    iid_new = mem_alloc(SZ(Edje_Part_Image_Id));
+                   data_queue_image_remove(&ied->image.id, &ied->image.set);
                    data_queue_copied_image_lookup(&(iid->id), &(iid_new->id), &(iid_new->set));
                    ied->image.tweens[i] = iid_new;
                 }
@@ -4445,6 +4560,9 @@ st_collections_group_parts_part_description_state(void)
         if ((ep->default_desc->state.name && !strcmp(s, ep->default_desc->state.name) && ed->state.value == ep->default_desc->state.value) ||
             (!ep->default_desc->state.name && !strcmp(s, "default") && ed->state.value == ep->default_desc->state.value))
           {
+             if (ep->type == EDJE_PART_TYPE_IMAGE)
+               _edje_part_description_image_remove((Edje_Part_Description_Image*) ed);
+
              free(ed);
              ep->other.desc_count--;
              ep->other.desc = realloc(ep->other.desc,
@@ -4458,6 +4576,9 @@ st_collections_group_parts_part_description_state(void)
                {
                   if (!strcmp(s, ep->other.desc[i]->state.name) && ed->state.value == ep->other.desc[i]->state.value)
                     {
+                       if (ep->type == EDJE_PART_TYPE_IMAGE)
+                         _edje_part_description_image_remove((Edje_Part_Description_Image*) ed);
+
                        free(ed);
                        ep->other.desc_count--;
                        ep->other.desc = realloc(ep->other.desc,
@@ -4538,18 +4659,38 @@ st_collections_group_parts_part_description_fixed(void)
     @property
         min
     @parameters
-        [width] [height]
+        [width] [height] or SOURCE
     @effect
         The minimum size of the state.
+
+        When min is defined to SOURCE, it will look at the original
+        image size and enforce it minimal size to match at least the
+        original one. The part must be an IMAGE or a GROUP part.
     @endproperty
 */
 static void
 st_collections_group_parts_part_description_min(void)
 {
-   check_arg_count(2);
+   check_min_arg_count(1);
+
+   if (is_param(1)) {
+      current_desc->min.w = parse_float_range(0, 0, 0x7fffffff);
+      current_desc->min.h = parse_float_range(1, 0, 0x7fffffff);
+   } else {
+      char *tmp;
+
+      tmp = parse_str(0);
+      if ((current_part->type != EDJE_PART_TYPE_IMAGE && current_part->type != EDJE_PART_TYPE_GROUP) ||
+          !tmp || strcmp(tmp, "SOURCE") != 0)
+        {
+           ERR("%s: Error. parse error %s:%i. "
+               "Only IMAGE and GROUP part can have a min: SOURCE; defined",
+               progname, file_in, line - 1);
+           exit(-1);
+        }
 
-   current_desc->min.w = parse_float_range(0, 0, 0x7fffffff);
-   current_desc->min.h = parse_float_range(1, 0, 0x7fffffff);
+      current_desc->min.limit = EINA_TRUE;
+   }
 }
 
 /**
@@ -4578,18 +4719,38 @@ st_collections_group_parts_part_description_minmul(void)
     @property
         max
     @parameters
-        [width] [height]
+        [width] [height] or SOURCE
     @effect
         The maximum size of the state. A size of -1.0 means that it will be ignored in one direction.
+
+        When max is set to SOURCE, edje will enforce the part to be
+        not more than the original image size. The part must be an
+        IMAGE part.
     @endproperty
 */
 static void
 st_collections_group_parts_part_description_max(void)
 {
-   check_arg_count(2);
+   check_min_arg_count(1);
+
+   if (is_param(1)) {
+      current_desc->max.w = parse_float_range(0, -1.0, 0x7fffffff);
+      current_desc->max.h = parse_float_range(1, -1.0, 0x7fffffff);
+   } else {
+      char *tmp;
 
-   current_desc->max.w = parse_float_range(0, -1.0, 0x7fffffff);
-   current_desc->max.h = parse_float_range(1, -1.0, 0x7fffffff);
+      tmp = parse_str(0);
+      if (current_part->type != EDJE_PART_TYPE_IMAGE ||
+          !tmp || strcmp(tmp, "SOURCE") != 0)
+        {
+           ERR("%s: Error. parse error %s:%i. "
+               "Only IMAGE part can have a max: SOURCE; defined",
+               progname, file_in, line - 1);
+           exit(-1);
+        }
+
+      current_desc->max.limit = EINA_TRUE;
+   }
 }
 
 /**
@@ -5039,6 +5200,7 @@ st_collections_group_parts_part_description_image_normal(void)
       char *name;
 
       name = parse_str(0);
+      data_queue_image_remove(&(ed->image.id), &(ed->image.set));
       data_queue_image_lookup(name, &(ed->image.id), &(ed->image.set));
       free(name);
    }
@@ -5083,6 +5245,7 @@ st_collections_group_parts_part_description_image_tween(void)
                                  sizeof (Edje_Part_Image_Id*) * ed->image.tweens_count);
       ed->image.tweens[ed->image.tweens_count - 1] = iid;
       name = parse_str(0);
+      data_queue_image_remove(&(iid->id), &(iid->set));
       data_queue_image_lookup(name, &(iid->id), &(iid->set));
       free(name);
    }
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 @@
 
 #include "edje_cc.h"
 
-#ifdef _WIN32
-# define FMT_SIZE_T "%Iu"
-#else
-# define FMT_SIZE_T "%zu"
-#endif
-
 void *
 mem_alloc(size_t size)
 {
@@ -20,7 +14,7 @@ mem_alloc(size_t size)
 
    mem = calloc(1, size);
    if (mem) return mem;
-   ERR("%s: Error. %s:%i memory allocation of " FMT_SIZE_T " bytes failed. %s",
+   ERR("%s: Error. %s:%i memory allocation of %zu bytes failed. %s",
        progname, file_in, line, size, strerror(errno));
    exit(-1);
    return NULL;
@@ -33,7 +27,7 @@ mem_strdup(const char *s)
 
    str = strdup(s);
    if (str) return str;
-   ERR("%s: Error. %s:%i memory allocation of " FMT_SIZE_T " bytes failed. %s. string being duplicated: \"%s\"",
+   ERR("%s: Error. %s:%i memory allocation of %zu bytes failed. %s. string being duplicated: \"%s\"",
        progname, file_in, line, strlen(s) + 1, strerror(errno), s);
    exit(-1);
    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 @@
 # include "config.h"
 #endif
 
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
 #ifdef HAVE_ALLOCA_H
 # include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
+#elif !defined alloca
+# ifdef __GNUC__
+#  define alloca __builtin_alloca
+# elif defined _AIX
+#  define alloca __alloca
+# elif defined _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
+# elif !defined HAVE_ALLOCA
+#  ifdef  __cplusplus
 extern "C"
-# endif
+#  endif
 void *alloca (size_t);
+# endif
 #endif
 
 #include <string.h>
@@ -102,7 +111,7 @@ struct _Code_Lookup
    Eina_Bool set;
 };
 
-static 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));
+static 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));
 
 Edje_File *edje_file = NULL;
 Eina_List *edje_collections = NULL;
@@ -500,7 +509,8 @@ data_write_images(Eet_File *ef, int *image_num, int *input_bytes, int *input_raw
           {
              img = &edje_file->image_dir->entries[i];
 
-             if (img->source_type == EDJE_IMAGE_SOURCE_TYPE_EXTERNAL)
+             if (img->source_type == EDJE_IMAGE_SOURCE_TYPE_EXTERNAL
+                 || img->entry == NULL)
                {
                }
              else
@@ -1550,6 +1560,23 @@ data_queue_image_lookup(char *name, int *dest, Eina_Bool *set)
 }
 
 void
+data_queue_image_remove(int *dest, Eina_Bool *set)
+{
+   Eina_List *l;
+   Image_Lookup *il;
+
+   EINA_LIST_FOREACH(image_lookups, l, il)
+     {
+        if (il->dest == dest && il->set == set)
+          {
+             image_lookups = eina_list_remove_list(image_lookups, l);
+             free(il);
+             return ;
+          }
+     }
+ }
+
+void
 data_queue_copied_image_lookup(int *src, int *dest, Eina_Bool *set)
 {
    Eina_List *l;
@@ -1602,14 +1629,64 @@ data_process_lookups(void)
    Program_Lookup *program;
    Group_Lookup *group;
    Image_Lookup *image;
+   Eina_List *l2;
    Eina_List *l;
+   Eina_Hash *images_in_use;
    void *data;
+   Eina_Bool is_lua = EINA_FALSE;
+
+   /* remove all unreferenced Edje_Part_Collection */
+   EINA_LIST_FOREACH_SAFE(edje_collections, l, l2, pc)
+     {
+        Edje_Part_Collection_Directory_Entry *alias;
+        Edje_Part_Collection_Directory_Entry *find;
+        Eina_List *l3;
+        unsigned int id = 0;
+        unsigned int i;
+
+        find = eina_hash_find(edje_file->collection, pc->part);
+        if (find && find->id == pc->id)
+          continue ;
+
+        EINA_LIST_FOREACH(aliases, l3, alias)
+          if (alias->id == pc->id)
+            continue ;
+
+        /* This Edje_Part_Collection is not used at all */
+        edje_collections = eina_list_remove_list(edje_collections, l);
+        l3 = eina_list_nth_list(codes, pc->id);
+        codes = eina_list_remove_list(codes, l3);
+
+        /* Unref all image used by that group */
+        for (i = 0; i < pc->parts_count; ++i)
+          part_description_image_cleanup(pc->parts[i]);
+
+        /* Correct all id */
+        EINA_LIST_FOREACH(edje_collections, l3, pc)
+          {
+             Eina_List *l4;
+
+             /* Some group could be removed from the collection, but still be referenced by alias */
+             find = eina_hash_find(edje_file->collection, pc->part);
+             if (pc->id != find->id) find = NULL;
+
+             /* Update all matching alias */
+             EINA_LIST_FOREACH(aliases, l4, alias)
+               if (pc->id == alias->id)
+                 alias->id = id;
+
+             pc->id = id++;
+             if (find) find->id = pc->id;
+          }
+     }
 
    EINA_LIST_FOREACH(edje_collections, l, pc)
      {
         unsigned int count = 0;
         unsigned int i;
 
+        if (pc->lua_script_only)
+           is_lua = EINA_TRUE;
 #define PROGRAM_ID_SET(Type, Pc, It, Count)                             \
         for (It = 0; It < Pc->programs.Type ## _count; ++It)            \
           {                                                             \
@@ -1738,13 +1815,15 @@ data_process_lookups(void)
         free(group);
      }
 
+   images_in_use = eina_hash_string_superfast_new(NULL);
+
    EINA_LIST_FREE(image_lookups, image)
      {
-        Edje_Image_Directory_Entry *de;
         Eina_Bool find = EINA_FALSE;
 
         if (edje_file->image_dir)
           {
+             Edje_Image_Directory_Entry *de;
              unsigned int i;
 
              for (i = 0; i < edje_file->image_dir->entries_count; ++i)
@@ -1760,6 +1839,9 @@ data_process_lookups(void)
                          *(image->dest) = de->id;
                        *(image->set) = EINA_FALSE;
                        find = EINA_TRUE;
+
+                       if (!eina_hash_find(images_in_use, image->name))
+                         eina_hash_direct_add(images_in_use, de->entry, de);
                        break;
                     }
                }
@@ -1774,10 +1856,20 @@ data_process_lookups(void)
 
                       if ((set->name) && (!strcmp(set->name, image->name)))
                         {
+                           Edje_Image_Directory_Set_Entry *child;
+                           Eina_List *lc;
+
                            handle_slave_lookup(image_slave_lookups, image->dest, set->id);
                            *(image->dest) = set->id;
                            *(image->set) = EINA_TRUE;
                            find = EINA_TRUE;
+
+                           EINA_LIST_FOREACH(set->entries, lc, child)
+                             if (!eina_hash_find(images_in_use, child->name))
+                               eina_hash_direct_add(images_in_use, child->name, child);
+
+                           if (!eina_hash_find(images_in_use, image->name))
+                             eina_hash_direct_add(images_in_use, set->name, set);
                            break;
                         }
                    }
@@ -1795,6 +1887,54 @@ data_process_lookups(void)
         free(image);
      }
 
+   if (edje_file->image_dir && !is_lua)
+     {
+        Edje_Image_Directory_Entry *de;
+        Edje_Image_Directory_Set *set;
+        unsigned int i;
+
+        for (i = 0; i < edje_file->image_dir->entries_count; ++i)
+          {
+             de = edje_file->image_dir->entries + i;
+
+             if (de->entry && eina_hash_find(images_in_use, de->entry))
+               continue ;
+
+             if (verbose)
+               {
+                  printf("%s: Image '%s' in ressource 'edje/image/%i' will not be included as it is unused.\n", progname, de->entry, de->id);
+               }
+             else
+               {
+                  INF("Image '%s' in ressource 'edje/image/%i' will not be included as it is unused.", de->entry, de->id);
+               }
+
+             de->entry = NULL;
+          }
+
+        for (i = 0; i < edje_file->image_dir->sets_count; ++i)
+          {
+             set = edje_file->image_dir->sets + i;
+
+             if (set->name && eina_hash_find(images_in_use, set->name))
+               continue ;
+
+             if (verbose)
+               {
+                  printf("%s: Set '%s' will not be included as it is unused.\n", progname, set->name);
+               }
+             else
+               {
+                  INF("Set '%s' will not be included as it is unused.", set->name);
+               }
+
+             set->name = NULL;
+             set->entries = NULL;
+          }
+     }
+
+   eina_hash_free(images_in_use);
+
    EINA_LIST_FREE(part_slave_lookups, data)
      free(data);
 
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;
 #define FLOAT_PRECISION 0.0001
 #define FDIFF(a, b) (fabs((a) - (b)) > FLOAT_PRECISION)
 
-#ifdef _WIN32
-# define FMT_UCHAR "%c"
-#else
-# define FMT_UCHAR "%hhu"
-#endif
-
 /* context */
 static Eina_List *groups;
 static Ecore_Evas *ee;
@@ -1588,8 +1582,8 @@ main(int argc, char **argv)
         goto error_getopt;
      }
 
-   DBG("mode=%s, detail=%d(%s), group=%s, part=%s, program=%s, api-only=" FMT_UCHAR
-       ", api-fix=" FMT_UCHAR ", machine=" FMT_UCHAR ", file=%s",
+   DBG("mode=%s, detail=%d(%s), group=%s, part=%s, program=%s, api-only=%hhu"
+       ", api-fix=%hhu, machine=%hhu, file=%s",
        mode, detail, detail_name,
        group ? group : "",
        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 @@
 #include <Ecore_Evas.h>
 #include <Edje.h>
 
-#ifdef _WIN32
-# define FMT_UCHAR "%c"
-#else
-# define FMT_UCHAR "%hhu"
-#endif
-
 struct opts {
    char *file;
    char *group;
@@ -554,7 +548,7 @@ static unsigned char _parse_color(__UNUSED__ const Ecore_Getopt *parser, __UNUSE
 {
    unsigned char *color = (unsigned char *)storage->ptrp;
 
-   if (sscanf(str, FMT_UCHAR "," FMT_UCHAR "," FMT_UCHAR, color, color + 1, color + 2) != 3)
+   if (sscanf(str, "%hhu,%hhu,%hhu", color, color + 1, color + 2) != 3)
      {
         fprintf(stderr, "ERROR: incorrect color value '%s'\n", str);
         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@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PYTHON = @PYTHON@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
 PYTHON_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 @@
 MAINTAINERCLEANFILES = Makefile.in
 
+EDJE_CC = @edje_cc@
+EDJE_CC_FLAGS_VERBOSE_0 =
+EDJE_CC_FLAGS_VERBOSE_1 = -v
+EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_$(V)) -id $(srcdir) -fd $(srcdir)
+
 examplesdir = $(datadir)/$(PACKAGE)/examples
 
 if ENABLE_MULTISENSE
@@ -24,7 +29,8 @@ EDCS = \
         $(MULTISENSE_EDC_FILE)
 
 .edc.edj:
-        $(edje_cc) -v -fd $(srcdir) -id $(srcdir) $(SND_DIR) $< $(builddir)/$(@F)
+        $(EDJE_CC) $(EDJE_CC_FLAGS) $(SND_DIR) $< $(builddir)/$(@F)
+
 
 EDJS = $(EDCS:%.edc=%.edj)
 
@@ -53,31 +59,33 @@ EXTRA_DIST = $(files_DATA)
 if BUILD_EXAMPLES
 
 AM_CPPFLAGS = \
-        -I. \
-        -I$(top_srcdir)/src/lib \
-        -I$(top_srcdir)/src/lib/include \
-        -DPACKAGE_BIN_DIR=\"$(bindir)\" \
-        -DPACKAGE_LIB_DIR=\"$(libdir)\" \
-        -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-        -DPACKAGE_EXAMPLES_DIR=\"$(datadir)/$(PACKAGE)/examples\" \
-        @EDJE_CFLAGS@
+-I. \
+-I$(top_srcdir)/src/lib \
+-I$(top_srcdir)/src/lib/include \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
+@EDJE_CFLAGS@
 
 files_DATA += $(EDJS)
 
 examples_PROGRAMS = \
+        edje-animations \
         edje-basic \
-        edje-swallow \
-        edje-text \
-        edje-table \
         edje-box \
         edje-box2 \
-        edje-drag\
-        edje-signals-messages \
         edje-color-class \
+        edje-drag\
         edje-perspective \
-        edje-animations \
+        edje-signals-messages \
+        edje-swallow \
+        edje-table \
+        edje-text \
         sigtest
 
 LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_LIBS@
 
 endif
+
+clean-local:
+        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 = :
 build_triplet = @build@
 host_triplet = @host@
 @BUILD_EXAMPLES_TRUE@am__append_1 = $(EDJS)
-@BUILD_EXAMPLES_TRUE@examples_PROGRAMS = edje-basic$(EXEEXT) \
-@BUILD_EXAMPLES_TRUE@   edje-swallow$(EXEEXT) edje-text$(EXEEXT) \
-@BUILD_EXAMPLES_TRUE@   edje-table$(EXEEXT) edje-box$(EXEEXT) \
-@BUILD_EXAMPLES_TRUE@   edje-box2$(EXEEXT) edje-drag$(EXEEXT) \
-@BUILD_EXAMPLES_TRUE@   edje-signals-messages$(EXEEXT) \
+@BUILD_EXAMPLES_TRUE@examples_PROGRAMS = edje-animations$(EXEEXT) \
+@BUILD_EXAMPLES_TRUE@   edje-basic$(EXEEXT) edje-box$(EXEEXT) \
+@BUILD_EXAMPLES_TRUE@   edje-box2$(EXEEXT) \
 @BUILD_EXAMPLES_TRUE@   edje-color-class$(EXEEXT) \
+@BUILD_EXAMPLES_TRUE@   edje-drag$(EXEEXT) \
 @BUILD_EXAMPLES_TRUE@   edje-perspective$(EXEEXT) \
-@BUILD_EXAMPLES_TRUE@   edje-animations$(EXEEXT) sigtest$(EXEEXT)
+@BUILD_EXAMPLES_TRUE@   edje-signals-messages$(EXEEXT) \
+@BUILD_EXAMPLES_TRUE@   edje-swallow$(EXEEXT) edje-table$(EXEEXT) \
+@BUILD_EXAMPLES_TRUE@   edje-text$(EXEEXT) sigtest$(EXEEXT)
 subdir = src/examples
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -279,6 +280,8 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PYTHON = @PYTHON@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
@@ -366,6 +369,10 @@ top_srcdir = @top_srcdir@
 version_info = @version_info@
 vimdir = @vimdir@
 MAINTAINERCLEANFILES = Makefile.in
+EDJE_CC = @edje_cc@
+EDJE_CC_FLAGS_VERBOSE_0 = 
+EDJE_CC_FLAGS_VERBOSE_1 = -v
+EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_$(V)) -id $(srcdir) -fd $(srcdir)
 examplesdir = $(datadir)/$(PACKAGE)/examples
 @ENABLE_MULTISENSE_TRUE@MULTISENSE_EDC_FILE = multisense.edc
 @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 \
         edje-perspective.c edje-animations.c sigtest.c $(am__append_1)
 EXTRA_DIST = $(files_DATA)
 @BUILD_EXAMPLES_TRUE@AM_CPPFLAGS = \
-@BUILD_EXAMPLES_TRUE@        -I. \
-@BUILD_EXAMPLES_TRUE@        -I$(top_srcdir)/src/lib \
-@BUILD_EXAMPLES_TRUE@        -I$(top_srcdir)/src/lib/include \
-@BUILD_EXAMPLES_TRUE@        -DPACKAGE_BIN_DIR=\"$(bindir)\" \
-@BUILD_EXAMPLES_TRUE@        -DPACKAGE_LIB_DIR=\"$(libdir)\" \
-@BUILD_EXAMPLES_TRUE@        -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-@BUILD_EXAMPLES_TRUE@        -DPACKAGE_EXAMPLES_DIR=\"$(datadir)/$(PACKAGE)/examples\" \
-@BUILD_EXAMPLES_TRUE@        @EDJE_CFLAGS@
+@BUILD_EXAMPLES_TRUE@-I. \
+@BUILD_EXAMPLES_TRUE@-I$(top_srcdir)/src/lib \
+@BUILD_EXAMPLES_TRUE@-I$(top_srcdir)/src/lib/include \
+@BUILD_EXAMPLES_TRUE@-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+@BUILD_EXAMPLES_TRUE@-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+@BUILD_EXAMPLES_TRUE@-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
+@BUILD_EXAMPLES_TRUE@@EDJE_CFLAGS@
 
 @BUILD_EXAMPLES_TRUE@LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_LIBS@
 all: all-am
@@ -705,7 +711,7 @@ maintainer-clean-generic:
 clean: clean-am
 
 clean-am: clean-examplesPROGRAMS clean-generic clean-libtool \
-        mostlyclean-am
+        clean-local mostlyclean-am
 
 distclean: distclean-am
         -rm -rf ./$(DEPDIR)
@@ -776,8 +782,8 @@ uninstall-am: uninstall-examplesPROGRAMS uninstall-filesDATA
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean \
-        clean-examplesPROGRAMS clean-generic clean-libtool ctags \
-        distclean distclean-compile distclean-generic \
+        clean-examplesPROGRAMS clean-generic clean-libtool clean-local \
+        ctags distclean distclean-compile distclean-generic \
         distclean-libtool distclean-tags distdir dvi dvi-am html \
         html-am info info-am install install-am install-data \
         install-data-am install-dvi install-dvi-am \
@@ -793,7 +799,10 @@ uninstall-am: uninstall-examplesPROGRAMS uninstall-filesDATA
 
 
 .edc.edj:
-        $(edje_cc) -v -fd $(srcdir) -id $(srcdir) $(SND_DIR) $< $(builddir)/$(@F)
+        $(EDJE_CC) $(EDJE_CC_FLAGS) $(SND_DIR) $< $(builddir)/$(@F)
+
+clean-local:
+        rm -f *.edj
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # 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 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #else
-#define PACKAGE_EXAMPLES_DIR "."
-#define __UNUSED__
+# define __UNUSED__
 #endif
 
 #include <Ecore.h>
@@ -23,34 +22,59 @@
 #define WIDTH  (400)
 #define HEIGHT (300)
 
-static const char *edje_file_path = PACKAGE_EXAMPLES_DIR "/animations.edj";
-static Ecore_Evas *ee;
-static Evas_Object *bg, *edje_obj;
-static double frametime = 1.0/30.0; /* default value */
+static const char commands[] = \
+  "commands are:\n"
+  "\t+ - increase frametime\n"
+  "\t- - decrease frametime\n"
+  "\t= - status of the animation\n"
+  "\ts - pause\n"
+  "\tp - play\n"
+  "\tf - freeze one object\n"
+  "\tF - freeze all objects\n"
+  "\tt - thaw one object\n"
+  "\tT - thaw all objects\n"
+  "\ta - start animation of one object\n"
+  "\tA - stop animation of one object\n"
+  "\tEsc - exit\n"
+  "\th - print help\n";
+
+static double frametime = 1.0 / 30.0; /* default value */
 
 static void
-_on_delete_cb(Ecore_Evas *ee)
+_on_delete_cb(Ecore_Evas *ee __UNUSED__)
 {
     ecore_main_loop_quit();
 }
 
 static void
-_canvas_resize_cb(Ecore_Evas *ee)
+_on_canvas_resize(Ecore_Evas *ee)
 {
-    int w, h;
-
-    ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
-    evas_object_resize(bg, w, h);
-    evas_object_resize(edje_obj, w, h);
+   Evas_Object *bg;
+   Evas_Object *edje_obj;
+   int          w;
+   int          h;
+
+   bg = ecore_evas_data_get(ee, "background");
+   edje_obj = ecore_evas_data_get(ee, "edje_obj");
+   ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
+   evas_object_resize(bg, w, h);
+   evas_object_resize(edje_obj, w, h);
 }
 
 static void
-_on_key_down_cb(void *data, Evas *evas, Evas_Object *obj, void *event_info)
+_on_key_down(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj, void *event_info)
 {
-   Evas_Event_Key_Down *ev = event_info;
-   double ft;
+   Evas_Event_Key_Down *ev;
+   double               ft;
+
+   ev = (Evas_Event_Key_Down *)event_info;
 
-   if (!strcmp(ev->key, "plus"))
+   if (!strcmp(ev->keyname, "h"))
+     {
+        fprintf(stdout, commands);
+        return;
+     }
+   else if (!strcmp(ev->key, "plus"))
      {
         frametime *= 2.0;
         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)
         edje_object_animation_set(obj, EINA_FALSE);
         fprintf(stdout, "Stopping the animation in the Edje object\n");
      }
+   else if (!strcmp(ev->keyname, "Escape"))
+     ecore_main_loop_quit();
+   else
+     {
+        printf("unhandled key: %s\n", ev->keyname);
+        fprintf(stdout, commands);
+     }
 }
 
 int
-main(int argc, char *argv[])
+main(int argc __UNUSED__, char *argv[])
 {
-   Evas *evas;
-
-   ecore_evas_init();
-   edje_init();
+   char         edje_file_path[PATH_MAX];
+   const char  *edje_file = "animations.edj";
+   Ecore_Evas  *ee;
+   Evas        *evas;
+   Evas_Object *bg;
+   Evas_Object *edje_obj;
+   Eina_Prefix *pfx;
+
+   if (!ecore_evas_init())
+     return EXIT_FAILURE;
+
+   if (!edje_init())
+     goto shutdown_ecore_evas;
+
+   pfx = eina_prefix_new(argv[0], main,
+                         "EDJE_EXAMPLES",
+                         "edje/examples",
+                         edje_file,
+                         PACKAGE_BIN_DIR,
+                         PACKAGE_LIB_DIR,
+                         PACKAGE_DATA_DIR,
+                         PACKAGE_DATA_DIR);
+   if (!pfx)
+     goto shutdown_edje;
 
    /* this will give you a window with an Evas canvas under the first
     * engine available */
    ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
+   if (!ee)
+     goto free_prefix;
 
    ecore_evas_callback_delete_request_set(ee, _on_delete_cb);
-   ecore_evas_callback_resize_set(ee, _canvas_resize_cb);
+   ecore_evas_callback_resize_set(ee, _on_canvas_resize);
    ecore_evas_title_set(ee, "Edje Animations Example");
-   ecore_evas_show(ee);
 
    evas = ecore_evas_get(ee);
 
@@ -135,22 +187,41 @@ main(int argc, char *argv[])
    evas_object_move(bg, 0, 0); /* at canvas' origin */
    evas_object_resize(bg, WIDTH, HEIGHT); /* covers full canvas */
    evas_object_show(bg);
+   ecore_evas_data_set(ee, "background", bg);
 
    edje_obj = edje_object_add(evas);
 
+   snprintf(edje_file_path, sizeof(edje_file_path),
+            "%s/examples/%s", eina_prefix_data_get(pfx), edje_file);
    edje_object_file_set(edje_obj, edje_file_path, "animations_group");
    evas_object_move(edje_obj, 0, 0);
    evas_object_resize(edje_obj, WIDTH, HEIGHT);
    evas_object_show(edje_obj);
+   ecore_evas_data_set(ee, "edje_obj", edje_obj);
 
    evas_object_event_callback_add(edje_obj, EVAS_CALLBACK_KEY_DOWN,
-                                  _on_key_down_cb, NULL);
+                                  _on_key_down, NULL);
    evas_object_focus_set(edje_obj, EINA_TRUE);
 
+   fprintf(stdout, commands);
+
+   ecore_evas_show(ee);
+
    ecore_main_loop_begin();
 
+   eina_prefix_free(pfx);
    ecore_evas_free(ee);
    ecore_evas_shutdown();
    edje_shutdown();
-   return 0;
+
+   return EXIT_SUCCESS;
+
+ free_prefix:
+   eina_prefix_free(pfx);
+ shutdown_edje:
+   edje_shutdown();
+ shutdown_ecore_evas:
+   ecore_evas_shutdown();
+
+   return EXIT_FAILURE;
 }
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 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #else
-#define PACKAGE_EXAMPLES_DIR "."
-#define __UNUSED__
+# define __UNUSED__
 #endif
 
+#include <stdio.h>
+
+#include <Eina.h>
 #include <Ecore.h>
 #include <Ecore_Evas.h>
 #include <Edje.h>
-#include <stdio.h>
 
 #define WIDTH  (300)
 #define HEIGHT (300)
 
-static const char *border_img_path = PACKAGE_EXAMPLES_DIR "/red.png";
-static const char *edje_file_path = PACKAGE_EXAMPLES_DIR "/basic.edj";
-
-static Ecore_Evas *ee;
-static Evas_Object *edje_obj;
-
 static const char commands[] = \
   "commands are:\n"
   "\ts - change Edje's global scaling factor\n"
   "\tr - change center rectangle's scaling factor\n"
+  "\tEsc - exit\n"
   "\th - print help\n";
 
 static void
-_on_keydown(void        *data __UNUSED__,
+_on_keydown(void        *data,
             Evas        *evas __UNUSED__,
             Evas_Object *o __UNUSED__,
             void        *einfo)
 {
-   Evas_Event_Key_Down *ev = einfo;
+   Evas_Event_Key_Down *ev;
+   Evas_Object         *edje_obj;
+
+   ev = (Evas_Event_Key_Down *)einfo;
+   edje_obj = (Evas_Object *)data;
 
    if (strcmp(ev->keyname, "h") == 0) /* print help */
      {
         fprintf(stdout, commands);
         return;
      }
-
-   if (strcmp(ev->keyname, "s") == 0) /* global scaling factor */
+   else if (strcmp(ev->keyname, "s") == 0) /* global scaling factor */
      {
         double scale = edje_scale_get();
 
@@ -66,8 +65,7 @@ _on_keydown(void        *data __UNUSED__,
 
         return;
      }
-
-   if (strcmp(ev->keyname, "r") == 0) /* individual scaling factor */
+   else if (strcmp(ev->keyname, "r") == 0) /* individual scaling factor */
      {
         double scale = edje_object_scale_get(edje_obj);
 
@@ -84,6 +82,13 @@ _on_keydown(void        *data __UNUSED__,
 
         return;
      }
+   else if (!strcmp(ev->keyname, "Escape"))
+     ecore_main_loop_quit();
+   else
+     {
+        printf("unhandled key: %s\n", ev->keyname);
+        fprintf(stdout, commands);
+     }
 }
 
 static void
@@ -93,27 +98,47 @@ _on_delete(Ecore_Evas *ee __UNUSED__)
 }
 
 int
-main(void)
+main(int argc __UNUSED__, char *argv[])
 {
-   Evas_Object *border, *bg;
-   int x, y, w, h;
-   Evas *evas;
+   char         border_img_path[PATH_MAX];
+   char         edje_file_path[PATH_MAX];
+   const char  *edje_file = "basic.edj";
+   Ecore_Evas  *ee;
+   Evas        *evas;
+   Evas_Object *bg;
+   Evas_Object *border;
+   Evas_Object *edje_obj;
+   Eina_Prefix *pfx;
+   int          x;
+   int          y;
+   int          w;
+   int          h;
 
    if (!ecore_evas_init())
      return EXIT_FAILURE;
 
    if (!edje_init())
-     return EXIT_FAILURE;
+     goto shutdown_ecore_evas;
+
+   pfx = eina_prefix_new(argv[0], main,
+                         "EDJE_EXAMPLES",
+                         "edje/examples",
+                         edje_file,
+                         PACKAGE_BIN_DIR,
+                         PACKAGE_LIB_DIR,
+                         PACKAGE_DATA_DIR,
+                         PACKAGE_DATA_DIR);
+   if (!pfx)
+     goto shutdown_edje;
 
    /* this will give you a window with an Evas canvas under the first
     * engine available */
    ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
    if (!ee)
-     goto error;
+     goto free_prefix;
 
    ecore_evas_callback_delete_request_set(ee, _on_delete);
    ecore_evas_title_set(ee, "Edje Basics Example");
-   ecore_evas_show(ee);
 
    evas = ecore_evas_get(ee);
 
@@ -125,11 +150,12 @@ main(void)
    ecore_evas_object_associate(ee, bg, ECORE_EVAS_OBJECT_ASSOCIATE_BASE);
 
    evas_object_focus_set(bg, EINA_TRUE);
-   evas_object_event_callback_add(
-       bg, EVAS_CALLBACK_KEY_DOWN, _on_keydown, NULL);
 
    edje_obj = edje_object_add(evas);
 
+   snprintf(edje_file_path, sizeof(edje_file_path),
+            "%s/examples/%s", eina_prefix_data_get(pfx), edje_file);
+   printf("%s\n", edje_file_path);
    /* exercising Edje loading error, on purpose */
    if (!edje_object_file_set(edje_obj, edje_file_path, "unexistant_group"))
      {
@@ -147,7 +173,7 @@ main(void)
                 errmsg);
 
         evas_object_del(edje_obj);
-        goto error_edj;
+        goto free_prefix;
      }
 
    fprintf(stdout, "Loaded Edje object bound to group 'example_group' from"
@@ -157,6 +183,11 @@ main(void)
    evas_object_resize(edje_obj, WIDTH - 40, HEIGHT - 40);
    evas_object_show(edje_obj);
 
+   evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_keydown, edje_obj);
+
+   snprintf(border_img_path, sizeof(border_img_path),
+            "%s/edje/examples/red.png", eina_prefix_data_get(pfx));
+
    /* this is a border around the Edje object above, here just to
     * emphasize its geometry */
    border = evas_object_image_filled_add(evas);
@@ -203,24 +234,24 @@ main(void)
                    "y = %d, w = %d, h = %d\n", x, y, w, h);
 
    fprintf(stdout, commands);
+
+   ecore_evas_show(ee);
+
    ecore_main_loop_begin();
 
+   eina_prefix_free(pfx);
    ecore_evas_free(ee);
    ecore_evas_shutdown();
    edje_shutdown();
-   return 0;
 
-error:
-   fprintf(stderr, "You got to have at least one evas engine built"
-                   " and linked up to ecore-evas for this example to run"
-                   " properly.\n");
-   ecore_evas_shutdown();
-   return -1;
-
-error_edj:
-   fprintf(stderr, "Failed to load basic.edj!\n");
+   return EXIT_SUCCESS;
 
+ free_prefix:
+   eina_prefix_free(pfx);
+ shutdown_edje:
+   edje_shutdown();
+ shutdown_ecore_evas:
    ecore_evas_shutdown();
-   return -2;
-}
 
+   return EXIT_FAILURE;
+}
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 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #else
-#define PACKAGE_EXAMPLES_DIR "."
-#define __UNUSED__
+# define __UNUSED__
 #endif
 
 #include <Ecore.h>
@@ -28,13 +27,13 @@
 
 #define NRECTS 20
 
-static const char *edje_file_path = PACKAGE_EXAMPLES_DIR "/box.edj";
-
-struct _App {
-    Ecore_Evas *ee;
-    Evas_Object *edje;
-    Evas_Object *bg;
-};
+static const char commands[] = \
+  "commands are:\n"
+  "\ti - prepend rectangle\n"
+  "\ta - append rectangle\n"
+  "\tc - remove\n"
+  "\tEsc - exit\n"
+  "\th - print help\n";
 
 static void
 _on_destroy(Ecore_Evas *ee __UNUSED__)
@@ -45,32 +44,41 @@ _on_destroy(Ecore_Evas *ee __UNUSED__)
 /* here just to keep our example's window size and background image's
  * size in synchrony */
 static void
-_canvas_resize_cb(Ecore_Evas *ee)
+_on_canvas_resize(Ecore_Evas *ee)
 {
-   int w, h;
-   struct _App *app = ecore_evas_data_get(ee, "app");
+   Evas_Object *bg;
+   Evas_Object *edje_obj;
+   int          w;
+   int          h;
 
+   bg = ecore_evas_data_get(ee, "background");
+   edje_obj = ecore_evas_data_get(ee, "edje_obj");
    ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
-   evas_object_resize(app->bg, w, h);
-   evas_object_resize(app->edje, w, h);
+   evas_object_resize(bg, w, h);
+   evas_object_resize(edje_obj, w, h);
 }
 
 static void
-_rect_mouse_down(void *data, Evas *e, Evas_Object *o, void *event_info)
+_on_rect_mouse_down(void *data, Evas *e, Evas_Object *o, void *event_info)
 {
-   struct _App *app = data;
-   Evas_Event_Mouse_Down *ev = event_info;
+   Ecore_Evas            *ee;
+   Evas_Event_Mouse_Down *ev;
+   Evas_Object           *edje_obj;
+
+   ee = (Ecore_Evas *)data;
+   ev = (Evas_Event_Mouse_Down *)event_info;
+   edje_obj = ecore_evas_data_get(ee, "edje_obj");
 
    if (ev->button == 1)
      {
         printf("Removing rect %p under the mouse pointer.\n", o);
-        edje_object_part_box_remove(app->edje, "example/box", o);
+        edje_object_part_box_remove(edje_obj, "example/box", o);
         evas_object_del(o);
      }
    else if (ev->button == 3)
      {
         Evas_Object *rect;
-        Eina_Bool r;
+        Eina_Bool    r;
 
         rect = evas_object_rectangle_add(e);
         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)
         evas_object_show(rect);
 
         printf("Inserting rect %p before the rectangle under the mouse pointer.\n", rect);
-        r = edje_object_part_box_insert_before(app->edje, "example/box", rect, o);
+        r = edje_object_part_box_insert_before(edje_obj, "example/box", rect, o);
         if (!r)
           printf("An error ocurred when appending rect %p to the box.\n", rect);
 
-        evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _rect_mouse_down, app);
+        evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _on_rect_mouse_down, NULL);
      }
 }
 
 static void
-_bg_key_down(void *data, Evas *e, Evas_Object *o __UNUSED__, void *event_info)
+_on_bg_key_down(void *data, Evas *e, Evas_Object *o __UNUSED__, void *event_info)
 {
-   struct _App *app = data;
-   Evas_Event_Key_Down *ev = event_info;
-   Evas_Object *rect;
-   Eina_Bool r;
+   Ecore_Evas          *ee;
+   Evas_Event_Key_Down *ev;
+   Evas_Object         *edje_obj;
+   Evas_Object         *rect;
+   Eina_Bool            r;
 
+   ee = (Ecore_Evas *)data;
+   ev = (Evas_Event_Key_Down *)event_info;
+   edje_obj = ecore_evas_data_get(ee, "edje_obj");
 
+   if (!strcmp(ev->keyname, "h"))
+     {
+        fprintf(stdout, commands);
+        return;
+     }
    if (!strcmp(ev->keyname, "i"))
      {
         rect = evas_object_rectangle_add(e);
@@ -103,11 +120,11 @@ _bg_key_down(void *data, Evas *e, Evas_Object *o __UNUSED__, void *event_info)
         evas_object_show(rect);
 
         printf("Inserting rect %p before the rectangle under the mouse pointer.\n", rect);
-        r = edje_object_part_box_insert_at(app->edje, "example/box", rect, 0);
+        r = edje_object_part_box_insert_at(edje_obj, "example/box", rect, 0);
         if (!r)
           printf("An error ocurred when appending rect %p to the box.\n", rect);
 
-        evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _rect_mouse_down, app);
+        evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _on_rect_mouse_down, NULL);
      }
    else if (!strcmp(ev->keyname, "a"))
      {
@@ -117,53 +134,82 @@ _bg_key_down(void *data, Evas *e, Evas_Object *o __UNUSED__, void *event_info)
         evas_object_show(rect);
 
         printf("Inserting rect %p before the rectangle under the mouse pointer.\n", rect);
-        r = edje_object_part_box_append(app->edje, "example/box", rect);
+        r = edje_object_part_box_append(edje_obj, "example/box", rect);
         if (!r)
           printf("An error ocurred when appending rect %p to the box.\n", rect);
 
-        evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _rect_mouse_down, app);
+        evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _on_rect_mouse_down, NULL);
      }
    else if (!strcmp(ev->keyname, "c"))
-     edje_object_part_box_remove_all(app->edje, "example/box", EINA_TRUE);
+     edje_object_part_box_remove_all(edje_obj, "example/box", EINA_TRUE);
+   else if (!strcmp(ev->keyname, "Escape"))
+     ecore_main_loop_quit();
+   else
+     {
+        printf("unhandled key: %s\n", ev->keyname);
+        fprintf(stdout, commands);
+     }
 }
 
 int
-main(void)
+main(int argc __UNUSED__, char *argv[])
 {
-   Evas *evas;
-   struct _App app;
-   int i;
-
-   ecore_evas_init();
-   edje_init();
+   char         edje_file_path[PATH_MAX];
+   const char  *edje_file = "box.edj";
+   Ecore_Evas  *ee;
+   Evas        *evas;
+   Evas_Object *bg;
+   Evas_Object *edje_obj;
+   Eina_Prefix *pfx;
+   int          i;
+
+   if (!ecore_evas_init())
+     return EXIT_FAILURE;
+
+   if (!edje_init())
+     goto shutdown_ecore_evas;
+
+   pfx = eina_prefix_new(argv[0], main,
+                         "EDJE_EXAMPLES",
+                         "edje/examples",
+                         edje_file,
+                         PACKAGE_BIN_DIR,
+                         PACKAGE_LIB_DIR,
+                         PACKAGE_DATA_DIR,
+                         PACKAGE_DATA_DIR);
+   if (!pfx)
+     goto shutdown_edje;
 
    /* this will give you a window with an Evas canvas under the first
     * engine available */
-   app.ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
-
-   ecore_evas_callback_destroy_set(app.ee, _on_destroy);
-   ecore_evas_callback_resize_set(app.ee, _canvas_resize_cb);
-   ecore_evas_title_set(app.ee, "Edje Box Example");
-   ecore_evas_show(app.ee);
+   ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
+   if (!ee)
+     goto free_prefix;
 
-   ecore_evas_data_set(app.ee, "app", &app);
+   ecore_evas_callback_destroy_set(ee, _on_destroy);
+   ecore_evas_callback_resize_set(ee, _on_canvas_resize);
+   ecore_evas_title_set(ee, "Edje Box Example");
 
-   evas = ecore_evas_get(app.ee);
+   evas = ecore_evas_get(ee);
 
-   app.bg = evas_object_rectangle_add(evas);
-   evas_object_color_set(app.bg, 255, 255, 255, 255);
-   evas_object_resize(app.bg, WIDTH, HEIGHT);
-   evas_object_focus_set(app.bg, EINA_TRUE);
-   evas_object_show(app.bg);
+   bg = evas_object_rectangle_add(evas);
+   evas_object_color_set(bg, 255, 255, 255, 255);
+   evas_object_resize(bg, WIDTH, HEIGHT);
+   evas_object_focus_set(bg, EINA_TRUE);
+   evas_object_show(bg);
+   ecore_evas_data_set(ee, "background", bg);
 
-   evas_object_event_callback_add(app.bg, EVAS_CALLBACK_KEY_DOWN, _bg_key_down, &app);
+   evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_bg_key_down, ee);
 
-   app.edje = edje_object_add(evas);
+   edje_obj = edje_object_add(evas);
 
-   edje_object_file_set(app.edje, edje_file_path, "example/group");
-   evas_object_move(app.edje, 0, 0);
-   evas_object_resize(app.edje, WIDTH, HEIGHT);
-   evas_object_show(app.edje);
+   snprintf(edje_file_path, sizeof(edje_file_path),
+            "%s/examples/%s", eina_prefix_data_get(pfx), edje_file);
+   edje_object_file_set(edje_obj, edje_file_path, "example/group");
+   evas_object_move(edje_obj, 0, 0);
+   evas_object_resize(edje_obj, WIDTH, HEIGHT);
+   evas_object_show(edje_obj);
+   ecore_evas_data_set(ee, "edje_obj", edje_obj);
 
    for (i = 0; i < NRECTS; i++)
      {
@@ -173,19 +219,34 @@ main(void)
         rect = evas_object_rectangle_add(evas);
         evas_object_color_set(rect, red, 0, 0, 255);
         evas_object_resize(rect, RECTW, RECTH);
-        r = edje_object_part_box_append(app.edje, "example/box", rect);
+        r = edje_object_part_box_append(edje_obj, "example/box", rect);
         if (!r)
           printf("An error ocurred when appending rect #%d to the box.\n", i);
         evas_object_show(rect);
 
         evas_object_event_callback_add(
-           rect, EVAS_CALLBACK_MOUSE_DOWN, _rect_mouse_down, &app);
+           rect, EVAS_CALLBACK_MOUSE_DOWN, _on_rect_mouse_down, ee);
      }
 
+   fprintf(stdout, commands);
+
+   ecore_evas_show(ee);
+
    ecore_main_loop_begin();
 
-   ecore_evas_free(app.ee);
+   eina_prefix_free(pfx);
+   ecore_evas_free(ee);
    ecore_evas_shutdown();
    edje_shutdown();
-   return 0;
+
+   return EXIT_SUCCESS;
+
+ free_prefix:
+   eina_prefix_free(pfx);
+ shutdown_edje:
+   edje_shutdown();
+ shutdown_ecore_evas:
+   ecore_evas_shutdown();
+
+   return EXIT_FAILURE;
 }
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 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #else
-#define PACKAGE_EXAMPLES_DIR "."
-#define __UNUSED__
+# define __UNUSED__
 #endif
 
-#include <Ecore.h>
-#include <Evas.h>
-#include <Ecore_Evas.h>
-#include <Edje.h>
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
-static const char *edje_file_path = PACKAGE_EXAMPLES_DIR "/box.edj";
-
-struct _App {
-   Ecore_Evas *ee;
-   Evas *evas;
-   Evas_Object *bg;
-   Evas_Object *box;
-};
+#include <Ecore.h>
+#include <Evas.h>
+#include <Ecore_Evas.h>
+#include <Edje.h>
 
-static struct _App app;
+static const char commands[] = \
+  "commands are:\n"
+  "\tShift - remove box\n"
+  "\tCtrl - insert box\n"
+  "\tEsc - exit\n"
+  "\th - print help\n";
 
 static void
-custom_layout(Evas_Object *o, Evas_Object_Box_Data *p, void *data)
+custom_layout(Evas_Object *o, Evas_Object_Box_Data *p, void *data __UNUSED__)
 {
+   Evas_Object_Box_Option *opt;
+   Eina_List *l;
    int x, y, w, h;
    int xx, yy, ww, hh;
    int count;
-   Eina_List *l;
-   Evas_Object_Box_Option *opt;
 
    evas_object_geometry_get(o, &x, &y, &w, &h);
    count = eina_list_count(p->children);
@@ -76,129 +71,177 @@ new_greenie_block(Evas *e)
 }
 
 static void
-on_keydown(void *data, Evas *evas, Evas_Object *o, void *einfo)
+on_keydown(void *data, Evas *evas, Evas_Object *o __UNUSED__, void *einfo)
 {
-   struct _App *app = data;
-   Evas_Event_Key_Down *ev = einfo;
+   Evas_Event_Key_Down *ev;
+   Evas_Object         *edje_obj;
    const Evas_Modifier *mods;
 
+   ev = (Evas_Event_Key_Down *)einfo;
+   edje_obj = (Evas_Object *)data;
+
    mods = evas_key_modifier_get(evas);
+   if (!strcmp(ev->keyname, "h"))
+     {
+        fprintf(stdout, commands);
+        return;
+     }
    if (evas_key_modifier_is_set(mods, "Shift"))
      {
         int pos;
         Evas_Object *obj = NULL;
         pos = atoi(ev->keyname);
-        obj = edje_object_part_box_remove_at(app->box, "example/box", pos);
+        obj = edje_object_part_box_remove_at(edje_obj, "example/box", pos);
         if (obj)
           evas_object_del(obj);
         return;
      }
    if (evas_key_modifier_is_set(mods, "Control"))
      {
-        Evas_Object *o;
+        Evas_Object *obj;
         int pos;
         pos = atoi(ev->keyname);
-        o = new_greenie_block(app->evas);
-        if (!edje_object_part_box_insert_at(app->box, "example/box", o, pos))
-          edje_object_part_box_append(app->box, "example/box", o);
+        obj = new_greenie_block(evas);
+        if (!edje_object_part_box_insert_at(edje_obj, "example/box", obj, pos))
+          edje_object_part_box_append(edje_obj, "example/box", obj);
         return;
      }
-   if (strcmp(ev->keyname, "Escape") == 0)
+   if (!strcmp(ev->keyname, "Escape"))
      ecore_main_loop_quit();
 }
 
 static Evas_Object *
-box_new(Evas *evas, const char *name, int x, int y, int w, int h)
+box_new(Ecore_Evas *ee, const char *edje_file_path, const char *name, int x, int y, int w, int h)
 {
-   Evas_Object *o;
+   Evas_Object *edje_obj;
 
-   o = edje_object_add(evas);
-   evas_object_move(o, x, y);
-   evas_object_resize(o, w, h);
-   if (!edje_object_file_set(o, edje_file_path, "example/group2"))
+   edje_obj = edje_object_add(ecore_evas_get(ee));
+   evas_object_move(edje_obj, x, y);
+   evas_object_resize(edje_obj, w, h);
+   if (!edje_object_file_set(edje_obj, edje_file_path, "example/group2"))
      {
         printf("error: could not load file object.\n");
      }
-   evas_object_show(o);
-
-   evas_object_name_set(o, name);
+   evas_object_show(edje_obj);
+   evas_object_name_set(edje_obj, name);
+   ecore_evas_data_set(ee, "edje_obj", edje_obj);
 
-   return o;
+   return edje_obj;
 }
 
 static void
 on_resize(Ecore_Evas *ee)
 {
-   int w, h;
-
-   evas_output_viewport_get(app.evas, NULL, NULL, &w, &h);
-   evas_object_resize(app.bg, w, h);
-   evas_object_resize(app.box, w, h);
+   Evas_Object *bg;
+   Evas_Object *edje_obj;
+   int          w;
+   int          h;
+
+   bg = ecore_evas_data_get(ee, "background");
+   edje_obj = ecore_evas_data_get(ee, "edje_obj");
+   ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
+   evas_object_resize(bg, w, h);
+   evas_object_resize(edje_obj, w, h);
 }
 
 static void
-on_destroy(Ecore_Evas *ee)
+on_destroy(Ecore_Evas *ee __UNUSED__)
 {
    ecore_main_loop_quit();
 }
 
 int
-main(int argc, char *argv[])
+main(int argc __UNUSED__, char *argv[])
 {
-   Ecore_Evas *ee;
-   int w, h, i;
+   char         edje_file_path[PATH_MAX];
+   const char  *edje_file = "box.edj";
+   Ecore_Evas  *ee;
+   Evas        *evas;
+   Evas_Object *bg;
+   Evas_Object *edje_obj;
    Evas_Object *last;
    Evas_Object *o;
-
-   evas_init();
-   ecore_init();
-   ecore_evas_init();
-   edje_init();
-
+   Eina_Prefix *pfx;
+   int          w;
+   int          h;
+   int          i;
+
+   if (!ecore_evas_init())
+     return EXIT_FAILURE;
+
+   if (!edje_init())
+     goto shutdown_ecore_evas;
+
+   pfx = eina_prefix_new(argv[0], main,
+                         "EDJE_EXAMPLES",
+                         "edje/examples",
+                         edje_file,
+                         PACKAGE_BIN_DIR,
+                         PACKAGE_LIB_DIR,
+                         PACKAGE_DATA_DIR,
+                         PACKAGE_DATA_DIR);
+   if (!pfx)
+     goto shutdown_edje;
+
+   /* this will give you a window with an Evas canvas under the first
+    * engine available */
    ee = ecore_evas_new(NULL, 0, 0, 640, 480, NULL);
-   ecore_evas_show(ee);
-
-   app.ee = ee;
-   app.evas = ecore_evas_get(ee);
+   if (!ee)
+     goto free_prefix;
 
    ecore_evas_callback_resize_set(ee, on_resize);
    ecore_evas_callback_destroy_set(ee, on_destroy);
+   ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
 
-   evas_output_viewport_get(app.evas, NULL, NULL, &w, &h);
+   evas = ecore_evas_get(ee);
 
-   app.bg = evas_object_rectangle_add(app.evas);
-   evas_object_resize(app.bg, w, h);
-   evas_object_show(app.bg);
-   evas_object_focus_set(app.bg, 1);
-   evas_object_event_callback_add(
-      app.bg, EVAS_CALLBACK_KEY_DOWN, on_keydown, &app);
+   bg = evas_object_rectangle_add(evas);
+   evas_object_resize(bg, w, h);
+   evas_object_show(bg);
+   evas_object_focus_set(bg, 1);
+   ecore_evas_data_set(ee, "background", bg);
 
    edje_box_layout_register("custom_layout", custom_layout, NULL, NULL, NULL, NULL);
 
-   app.box = box_new(app.evas, "box", 0, 0, w, h);
+   snprintf(edje_file_path, sizeof(edje_file_path),
+            "%s/examples/%s", eina_prefix_data_get(pfx), edje_file);
+   edje_obj = box_new(ee, edje_file_path, "box", 0, 0, w, h);
+   evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, on_keydown, edje_obj);
 
    for (i = 1; i <= 5; i++)
      {
-        o = last = evas_object_rectangle_add(app.evas);
+        o = last = evas_object_rectangle_add(evas);
         evas_object_size_hint_min_set(o, 50, 50);
         evas_object_resize(o, 50, 50);
         evas_object_color_set(o, 255, 0, 0, 128);
         evas_object_show(o);
 
-        if (!edje_object_part_box_append(app.box, "example/box", o))
+        if (!edje_object_part_box_append(edje_obj, "example/box", o))
           {
              fprintf(stderr, "error appending child object!\n");
              return 1;
           }
      }
 
+   fprintf(stdout, commands);
+
+   ecore_evas_show(ee);
+
    ecore_main_loop_begin();
 
-   edje_shutdown();
+   eina_prefix_free(pfx);
+   ecore_evas_free(ee);
    ecore_evas_shutdown();
-   ecore_shutdown();
-   evas_shutdown();
+   edje_shutdown();
+
+   return EXIT_SUCCESS;
 
+ free_prefix:
+   eina_prefix_free(pfx);
+ shutdown_edje:
+   edje_shutdown();
+ shutdown_ecore_evas:
+   ecore_evas_shutdown();
 
-   return 0;
+   return EXIT_FAILURE;
 }
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 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #else
-#define PACKAGE_EXAMPLES_DIR "."
-#define __UNUSED__
+# define __UNUSED__
 #endif
 
 #include <Ecore.h>
@@ -23,13 +22,11 @@
 #define WIDTH  (400)
 #define HEIGHT (400)
 
-static const char *edje_file_path = PACKAGE_EXAMPLES_DIR "/color-class.edj";
-
 typedef int color[4];           /* rgba */
 
-static Ecore_Evas *ee, *ee2;
-static Evas *evas, *evas2;
-static Evas_Object *bg, *edje_obj, *bg2, *edje_obj2;
+static Ecore_Evas *ee1, *ee2;
+static Evas *evas1, *evas2;
+static Evas_Object *bg1, *edje_obj1, *bg2, *edje_obj2;
 static const char *selected_class;
 
 static color colors_init_data[] =
@@ -96,21 +93,23 @@ _color_classes_print(void)
 }
 
 static void
-_on_destroy(Ecore_Evas *ee)
+_on_destroy(Ecore_Evas *ee __UNUSED__)
 {
    ecore_main_loop_quit();
 }
 
 static void
-_on_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info)
+_on_mouse_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Mouse_Down *ev = event_info;
 
    if (ev->button == 1)
-     if (obj == edje_obj)
-       edje_color_class_del(selected_class);
-     else
-       edje_object_color_class_del(edje_obj2, selected_class);
+     {
+        if (obj == edje_obj1)
+          edje_color_class_del(selected_class);
+        else
+          edje_object_color_class_del(edje_obj2, selected_class);
+     }
 }
 
 /* here just to keep our example's window size
@@ -122,10 +121,10 @@ _canvas_resize_cb(Ecore_Evas *_ee)
 
    ecore_evas_geometry_get(_ee, NULL, NULL, &w, &h);
 
-   if (_ee == ee)
+   if (_ee == ee1)
      {
-        evas_object_resize(bg, w, h);
-        evas_object_resize(edje_obj, w, h);
+        evas_object_resize(bg1, w, h);
+        evas_object_resize(edje_obj1, w, h);
      }
    else
      {
@@ -135,8 +134,8 @@ _canvas_resize_cb(Ecore_Evas *_ee)
 }
 
 static void
-_color_class_callback_delete(void *data, Evas *evas, Evas_Object *obj,
-                             const char *emission, void *source)
+_color_class_callback_delete(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
+                             const char *emission, void *source __UNUSED__)
 {
    if (!strcmp(data, "process"))
      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,
      fprintf(stdout, "Color class: %s deleted on object level\n", emission);
 }
 
-static void
-_create_windows(void)
+static int
+_create_windows(const char *edje_file_path)
 {
   /* this will give you a window with an Evas canvas under the first
     * engine available */
-   ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
+   ee1 = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
+   if (!ee1)
+     return 0;
    ee2 = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
+   if (!ee2)
+     return 0;
 
-   ecore_evas_callback_destroy_set(ee, _on_destroy);
-   ecore_evas_callback_resize_set(ee, _canvas_resize_cb);
-   ecore_evas_title_set(ee, "Edje Color Class Example");
-   ecore_evas_show(ee);
+   ecore_evas_callback_destroy_set(ee1, _on_destroy);
+   ecore_evas_callback_resize_set(ee1, _canvas_resize_cb);
+   ecore_evas_title_set(ee1, "Edje Color Class Example");
 
    ecore_evas_callback_destroy_set(ee2, _on_destroy);
    ecore_evas_callback_resize_set(ee2, _canvas_resize_cb);
    ecore_evas_title_set(ee2, "Edje Object Color Class Example");
-   ecore_evas_show(ee2);
 
-   evas = ecore_evas_get(ee);
+   evas1 = ecore_evas_get(ee1);
    evas2 = ecore_evas_get(ee2);
 
-   bg = evas_object_rectangle_add(evas);
-   evas_object_color_set(bg, 255, 255, 255, 255); /* white bg */
-   evas_object_move(bg, 0, 0);                    /* at canvas' origin */
-   evas_object_resize(bg, WIDTH, HEIGHT);         /* covers full canvas */
-   evas_object_show(bg);
+   bg1 = evas_object_rectangle_add(evas1);
+   evas_object_color_set(bg1, 255, 255, 255, 255); /* white bg */
+   evas_object_move(bg1, 0, 0);                    /* at canvas' origin */
+   evas_object_resize(bg1, WIDTH, HEIGHT);         /* covers full canvas */
+   evas_object_show(bg1);
 
    bg2 = evas_object_rectangle_add(evas2);
    evas_object_color_set(bg2, 255, 255, 255, 255); /* white bg */
@@ -177,18 +178,18 @@ _create_windows(void)
    evas_object_resize(bg2, WIDTH, HEIGHT);         /* covers full canvas */
    evas_object_show(bg2);
 
-   edje_obj = edje_object_add(evas);
-   evas_object_event_callback_add(edje_obj, EVAS_CALLBACK_MOUSE_DOWN,
+   edje_obj1 = edje_object_add(evas1);
+   evas_object_event_callback_add(edje_obj1, EVAS_CALLBACK_MOUSE_DOWN,
                                   _on_mouse_down, NULL);
 
-   edje_object_file_set(edje_obj, edje_file_path, "example_color_class");
-   evas_object_move(edje_obj, 0, 0); /* at canvas' origin */
-   evas_object_resize(edje_obj, WIDTH, HEIGHT);
-   edje_object_part_text_set(edje_obj, "part_four", "EDJE EXAMPLE");
-   edje_object_signal_callback_add(edje_obj, "color_class,del", "*",
+   edje_object_file_set(edje_obj1, edje_file_path, "example_color_class");
+   evas_object_move(edje_obj1, 0, 0); /* at canvas' origin */
+   evas_object_resize(edje_obj1, WIDTH, HEIGHT);
+   edje_object_part_text_set(edje_obj1, "part_four", "EDJE EXAMPLE");
+   edje_object_signal_callback_add(edje_obj1, "color_class,del", "*",
                                    (Edje_Signal_Cb) _color_class_callback_delete,
                                    "process");
-   evas_object_show(edje_obj);
+   evas_object_show(edje_obj1);
 
    edje_obj2 = edje_object_add(evas2);
    evas_object_event_callback_add(edje_obj2, EVAS_CALLBACK_MOUSE_DOWN,
@@ -202,13 +203,18 @@ _create_windows(void)
                                    (Edje_Signal_Cb) _color_class_callback_delete,
                                    "object");
    evas_object_show(edje_obj2);
+
+   return 1;
 }
 
 int
 main(int argc, char *argv[])
 {
-   color c1, c2, c3;
-   int i;
+   char         edje_file_path[PATH_MAX];
+   const char  *edje_file = "color-class.edj";
+   Eina_Prefix *pfx;
+   color        c1, c2, c3;
+   int          i;
 
    if (argc != 5)
      {
@@ -218,7 +224,7 @@ main(int argc, char *argv[])
         for (i = 0; i < 8; i++)
           fprintf(stderr, "%s\n", color_names[i]);
 
-        return 1;
+        return EXIT_FAILURE;
      }
 
    selected_class = argv[1];
@@ -227,13 +233,30 @@ main(int argc, char *argv[])
          _get_color_from_name(argv[4], &c3)))
      {
         fprintf(stderr, "Color not available!\n");
-        return 2;
+        return EXIT_FAILURE;
      }
 
-   ecore_evas_init();
-   edje_init();
+   if (!ecore_evas_init())
+     return EXIT_FAILURE;
+
+   if (!edje_init())
+     goto shutdown_ecore_evas;
+
+   pfx = eina_prefix_new(argv[0], main,
+                         "EDJE_EXAMPLES",
+                         "edje/examples",
+                         edje_file,
+                         PACKAGE_BIN_DIR,
+                         PACKAGE_LIB_DIR,
+                         PACKAGE_DATA_DIR,
+                         PACKAGE_DATA_DIR);
+   if (!pfx)
+     goto shutdown_edje;
 
-   _create_windows();
+   snprintf(edje_file_path, sizeof(edje_file_path),
+            "%s/examples/%s", eina_prefix_data_get(pfx), edje_file);
+   if (!_create_windows(edje_file_path))
+     goto free_prefix;
 
    edje_color_class_set(argv[1],                     /* class name   */
                         c1[0], c1[1], c1[2], c1[3],  /* Object color */
@@ -248,10 +271,25 @@ main(int argc, char *argv[])
                                39, 90, 187, 255);  /* Text shadow  */
 
    _color_classes_print();
+
+   ecore_evas_show(ee1);
+   ecore_evas_show(ee2);
+
    ecore_main_loop_begin();
-   ecore_evas_free(ee);
-   ecore_evas_free(ee2);
+
+   eina_prefix_free(pfx);
+   ecore_evas_free(ee1);
    ecore_evas_shutdown();
    edje_shutdown();
-   return 0;
+
+   return EXIT_SUCCESS;
+
+ free_prefix:
+   eina_prefix_free(pfx);
+ shutdown_edje:
+   edje_shutdown();
+ shutdown_ecore_evas:
+   ecore_evas_shutdown();
+
+   return EXIT_FAILURE;
 }
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 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #else
-#define PACKAGE_EXAMPLES_DIR "."
-#define __UNUSED__
+# define __UNUSED__
 #endif
 
 #include <Ecore.h>
@@ -28,15 +27,17 @@
 
 #define NRECTS 20
 
-static const char *PARTNAME = "example/knob";
-
-static const char *edje_file_path = PACKAGE_EXAMPLES_DIR "/drag.edj";
+static const char commands[] = \
+  "commands are:\n"
+  "\tDdown - set drag step to 1\n"
+  "\tUp - set drag step to -1\n"
+  "\tm - set drag value to 0.5\n"
+  "\tPrior - set drag page to -1\n"
+  "\tNext - set drag page to -1\n"
+  "\tEsc - exit\n"
+  "\th - print help\n";
 
-struct _App {
-    Ecore_Evas *ee;
-    Evas_Object *edje;
-    Evas_Object *bg;
-};
+static const char *PARTNAME = "example/knob";
 
 static void
 _on_destroy(Ecore_Evas *ee __UNUSED__)
@@ -47,111 +48,163 @@ _on_destroy(Ecore_Evas *ee __UNUSED__)
 /* here just to keep our example's window size and background image's
  * size in synchrony */
 static void
-_canvas_resize_cb(Ecore_Evas *ee)
+_on_canvas_resize(Ecore_Evas *ee)
 {
-   int w, h;
-   struct _App *app = ecore_evas_data_get(ee, "app");
+   Evas_Object *bg;
+   Evas_Object *edje_obj;
+   int          w;
+   int          h;
+
+   bg = ecore_evas_data_get(ee, "background");
+   edje_obj = ecore_evas_data_get(ee, "edje_obj");
 
    ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
-   evas_object_resize(app->bg, w, h);
-   evas_object_resize(app->edje, w, h);
+   evas_object_resize(bg, w, h);
+   evas_object_resize(edje_obj, w, h);
 }
 
 static void
-_bg_key_down(void *data, Evas *e, Evas_Object *o __UNUSED__, void *event_info)
+_on_bg_key_down(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event_info)
 {
-   struct _App *app = data;
-   Evas_Event_Key_Down *ev = event_info;
-   Evas_Object *rect;
-   Eina_Bool r;
+   Ecore_Evas          *ee;
+   Evas_Event_Key_Down *ev;
+   Evas_Object         *edje_obj;
 
+   ee = (Ecore_Evas *)data;
+   ev = (Evas_Event_Key_Down *)event_info;
+   edje_obj = ecore_evas_data_get(ee, "edje_obj");
 
-   if (!strcmp(ev->keyname, "Down"))
+   if (!strcmp(ev->keyname, "h"))
      {
-        edje_object_part_drag_step(app->edje, PARTNAME, 0, 1.0);
+        fprintf(stdout, commands);
+        return;
+     }
+   else if (!strcmp(ev->keyname, "Down"))
+     {
+        edje_object_part_drag_step(edje_obj, PARTNAME, 0, 1.0);
      }
    else if (!strcmp(ev->keyname, "Up"))
      {
-        edje_object_part_drag_step(app->edje, PARTNAME, 0, -1.0);
+        edje_object_part_drag_step(edje_obj, PARTNAME, 0, -1.0);
      }
    else if (!strcmp(ev->keyname, "m"))
      {
-        edje_object_part_drag_value_set(app->edje, PARTNAME, 0.0, 0.5);
+        edje_object_part_drag_value_set(edje_obj, PARTNAME, 0.0, 0.5);
      }
    else if (!strcmp(ev->keyname, "Prior"))
      {
-        edje_object_part_drag_page(app->edje, PARTNAME, 0.0, -1.0);
+        edje_object_part_drag_page(edje_obj, PARTNAME, 0.0, -1.0);
      }
    else if (!strcmp(ev->keyname, "Next"))
      {
-        edje_object_part_drag_page(app->edje, PARTNAME, 0.0, 1.0);
+        edje_object_part_drag_page(edje_obj, PARTNAME, 0.0, 1.0);
      }
    else if (!strcmp(ev->keyname, "Escape"))
      ecore_main_loop_quit();
    else
-     printf("unhandled key: %s\n", ev->keyname);
+     {
+        printf("unhandled key: %s\n", ev->keyname);
+        fprintf(stdout, commands);
+     }
 }
 
 static void
-_knob_moved_cb(void *data, Evas_Object *o, const char *emission, const char *source)
+_on_knob_moved(void *data __UNUSED__, Evas_Object *o, const char *emission __UNUSED__, const char *source __UNUSED__)
 {
    double val;
+
    edje_object_part_drag_value_get(o, PARTNAME, NULL, &val);
    printf("value changed to: %0.3f\n", val);
 }
 
 int
-main(void)
+main(int argc __UNUSED__, char *argv[])
 {
-   Evas *evas;
-   struct _App app;
-   int i;
-
-   ecore_evas_init();
-   edje_init();
+   char         edje_file_path[PATH_MAX];
+   const char  *edje_file = "drag.edj";
+   Ecore_Evas  *ee;
+   Evas        *evas;
+   Evas_Object *bg;
+   Evas_Object *edje_obj;
+   Eina_Prefix *pfx;
+
+   if (!ecore_evas_init())
+     return EXIT_FAILURE;
+
+   if (!edje_init())
+     goto shutdown_ecore_evas;
+
+   pfx = eina_prefix_new(argv[0], main,
+                         "EDJE_EXAMPLES",
+                         "edje/examples",
+                         edje_file,
+                         PACKAGE_BIN_DIR,
+                         PACKAGE_LIB_DIR,
+                         PACKAGE_DATA_DIR,
+                         PACKAGE_DATA_DIR);
+   if (!pfx)
+     goto shutdown_edje;
 
    /* this will give you a window with an Evas canvas under the first
     * engine available */
-   app.ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
-
-   ecore_evas_callback_destroy_set(app.ee, _on_destroy);
-   ecore_evas_callback_resize_set(app.ee, _canvas_resize_cb);
-   ecore_evas_title_set(app.ee, "Edje Box Example");
-   ecore_evas_show(app.ee);
+   ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
+   if (!ee)
+     goto free_prefix;
 
-   ecore_evas_data_set(app.ee, "app", &app);
+   ecore_evas_callback_destroy_set(ee, _on_destroy);
+   ecore_evas_callback_resize_set(ee, _on_canvas_resize);
+   ecore_evas_title_set(ee, "Edje Box Example");
 
-   evas = ecore_evas_get(app.ee);
+   evas = ecore_evas_get(ee);
 
-   app.bg = evas_object_rectangle_add(evas);
-   evas_object_color_set(app.bg, 255, 255, 255, 255);
-   evas_object_resize(app.bg, WIDTH, HEIGHT);
-   evas_object_focus_set(app.bg, EINA_TRUE);
-   evas_object_show(app.bg);
+   bg = evas_object_rectangle_add(evas);
+   evas_object_color_set(bg, 255, 255, 255, 255);
+   evas_object_resize(bg, WIDTH, HEIGHT);
+   evas_object_focus_set(bg, EINA_TRUE);
+   evas_object_show(bg);
+   ecore_evas_data_set(ee, "background", bg);
 
-   evas_object_event_callback_add(app.bg, EVAS_CALLBACK_KEY_DOWN, _bg_key_down, &app);
+   evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_bg_key_down, ee);
 
-   app.edje = edje_object_add(evas);
+   edje_obj = edje_object_add(evas);
 
-   edje_object_file_set(app.edje, edje_file_path, "example/group");
-   evas_object_move(app.edje, 0, 0);
-   evas_object_resize(app.edje, WIDTH, HEIGHT);
-   evas_object_show(app.edje);
+   snprintf(edje_file_path, sizeof(edje_file_path),
+            "%s/examples/%s", eina_prefix_data_get(pfx), edje_file);
+   edje_object_file_set(edje_obj, edje_file_path, "example/group");
+   evas_object_move(edje_obj, 0, 0);
+   evas_object_resize(edje_obj, WIDTH, HEIGHT);
+   evas_object_show(edje_obj);
+   ecore_evas_data_set(ee, "edje_obj", edje_obj);
 
-   edje_object_part_drag_size_set(app.edje, PARTNAME, 1.0, 0.4);
+   edje_object_part_drag_size_set(edje_obj, PARTNAME, 1.0, 0.4);
 
-   if (!edje_object_part_drag_step_set(app.edje, PARTNAME, 0.0, 0.1))
+   if (!edje_object_part_drag_step_set(edje_obj, PARTNAME, 0.0, 0.1))
      printf("error when setting drag step size.\n");
 
-   if (!edje_object_part_drag_page_set(app.edje, PARTNAME, 0.0, 0.3))
+   if (!edje_object_part_drag_page_set(edje_obj, PARTNAME, 0.0, 0.3))
      printf("error when setting drag page step size.\n");
 
-   edje_object_signal_callback_add(app.edje, "drag", PARTNAME, _knob_moved_cb, &app);
+   edje_object_signal_callback_add(edje_obj, "drag", PARTNAME, _on_knob_moved, NULL);
+
+   fprintf(stdout, commands);
+
+   ecore_evas_show(ee);
 
    ecore_main_loop_begin();
 
-   ecore_evas_free(app.ee);
+   eina_prefix_free(pfx);
+   ecore_evas_free(ee);
    ecore_evas_shutdown();
    edje_shutdown();
-   return 0;
+
+   return EXIT_SUCCESS;
+
+ free_prefix:
+   eina_prefix_free(pfx);
+ shutdown_edje:
+   edje_shutdown();
+ shutdown_ecore_evas:
+   ecore_evas_shutdown();
+
+   return EXIT_FAILURE;
 }
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 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #else
-#define PACKAGE_EXAMPLES_DIR "."
-#define __UNUSED__
+# define __UNUSED__
 #endif
 
 #include <Ecore.h>
@@ -23,11 +22,21 @@
 #define WIDTH  480
 #define HEIGHT 320
 
-static const char *edje_file_path = PACKAGE_EXAMPLES_DIR "/perspective.edj";
+static const char commands[] = \
+  "commands are:\n"
+  "\tDown - move part down\n"
+  "\tUp -  move part up\n"
+  "\tLeft - move part left\n"
+  "\tRight - move part right\n"
+  "\tPrior - move part up-left\n"
+  "\tNext - move part down-right\n"
+  "\tInsert - increase focal\n"
+  "\tSuppr - decrease focal\n"
+  "\tEsc - exit\n"
+  "\th - print help\n";
 
 struct _App {
-    Ecore_Evas *ee;
-    Evas_Object *edje;
+    Evas_Object *edje_obj;
     Evas_Object *bg;
     Edje_Perspective *ps;
     Eina_Bool animating;
@@ -44,14 +53,14 @@ _on_destroy(Ecore_Evas *ee __UNUSED__)
 /* here just to keep our example's window size and background image's
  * size in synchrony */
 static void
-_canvas_resize_cb(Ecore_Evas *ee)
+_on_canvas_resize(Ecore_Evas *ee)
 {
    int w, h;
    struct _App *app = ecore_evas_data_get(ee, "app");
 
    ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
    evas_object_resize(app->bg, w, h);
-   evas_object_resize(app->edje, w, h);
+   evas_object_resize(app->edje_obj, w, h);
 }
 
 static void
@@ -74,20 +83,24 @@ _part_move(struct _App *app, int dx, int dy)
      app->y = 0;
 
    snprintf(emission, sizeof(emission), "move,%d,%d", app->x, app->y);
-   edje_object_signal_emit(app->edje, emission, "");
+   edje_object_signal_emit(app->edje_obj, emission, "");
    app->animating = EINA_TRUE;
 }
 
 
 static void
-_bg_key_down(void *data, Evas *e, Evas_Object *o __UNUSED__, void *event_info)
+_on_bg_key_down(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event_info)
 {
    struct _App *app = data;
    Evas_Event_Key_Down *ev = event_info;
 
-
+   if (!strcmp(ev->keyname, "h"))
+     {
+        fprintf(stdout, commands);
+        return;
+     }
    // just moving the part and text
-   if (!strcmp(ev->keyname, "Down"))
+   else if (!strcmp(ev->keyname, "Down"))
      {
         _part_move(app, 0, 1);
      }
@@ -116,7 +129,7 @@ _bg_key_down(void *data, Evas *e, Evas_Object *o __UNUSED__, void *event_info)
      {
         app->focal += 5;
         edje_perspective_set(app->ps, 240, 160, 0, app->focal);
-        edje_object_calc_force(app->edje);
+        edje_object_calc_force(app->edje_obj);
      }
    else if (!strcmp(ev->keyname, "KP_Subtract"))
      {
@@ -125,13 +138,16 @@ _bg_key_down(void *data, Evas *e, Evas_Object *o __UNUSED__, void *event_info)
           app->focal = 5;
 
         edje_perspective_set(app->ps, 240, 160, 0, app->focal);
-        edje_object_calc_force(app->edje);
+        edje_object_calc_force(app->edje_obj);
      }
    // exiting
    else if (!strcmp(ev->keyname, "Escape"))
      ecore_main_loop_quit();
    else
-     printf("unhandled key: %s\n", ev->keyname);
+     {
+        printf("unhandled key: %s\n", ev->keyname);
+        fprintf(stdout, commands);
+     }
 }
 
 static void
@@ -143,16 +159,33 @@ _animation_end_cb(void *data, Evas_Object *o __UNUSED__, const char *emission __
 }
 
 int
-main(void)
+main(int argc __UNUSED__, char *argv[])
 {
-   Evas *evas;
-   struct _App app;
-   int i;
-
-   ecore_evas_init();
-   edje_init();
-
-   edje_frametime_set(((double)1) / 60);
+   char         edje_file_path[PATH_MAX];
+   const char  *edje_file = "perspective.edj";
+   struct _App  app;
+   Ecore_Evas  *ee;
+   Evas        *evas;
+   Eina_Prefix *pfx;
+
+   if (!ecore_evas_init())
+     return EXIT_FAILURE;
+
+   if (!edje_init())
+     goto shutdown_ecore_evas;
+
+   pfx = eina_prefix_new(argv[0], main,
+                         "EDJE_EXAMPLES",
+                         "edje/examples",
+                         edje_file,
+                         PACKAGE_BIN_DIR,
+                         PACKAGE_LIB_DIR,
+                         PACKAGE_DATA_DIR,
+                         PACKAGE_DATA_DIR);
+   if (!pfx)
+     goto shutdown_edje;
+
+   edje_frametime_set(1.0 / 60.0);
 
    /* this will give you a window with an Evas canvas under the first
     * engine available */
@@ -160,16 +193,18 @@ main(void)
    app.x = 0;
    app.y = 0;
    app.focal = 50;
-   app.ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
 
-   ecore_evas_callback_destroy_set(app.ee, _on_destroy);
-   ecore_evas_callback_resize_set(app.ee, _canvas_resize_cb);
-   ecore_evas_title_set(app.ee, "Edje Box Example");
-   ecore_evas_show(app.ee);
+   ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
+   if (!ee)
+     goto free_prefix;
+
+   ecore_evas_callback_destroy_set(ee, _on_destroy);
+   ecore_evas_callback_resize_set(ee, _on_canvas_resize);
+   ecore_evas_title_set(ee, "Edje Box Example");
 
-   ecore_evas_data_set(app.ee, "app", &app);
+   ecore_evas_data_set(ee, "app", &app);
 
-   evas = ecore_evas_get(app.ee);
+   evas = ecore_evas_get(ee);
 
    app.bg = evas_object_rectangle_add(evas);
    evas_object_color_set(app.bg, 255, 255, 255, 255);
@@ -177,25 +212,42 @@ main(void)
    evas_object_focus_set(app.bg, EINA_TRUE);
    evas_object_show(app.bg);
 
-   evas_object_event_callback_add(app.bg, EVAS_CALLBACK_KEY_DOWN, _bg_key_down, &app);
+   evas_object_event_callback_add(app.bg, EVAS_CALLBACK_KEY_DOWN, _on_bg_key_down, &app);
 
-   app.edje = edje_object_add(evas);
+   app.edje_obj = edje_object_add(evas);
 
-   edje_object_file_set(app.edje, edje_file_path, "example/group");
-   evas_object_move(app.edje, 0, 0);
-   evas_object_resize(app.edje, WIDTH, HEIGHT);
-   evas_object_show(app.edje);
+   snprintf(edje_file_path, sizeof(edje_file_path),
+            "%s/examples/%s", eina_prefix_data_get(pfx), edje_file);
+   edje_object_file_set(app.edje_obj, edje_file_path, "example/group");
+   evas_object_move(app.edje_obj, 0, 0);
+   evas_object_resize(app.edje_obj, WIDTH, HEIGHT);
+   evas_object_show(app.edje_obj);
 
-   edje_object_signal_callback_add(app.edje, "animation,end", "", _animation_end_cb, &app);
+   edje_object_signal_callback_add(app.edje_obj, "animation,end", "", _animation_end_cb, &app);
 
    app.ps = edje_perspective_new(evas);
    edje_perspective_set(app.ps, 240, 160, 0, app.focal);
    edje_perspective_global_set(app.ps, EINA_TRUE);
 
+   fprintf(stdout, commands);
+
+   ecore_evas_show(ee);
+
    ecore_main_loop_begin();
 
-   ecore_evas_free(app.ee);
+   eina_prefix_free(pfx);
+   ecore_evas_free(ee);
    ecore_evas_shutdown();
    edje_shutdown();
-   return 0;
+
+   return EXIT_SUCCESS;
+
+ free_prefix:
+   eina_prefix_free(pfx);
+ shutdown_edje:
+   edje_shutdown();
+ shutdown_ecore_evas:
+   ecore_evas_shutdown();
+
+   return EXIT_FAILURE;
 }
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 @@
 #define MSG_COLOR 1
 #define MSG_TEXT  2
 
-static const char *border_img_path = PACKAGE_EXAMPLES_DIR "/red.png";
-static const char *edje_file_path = \
-  PACKAGE_EXAMPLES_DIR "/signals-messages.edj";
-
-static Ecore_Evas *ee;
-static Evas_Object *edje_obj;
-static Eina_Bool right_rect_show = EINA_TRUE;
-
-static const char *commands = \
+static const char commands[] = \
   "commands are:\n"
   "\tt - toggle right rectangle's visibility\n"
+  "\tEsc - exit\n"
   "\th - print help\n";
 
+static Eina_Bool right_rect_show = EINA_TRUE;
+
 static void
-_on_keydown(void        *data __UNUSED__,
+_on_keydown(void        *data,
             Evas        *evas __UNUSED__,
             Evas_Object *o __UNUSED__,
             void        *einfo)
 {
-   Evas_Event_Key_Down *ev = einfo;
+   Evas_Event_Key_Down *ev;
+   Evas_Object         *edje_obj;
+
+   ev = (Evas_Event_Key_Down *)einfo;
+   edje_obj = (Evas_Object *)data;
 
-   if (strcmp(ev->keyname, "h") == 0) /* print help */
+   if (!strcmp(ev->keyname, "h")) /* print help */
      {
         fprintf(stdout, commands);
         return;
      }
-
-   if (strcmp(ev->keyname, "t") == 0) /* toggle right rectangle's visibility */
+   else if (!strcmp(ev->keyname, "t")) /* toggle right rectangle's visibility */
      {
         char buf[1024];
 
@@ -68,6 +66,13 @@ _on_keydown(void        *data __UNUSED__,
 
         return;
      }
+   else if (!strcmp(ev->keyname, "Escape"))
+     ecore_main_loop_quit();
+   else
+     {
+        printf("unhandled key: %s\n", ev->keyname);
+        fprintf(stdout, commands);
+     }
 }
 
 static void
@@ -85,7 +90,7 @@ _sig_print(const char *emission,
 }
 
 static void
-_mouse_wheel_cb(void        *data __UNUSED__,
+_on_mouse_wheel(void        *data __UNUSED__,
                   Evas_Object *obj __UNUSED__,
                   const char  *emission,
                   const char  *source)
@@ -95,8 +100,8 @@ _mouse_wheel_cb(void        *data __UNUSED__,
 
 /* mouse over signals */
 static void
-_mouse_over_cb(void        *data __UNUSED__,
-               Evas_Object *obj __UNUSED__,
+_on_mouse_over(void        *data __UNUSED__,
+               Evas_Object *edje_obj,
                const char  *emission,
                const char  *source)
 {
@@ -133,28 +138,43 @@ _message_handle(void             *data __UNUSED__,
 }
 
 int
-main(void)
+main(int argc __UNUSED__, char *argv[])
 {
-   Evas_Object *border, *bg;
-   Evas *evas;
-
-   srand(time(NULL));
+   char         border_img_path[PATH_MAX];
+   char         edje_file_path[PATH_MAX];
+   const char  *edje_file = "signals-messages.edj";
+   Ecore_Evas  *ee;
+   Evas        *evas;
+   Evas_Object *bg;
+   Evas_Object *edje_obj;
+   Evas_Object *border;
+   Eina_Prefix *pfx;
 
    if (!ecore_evas_init())
      return EXIT_FAILURE;
 
    if (!edje_init())
-     return EXIT_FAILURE;
+     goto shutdown_ecore_evas;
+
+   pfx = eina_prefix_new(argv[0], main,
+                         "EDJE_EXAMPLES",
+                         "edje/examples",
+                         edje_file,
+                         PACKAGE_BIN_DIR,
+                         PACKAGE_LIB_DIR,
+                         PACKAGE_DATA_DIR,
+                         PACKAGE_DATA_DIR);
+   if (!pfx)
+     goto shutdown_edje;
 
    /* this will give you a window with an Evas canvas under the first
     * engine available */
    ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
    if (!ee)
-     goto error;
+     goto free_prefix;
 
    ecore_evas_callback_delete_request_set(ee, _on_delete);
    ecore_evas_title_set(ee, "Edje Basics Example");
-   ecore_evas_show(ee);
 
    evas = ecore_evas_get(ee);
 
@@ -163,14 +183,13 @@ main(void)
    evas_object_move(bg, 0, 0); /* at canvas' origin */
    evas_object_resize(bg, WIDTH, HEIGHT); /* covers full canvas */
    evas_object_show(bg);
-   ecore_evas_object_associate(ee, bg, ECORE_EVAS_OBJECT_ASSOCIATE_BASE);
-
    evas_object_focus_set(bg, EINA_TRUE);
-   evas_object_event_callback_add(
-     bg, EVAS_CALLBACK_KEY_DOWN, _on_keydown, NULL);
+   ecore_evas_object_associate(ee, bg, ECORE_EVAS_OBJECT_ASSOCIATE_BASE);
 
    edje_obj = edje_object_add(evas);
 
+   snprintf(edje_file_path, sizeof(edje_file_path),
+            "%s/examples/%s", eina_prefix_data_get(pfx), edje_file);
    if (!edje_object_file_set(edje_obj, edje_file_path, "example_group"))
      {
         int err = edje_object_load_error_get(edje_obj);
@@ -179,14 +198,14 @@ main(void)
                         "signals-messages.edj: %s\n", errmsg);
 
         evas_object_del(edje_obj);
-        goto error_edj;
+        goto free_prefix;
      }
 
    edje_object_signal_callback_add(edje_obj, "mouse,wheel,*", "part_left",
-                                   _mouse_wheel_cb, NULL);
+                                   _on_mouse_wheel, NULL);
 
    edje_object_signal_callback_add(edje_obj, "mouse,over", "part_right",
-                                   _mouse_over_cb, NULL);
+                                   _on_mouse_over, NULL);
 
    edje_object_message_handler_set(edje_obj, _message_handle, NULL);
 
@@ -194,6 +213,11 @@ main(void)
    evas_object_resize(edje_obj, WIDTH - 40, HEIGHT - 40);
    evas_object_show(edje_obj);
 
+   evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_keydown, edje_obj);
+
+   snprintf(border_img_path, sizeof(border_img_path),
+            "%s/edje/examples/red.png", eina_prefix_data_get(pfx));
+
    /* this is a border around the Edje object above, here just to
     * emphasize its geometry */
    border = evas_object_image_filled_add(evas);
@@ -207,24 +231,24 @@ main(void)
    evas_object_show(border);
 
    fprintf(stdout, commands);
+
+   ecore_evas_show(ee);
+
    ecore_main_loop_begin();
 
+   eina_prefix_free(pfx);
    ecore_evas_free(ee);
    ecore_evas_shutdown();
    edje_shutdown();
-   return 0;
-
-error:
-   fprintf(stderr, "You got to have at least one Evas engine built"
-                   " and linked up to ecore-evas for this example to run"
-                   " properly.\n");
-   ecore_evas_shutdown();
-   return -1;
 
-error_edj:
-   fprintf(stderr, "Failed to load signals-messages.edj!\n");
+   return EXIT_SUCCESS;
 
+ free_prefix:
+   eina_prefix_free(pfx);
+ shutdown_edje:
+   edje_shutdown();
+ shutdown_ecore_evas:
    ecore_evas_shutdown();
-   return -2;
-}
 
+   return EXIT_FAILURE;
+}
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 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #else
-#define PACKAGE_EXAMPLES_DIR "."
-#define __UNUSED__
+# define __UNUSED__
 #endif
 
 #include <Ecore.h>
@@ -23,11 +22,6 @@
 #define WIDTH  (300)
 #define HEIGHT (300)
 
-static const char *edje_file_path = PACKAGE_EXAMPLES_DIR "/swallow.edj";
-
-static Ecore_Evas *ee;
-static Evas_Object *bg;
-
 static void
 _on_delete(Ecore_Evas *ee __UNUSED__)
 {
@@ -37,31 +31,56 @@ _on_delete(Ecore_Evas *ee __UNUSED__)
 /* here just to keep our example's window size and background image's
  * size in synchrony */
 static void
-_canvas_resize_cb(Ecore_Evas *ee)
+_on_canvas_resize(Ecore_Evas *ee)
 {
-   int w, h;
+   Evas_Object *bg;
+   int          w;
+   int          h;
 
+   bg = ecore_evas_data_get(ee, "background");
    ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
    evas_object_resize(bg, w, h);
 }
 
 int
-main(void)
+main(int argc __UNUSED__, char *argv[])
 {
-   Evas_Object *edje_obj, *rect, *obj;
-   Evas *evas;
-
-   ecore_evas_init();
-   edje_init();
+   char         edje_file_path[PATH_MAX];
+   const char  *edje_file = "swallow.edj";
+   Ecore_Evas  *ee;
+   Evas        *evas;
+   Evas_Object *bg;
+   Evas_Object *rect;
+   Evas_Object *obj;
+   Evas_Object *edje_obj;
+   Eina_Prefix *pfx;
+
+   if (!ecore_evas_init())
+     return EXIT_FAILURE;
+
+   if (!edje_init())
+     goto shutdown_ecore_evas;
+
+   pfx = eina_prefix_new(argv[0], main,
+                         "EDJE_EXAMPLES",
+                         "edje/examples",
+                         edje_file,
+                         PACKAGE_BIN_DIR,
+                         PACKAGE_LIB_DIR,
+                         PACKAGE_DATA_DIR,
+                         PACKAGE_DATA_DIR);
+   if (!pfx)
+     goto shutdown_edje;
 
    /* this will give you a window with an Evas canvas under the first
     * engine available */
    ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
+   if (!ee)
+     goto free_prefix;
 
    ecore_evas_callback_delete_request_set(ee, _on_delete);
-   ecore_evas_callback_resize_set(ee, _canvas_resize_cb);
+   ecore_evas_callback_resize_set(ee, _on_canvas_resize);
    ecore_evas_title_set(ee, "Edje Swallow Example");
-   ecore_evas_show(ee);
 
    evas = ecore_evas_get(ee);
 
@@ -70,9 +89,12 @@ main(void)
    evas_object_move(bg, 0, 0); /* at canvas' origin */
    evas_object_resize(bg, WIDTH, HEIGHT); /* covers full canvas */
    evas_object_show(bg);
+   ecore_evas_data_set(ee, "background", bg);
 
    edje_obj = edje_object_add(evas);
 
+   snprintf(edje_file_path, sizeof(edje_file_path),
+            "%s/examples/%s", eina_prefix_data_get(pfx), edje_file);
    edje_object_file_set(edje_obj, edje_file_path, "example_group");
    evas_object_move(edje_obj, 20, 20);
    evas_object_resize(edje_obj, WIDTH - 40, HEIGHT - 40);
@@ -86,10 +108,23 @@ main(void)
    if(obj == rect)
       printf("Swallowing worked!\n");
 
+   ecore_evas_show(ee);
+
    ecore_main_loop_begin();
 
+   eina_prefix_free(pfx);
    ecore_evas_free(ee);
    ecore_evas_shutdown();
    edje_shutdown();
-   return 0;
+
+   return EXIT_SUCCESS;
+
+ free_prefix:
+   eina_prefix_free(pfx);
+ shutdown_edje:
+   edje_shutdown();
+ shutdown_ecore_evas:
+   ecore_evas_shutdown();
+
+   return EXIT_FAILURE;
 }
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 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #else
-#define PACKAGE_EXAMPLES_DIR "."
-#define __UNUSED__
+# define __UNUSED__
 #endif
 
 #include <Ecore.h>
@@ -23,12 +22,6 @@
 #define WIDTH  (400)
 #define HEIGHT (400)
 
-static const char *edje_file_path = PACKAGE_EXAMPLES_DIR "/table.edj";
-
-static Ecore_Evas *ee;
-static Evas *evas;
-static Evas_Object *bg, *edje_obj, *rects[4];
-
 static void
 _on_delete(Ecore_Evas *ee __UNUSED__)
 {
@@ -38,7 +31,7 @@ _on_delete(Ecore_Evas *ee __UNUSED__)
 /* Try to get the number of columns and rows of the table
  * and print them. */
 static void
-_columns_rows_print(void)
+_columns_rows_print(Evas_Object *edje_obj)
 {
    int cols, rows;
 
@@ -52,10 +45,18 @@ _columns_rows_print(void)
 /* here just to keep our example's window size and table items
  * size in synchrony. */
 static void
-_canvas_resize_cb(Ecore_Evas *ee)
+_on_canvas_resize(Ecore_Evas *ee)
 {
-   int i, w, h;
-
+   Evas_Object *bg;
+   Evas_Object *edje_obj;
+   Evas_Object **rects;
+   int          i;
+   int          w;
+   int          h;
+
+   bg = ecore_evas_data_get(ee, "background");
+   edje_obj = ecore_evas_data_get(ee, "edje_obj");
+   rects = ecore_evas_data_get(ee, "rects");
    ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
 
    evas_object_resize(bg, w, h);
@@ -68,9 +69,13 @@ _canvas_resize_cb(Ecore_Evas *ee)
 /* Mouse button 1 = remove the clicked item
  * any other button = remove all items. */
 static void
-_on_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info)
+_on_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_info)
 {
-   Evas_Event_Mouse_Down *ev = event_info;
+   Evas_Event_Mouse_Down *ev;
+   Evas_Object *edje_obj;
+
+   ev = (Evas_Event_Mouse_Down *)event_info;
+   edje_obj = (Evas_Object *)data;
 
    if (ev->button != 1)
      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)
      fprintf(stderr, "Cannot remove the selected rectangle\n");
 
    evas_object_del(obj);
-   _columns_rows_print();
+   _columns_rows_print(edje_obj);
 }
 
 static void
-_rects_create(void)
+_rects_create(Evas *evas, Evas_Object **rects, Evas_Object *edje_obj)
 {
    int i;
 
@@ -93,26 +98,48 @@ _rects_create(void)
         evas_object_size_hint_weight_set(rects[i], 1.0, 1.0);
         evas_object_show(rects[i]);
         evas_object_event_callback_add(rects[i], EVAS_CALLBACK_MOUSE_DOWN,
-                                       _on_mouse_down, NULL);
+                                       _on_mouse_down, edje_obj);
      }
 }
 
 int
-main(void)
+main(int argc __UNUSED__, char *argv[])
 {
-   int i;
-
-   ecore_evas_init();
-   edje_init();
+   char         edje_file_path[PATH_MAX];
+   const char  *edje_file = "table.edj";
+   Ecore_Evas  *ee;
+   Evas        *evas;
+   Evas_Object *bg;
+   Evas_Object *edje_obj;
+   Evas_Object *rects[4];
+   Eina_Prefix *pfx;
+
+   if (!ecore_evas_init())
+     return EXIT_FAILURE;
+
+   if (!edje_init())
+     goto shutdown_ecore_evas;
+
+   pfx = eina_prefix_new(argv[0], main,
+                         "EDJE_EXAMPLES",
+                         "edje/examples",
+                         edje_file,
+                         PACKAGE_BIN_DIR,
+                         PACKAGE_LIB_DIR,
+                         PACKAGE_DATA_DIR,
+                         PACKAGE_DATA_DIR);
+   if (!pfx)
+     goto shutdown_edje;
 
    /* this will give you a window with an Evas canvas under the first
     * engine available */
    ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
+   if (!ee)
+     goto free_prefix;
 
    ecore_evas_callback_delete_request_set(ee, _on_delete);
-   ecore_evas_callback_resize_set(ee, _canvas_resize_cb);
+   ecore_evas_callback_resize_set(ee, _on_canvas_resize);
    ecore_evas_title_set(ee, "Edje Table Example");
-   ecore_evas_show(ee);
 
    evas = ecore_evas_get(ee);
 
@@ -121,15 +148,20 @@ main(void)
    evas_object_move(bg, 0, 0); /* at canvas' origin */
    evas_object_resize(bg, WIDTH, HEIGHT); /* covers full canvas */
    evas_object_show(bg);
+   ecore_evas_data_set(ee, "background", bg);
 
    edje_obj = edje_object_add(evas);
 
+   snprintf(edje_file_path, sizeof(edje_file_path),
+            "%s/examples/%s", eina_prefix_data_get(pfx), edje_file);
    edje_object_file_set(edje_obj, edje_file_path, "example_table");
    evas_object_move(edje_obj, 0, 0); /* at canvas' origin */
    evas_object_resize(edje_obj, WIDTH, HEIGHT);
    evas_object_show(edje_obj);
+   ecore_evas_data_set(ee, "edje_obj", edje_obj);
 
-   _rects_create();
+   _rects_create(evas, rects, edje_obj);
+   ecore_evas_data_set(ee, "rects", rects);
 
    /* Colouring the rectangles */
    evas_object_color_set(rects[0], 255, 0, 0, 255);
@@ -154,12 +186,25 @@ main(void)
                                     1, 1, 1, 1))
      fprintf(stderr, "Cannot add the rectangle 4 to table\n");
 
-   _columns_rows_print();
+   _columns_rows_print(edje_obj);
+
+   ecore_evas_show(ee);
 
    ecore_main_loop_begin();
 
+   eina_prefix_free(pfx);
    ecore_evas_free(ee);
    ecore_evas_shutdown();
    edje_shutdown();
-   return 0;
+
+   return EXIT_SUCCESS;
+
+ free_prefix:
+   eina_prefix_free(pfx);
+ shutdown_edje:
+   edje_shutdown();
+ shutdown_ecore_evas:
+   ecore_evas_shutdown();
+
+   return EXIT_FAILURE;
 }
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 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #else
-#define PACKAGE_EXAMPLES_DIR "."
-#define __UNUSED__
+# define __UNUSED__
 #endif
 
 #include <Ecore.h>
@@ -23,11 +22,6 @@
 #define WIDTH  (300)
 #define HEIGHT (300)
 
-static const char *edje_file_path = PACKAGE_EXAMPLES_DIR "/text.edj";
-
-static Ecore_Evas *ee;
-static Evas_Object *bg;
-
 static void
 _on_delete(Ecore_Evas *ee __UNUSED__)
 {
@@ -35,27 +29,47 @@ _on_delete(Ecore_Evas *ee __UNUSED__)
 }
 
 static void
-_cb(void *data, Evas_Object *obj, const char *part)
+_on_text_change(void *data __UNUSED__, Evas_Object *obj, const char *part)
 {
    printf("text: %s\n", edje_object_part_text_unescaped_get(obj, part));
 }
 
 int
-main(void)
+main(int argc __UNUSED__, char *argv[])
 {
-   Evas_Object *edje_obj, *rect, *obj;
-   Evas *evas;
-
-   ecore_evas_init();
-   edje_init();
+   char         edje_file_path[PATH_MAX];
+   const char  *edje_file = "text.edj";
+   Ecore_Evas  *ee;
+   Evas        *evas;
+   Evas_Object *bg;
+   Evas_Object *edje_obj;
+   Eina_Prefix *pfx;
+
+   if (!ecore_evas_init())
+     return EXIT_FAILURE;
+
+   if (!edje_init())
+     goto shutdown_ecore_evas;
+
+   pfx = eina_prefix_new(argv[0], main,
+                         "EDJE_EXAMPLES",
+                         "edje/examples",
+                         edje_file,
+                         PACKAGE_BIN_DIR,
+                         PACKAGE_LIB_DIR,
+                         PACKAGE_DATA_DIR,
+                         PACKAGE_DATA_DIR);
+   if (!pfx)
+     goto shutdown_edje;
 
    /* this will give you a window with an Evas canvas under the first
     * engine available */
    ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
+   if (!ee)
+     goto free_prefix;
 
    ecore_evas_callback_delete_request_set(ee, _on_delete);
    ecore_evas_title_set(ee, "Edje text Example");
-   ecore_evas_show(ee);
 
    evas = ecore_evas_get(ee);
 
@@ -68,12 +82,14 @@ main(void)
 
    edje_obj = edje_object_add(evas);
 
+   snprintf(edje_file_path, sizeof(edje_file_path),
+            "%s/examples/%s", eina_prefix_data_get(pfx), edje_file);
    edje_object_file_set(edje_obj, edje_file_path, "example_group");
    evas_object_move(edje_obj, 20, 20);
    evas_object_resize(edje_obj, WIDTH - 40, HEIGHT - 40);
    evas_object_show(edje_obj);
 
-   edje_object_text_change_cb_set(edje_obj, _cb, NULL);
+   edje_object_text_change_cb_set(edje_obj, _on_text_change, NULL);
    edje_object_part_text_set(edje_obj, "part_one", "one");
    edje_object_part_text_set(edje_obj, "part_two", "<b>two");
 
@@ -83,10 +99,23 @@ main(void)
    edje_object_part_text_select_none(edje_obj, "part_two");
    printf("selection: %s\n", edje_object_part_text_selection_get(edje_obj, "part_two"));
 
+   ecore_evas_show(ee);
+
    ecore_main_loop_begin();
 
+   eina_prefix_free(pfx);
    ecore_evas_free(ee);
    ecore_evas_shutdown();
    edje_shutdown();
-   return 0;
+
+   return EXIT_SUCCESS;
+
+ free_prefix:
+   eina_prefix_free(pfx);
+ shutdown_edje:
+   edje_shutdown();
+ shutdown_ecore_evas:
+   ecore_evas_shutdown();
+
+   return EXIT_FAILURE;
 }
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 @@
 #define WIDTH  (300)
 #define HEIGHT (300)
 
-static const char *border_img_path = PACKAGE_EXAMPLES_DIR "/red.png";
-static const char *edje_file_path = PACKAGE_EXAMPLES_DIR "/sigtest.edj";
-
-static Ecore_Evas *ee;
-static Evas_Object *edje_obj;
-
 static const char commands[] = \
   "commands are:\n"
   "\te - change te edje base\n"
   "\tl - change to lua base\n"
   "\tm - send message\n"
   "\ts - send signal\n"
+  "\tEsc - exit\n"
   "\th - print help\n";
 
 static void
-_on_keydown(void        *data __UNUSED__,
+_on_keydown(void        *data,
             Evas        *evas __UNUSED__,
             Evas_Object *o __UNUSED__,
             void        *einfo)
 {
-   Evas_Event_Key_Down *ev = einfo;
+   Ecore_Evas          *ee;
+   Evas_Event_Key_Down *ev;
+   Evas_Object         *edje_obj;
+   char                *edje_file_path;
+
+   ee = (Ecore_Evas *)data;
+   ev = (Evas_Event_Key_Down *)einfo;
+   edje_obj = ecore_evas_data_get(ee, "edje_obj");
+   edje_file_path = ecore_evas_data_get(ee, "file_path");
 
-   if (strcmp(ev->keyname, "h") == 0)
+   if (!strcmp(ev->keyname, "h"))
      {
         fprintf(stdout, commands);
         return;
      }
-
-   if (strcmp(ev->keyname, "e") == 0)
+   else if (!strcmp(ev->keyname, "e"))
      {
       if (!edje_object_file_set(edje_obj, edje_file_path, "plain/edje/group"))
         {
@@ -55,8 +57,7 @@ _on_keydown(void        *data __UNUSED__,
                          " file sigtest.edj with success!\n");
         return;
      }
-
-   if (strcmp(ev->keyname, "l") == 0)
+   else if (!strcmp(ev->keyname, "l"))
      {
       if (!edje_object_file_set(edje_obj, edje_file_path, "lua_base"))
         {
@@ -70,8 +71,7 @@ _on_keydown(void        *data __UNUSED__,
                          " file sigtest.edj with success!\n");
         return;
      }
-
-   if (strcmp(ev->keyname, "m") == 0)
+   else if (!strcmp(ev->keyname, "m"))
      {
         Edje_Message_String *msg = malloc(sizeof(*msg));
 
@@ -82,8 +82,7 @@ _on_keydown(void        *data __UNUSED__,
         fprintf(stdout, "C message sent\n");
         return;
      }
-
-   if (strcmp(ev->keyname, "s") == 0)
+   else if (!strcmp(ev->keyname, "s"))
      {
         fprintf(stdout, "\n");
         edje_object_signal_emit(edje_obj, "C signal 1", "Csource");
@@ -91,10 +90,17 @@ _on_keydown(void        *data __UNUSED__,
         fprintf(stdout, "C signal sent\n");
         return;
      }
+   else if (!strcmp(ev->keyname, "Escape"))
+     ecore_main_loop_quit();
+   else
+     {
+        printf("unhandled key: %s\n", ev->keyname);
+        fprintf(stdout, commands);
+     }
 }
 
 static void
-_on_message(void *data, Evas_Object *obj, Edje_Message_Type type, int id, void *msg)
+_on_message(void *data __UNUSED__, Evas_Object *obj __UNUSED__, Edje_Message_Type type, int id, void *msg)
 {
    int i;
 
@@ -207,7 +213,7 @@ _on_message(void *data, Evas_Object *obj, Edje_Message_Type type, int id, void *
 }
 
 static void
-_on_signal(void *data, Evas_Object *obj __UNUSED__, const char  *emission, const char  *source)
+_on_signal(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char  *emission, const char  *source)
 {
    fprintf(stdout, "C::signal sig=|%s| src=|%s|\n", emission, source);
 }
@@ -219,26 +225,43 @@ _on_delete(Ecore_Evas *ee __UNUSED__)
 }
 
 int
-main(void)
+main(int argc __UNUSED__, char *argv[])
 {
-   Evas_Object *border, *bg;
-   Evas *evas;
+   char         border_img_path[PATH_MAX];
+   char         edje_file_path[PATH_MAX];
+   const char  *edje_file = "sigtest.edj";
+   Ecore_Evas  *ee;
+   Evas        *evas;
+   Evas_Object *bg;
+   Evas_Object *border;
+   Evas_Object *edje_obj;
+   Eina_Prefix *pfx;
 
    if (!ecore_evas_init())
      return EXIT_FAILURE;
 
    if (!edje_init())
-     return EXIT_FAILURE;
+     goto shutdown_ecore_evas;
+
+   pfx = eina_prefix_new(argv[0], main,
+                         "EDJE_EXAMPLES",
+                         "edje/examples",
+                         edje_file,
+                         PACKAGE_BIN_DIR,
+                         PACKAGE_LIB_DIR,
+                         PACKAGE_DATA_DIR,
+                         PACKAGE_DATA_DIR);
+   if (!pfx)
+     goto shutdown_edje;
 
    /* this will give you a window with an Evas canvas under the first
     * engine available */
    ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
    if (!ee)
-     goto error;
+     goto free_prefix;
 
    ecore_evas_callback_delete_request_set(ee, _on_delete);
    ecore_evas_title_set(ee, "Signals and wessages tester");
-   ecore_evas_show(ee);
 
    evas = ecore_evas_get(ee);
 
@@ -250,14 +273,14 @@ main(void)
    ecore_evas_object_associate(ee, bg, ECORE_EVAS_OBJECT_ASSOCIATE_BASE);
 
    evas_object_focus_set(bg, EINA_TRUE);
-   evas_object_event_callback_add(
-       bg, EVAS_CALLBACK_KEY_DOWN, _on_keydown, NULL);
 
    edje_obj = edje_object_add(evas);
 
    edje_object_message_handler_set(edje_obj, _on_message, NULL);
    edje_object_signal_callback_add(edje_obj, "*", "*", _on_signal, NULL);
 
+   snprintf(edje_file_path, sizeof(edje_file_path),
+            "%s/examples/%s", eina_prefix_data_get(pfx), edje_file);
    if (!edje_object_file_set(edje_obj, edje_file_path, "lua_base"))
      {
         int err = edje_object_load_error_get(edje_obj);
@@ -266,7 +289,7 @@ main(void)
                 errmsg);
 
         evas_object_del(edje_obj);
-        goto error_edj;
+        goto free_prefix;
      }
 
    fprintf(stdout, "Loaded Edje object bound to group 'lua_base' from"
@@ -275,6 +298,13 @@ main(void)
    evas_object_move(edje_obj, 20, 20);
    evas_object_resize(edje_obj, WIDTH - 40, HEIGHT - 40);
    evas_object_show(edje_obj);
+   ecore_evas_data_set(ee, "edje_obj", edje_obj);
+   ecore_evas_data_set(ee, "file_path", edje_file_path);
+
+   evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_keydown, ee);
+
+   snprintf(border_img_path, sizeof(border_img_path),
+            "%s/edje/examples/red.png", eina_prefix_data_get(pfx));
 
    /* this is a border around the Edje object above, here just to
     * emphasize its geometry */
@@ -287,23 +317,25 @@ main(void)
    evas_object_move(border, 20 - 2, 20 - 2);
    evas_object_show(border);
 
+   fprintf(stdout, commands);
+
+   ecore_evas_show(ee);
+
    ecore_main_loop_begin();
 
+   eina_prefix_free(pfx);
    ecore_evas_free(ee);
    ecore_evas_shutdown();
    edje_shutdown();
-   return 0;
-
-error:
-   fprintf(stderr, "You got to have at least one evas engine built"
-                   " and linked up to ecore-evas for this example to run"
-                   " properly.\n");
-   ecore_evas_shutdown();
-   return -1;
 
-error_edj:
-   fprintf(stderr, "Failed to load sigtest.edj!\n");
+   return EXIT_SUCCESS;
 
+ free_prefix:
+   eina_prefix_free(pfx);
+ shutdown_edje:
+   edje_shutdown();
+ shutdown_ecore_evas:
    ecore_evas_shutdown();
-   return -2;
+
+   return EXIT_FAILURE;
 }
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.
 
 @mainpage Edje Library Documentation
 @version 1.1
-@date 2003-2011
+@date 2003-2012
 
 Please see the @ref authors page for contact details.
 
@@ -19,7 +19,7 @@ Please see the @ref authors page for contact details.
 
 Edje is a complex graphical design & layout library.
 
-It doesn't pretend to do containing and regular layout like a widget
+It doesn't intend to do containing and regular layout like a widget
 set, but it is the base for such components. Based on the requirements
 of Enlightenment 0.17, Edje should serve all the purposes of creating
 visual elements (borders of windows, buttons, scrollbars, etc.) and
@@ -110,197 +110,11 @@ The application using Edje will then create an object in its Evas
 canvas and set the bundle file to use, specifying the @b group name to
 use. Edje will load such information and create all the required
 children objects with the specified properties as defined in each @b
-part of the given group. See the following annotated example:
+part of the given group. See the following example:
+@include edje_example.c
 
-@code
-
-#include <Eina.h>
-#include <Evas.h>
-#include <Ecore.h>
-#include <Ecore_Evas.h>
-#include <Edje.h>
-
-#define WIDTH 320
-#define HEIGHT 240
-
-static Evas_Object *create_my_group(Evas *canvas, const char *text)
-{
-   Evas_Object *edje;
-
-   edje = edje_object_add(canvas);
-   if (!edje)
-     {
-        EINA_LOG_CRIT("could not create edje object!");
-        return NULL;
-     }
-
-   if (!edje_object_file_set(edje, "edje_example.edj", "my_group"))
-     {
-        int err = edje_object_load_error_get(edje);
-        const char *errmsg = edje_load_error_str(err);
-        EINA_LOG_ERR("could not load 'my_group' from edje_example.edj: %s",
-                     errmsg);
-
-        evas_object_del(edje);
-        return NULL;
-     }
-
-   if (text)
-     {
-        if (!edje_object_part_text_set(edje, "text", text))
-          {
-             EINA_LOG_WARN("could not set the text. "
-                           "Maybe part 'text' does not exist?");
-          }
-     }
-
-   evas_object_move(edje, 0, 0);
-   evas_object_resize(edje, WIDTH, HEIGHT);
-   evas_object_show(edje);
-   return edje;
-}
-
-int main(int argc, char *argv[])
-{
-   Ecore_Evas *window;
-   Evas *canvas;
-   Evas_Object *edje;
-   const char *text;
-
-   eina_init();
-   evas_init();
-   ecore_init();
-   ecore_evas_init();
-   edje_init();
-
-   window = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
-   if (!window)
-     {
-        EINA_LOG_CRIT("could not create window.");
-        return -1;
-     }
-   canvas = ecore_evas_get(window);
-
-   text = (argc > 1) ? argv[1] : NULL;
-
-   edje = create_my_group(canvas, text);
-   if (!edje)
-     return -2;
-
-   ecore_evas_show(window);
-   ecore_main_loop_begin();
-
-   evas_object_del(edje);
-   ecore_evas_free(window);
-
-   return 0;
-}
-@endcode
-
-It requires the following source Edje file:
-@code
-// compile: edje_cc edje_example.edc
-collections {
-   group {
-      name: "my_group"; // must be the same as in edje_example.c
-
-      parts {
-         part {
-            name: "background";
-            type: RECT; // plain boring rectangle
-            mouse_events: 0; // we don't need any mouse event on the background
-
-            // just one state "default"
-            description {
-               state: "default" 0.0; // must always exist
-               color: 255 255 255 255; // white
-
-               // define part coordinates:
-
-               rel1 { // top-left point at (0, 0) [WIDTH * 0 + 0, HEIGHT * 0 + 0]
-                  relative: 0.0 0.0;
-                  offset: 0 0;
-               }
-               rel2 { // bottom-right point at (WIDTH * 1.0 - 1, HEIGHT * 1.0 - 1)
-                  relative: 1.0 1.0;
-                  offset: -1 -1;
-               }
-            }
-         }
-
-         part {
-            name: "text";
-            type: TEXT;
-            mouse_events: 1; // we want to change the color on mouse-over
-
-            // 2 states, one "default" and another "over" to be used
-            // on mouse over effect
-
-            description {
-               state: "default" 0.0;
-               color: 255 0 0 255; // red
-
-               // define part coordinates:
-
-               rel1 { // top-left at (WIDTH * 0.1 + 5, HEIGHT * 0.2 + 10)
-                  relative: 0.1 0.2;
-                  offset: 5 10;
-               }
-               rel2 { // bottom-right at (WIDTH * 0.9 - 6, HEIGHT * 0.8 - 11)
-                  relative: 0.9 0.8;
-                  offset: -6 -11;
-               }
-
-               // define text specific state details
-               text {
-                  font: "Sans"; // using fontconfig name!
-                  size: 10;
-                  text: "hello world";
-               }
-            }
-
-            description {
-               state: "over" 0.0;
-               inherit: "default" 0.0; // copy everything from "default" at this point
-
-               color: 0 255 0 255; // override color, now it is green
-            }
-         }
-
-         // do programs to change color on text mouse in/out (over)
-         programs {
-            program {
-               // what triggers this program:
-               signal: "mouse,in";
-               source: "text";
-
-               // what this program does:
-               action: STATE_SET "over" 0.0;
-               target: "text";
-
-               // do the state-set in a nice interpolation animation
-               // using linear time in 0.1 second
-               transition: LINEAR 0.1;
-            }
-
-            program {
-               // what triggers this program:
-               signal: "mouse,out";
-               source: "text";
-
-               // what this program does:
-               action: STATE_SET "default" 0.0;
-               target: "text";
-
-               // do the state-set in a nice interpolation animation
-               // using linear time in 0.1 second
-               transition: LINEAR 0.1;
-            }
-         }
-      }
-   }
-}
-@endcode
+The above example requires the following annotated source Edje file:
+@include edje_example.edc
 
 
 One should save these files as edje_example.c and edje_example.edc then:
@@ -452,6 +266,10 @@ param in edje programs
 # undef EAPI
 #endif
 
+#ifdef HAVE_ECORE_IMF
+#include <Ecore_IMF.h>
+#endif
+
 #ifdef _WIN32
 # ifdef EFL_EDJE_BUILD
 #  ifdef DLL_EXPORT
@@ -778,7 +596,7 @@ typedef enum _Edje_External_Param_Type
 {
    EDJE_EXTERNAL_PARAM_TYPE_INT, /**< Parameter value is an integer. */
    EDJE_EXTERNAL_PARAM_TYPE_DOUBLE, /**< Parameter value is a double. */
-   EDJE_EXTERNAL_PARAM_TYPE_STRING, /**< Paramater value is a string. */
+   EDJE_EXTERNAL_PARAM_TYPE_STRING, /**< Parameter value is a string. */
    EDJE_EXTERNAL_PARAM_TYPE_BOOL, /**< Parameter value is boolean. */
    EDJE_EXTERNAL_PARAM_TYPE_CHOICE, /**< Parameter value is one of a set of
                                       predefined string choices. */
@@ -791,10 +609,10 @@ typedef enum _Edje_External_Param_Type
  */
 typedef enum _Edje_External_Param_Flags
 {
-   EDJE_EXTERNAL_PARAM_FLAGS_NONE        = 0, /**< Propery is incapable of operations, this is used to catch bogus flags. */
+   EDJE_EXTERNAL_PARAM_FLAGS_NONE        = 0, /**< Property is incapable of operations, this is used to catch bogus flags. */
    EDJE_EXTERNAL_PARAM_FLAGS_GET         = (1 << 0), /**< Property can be read/get. */
    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. */
-   EDJE_EXTERNAL_PARAM_FLAGS_STATE       = (1 << 2), /**< Property can be set from state dsecription. */
+   EDJE_EXTERNAL_PARAM_FLAGS_STATE       = (1 << 2), /**< Property can be set from state description. */
    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. */
    EDJE_EXTERNAL_PARAM_FLAGS_REGULAR     = (EDJE_EXTERNAL_PARAM_FLAGS_GET |
                                             EDJE_EXTERNAL_PARAM_FLAGS_SET |
@@ -817,6 +635,24 @@ typedef enum _Edje_Input_Panel_Layout
    EDJE_INPUT_PANEL_LAYOUT_PASSWORD         /**< Like normal, but no auto-correct, no auto-capitalization etc. @since 1.2 */
 } Edje_Input_Panel_Layout;
 
+typedef enum _Edje_Input_Panel_Lang
+{
+   EDJE_INPUT_PANEL_LANG_AUTOMATIC,    /**< Automatic @since 1.2 */
+   EDJE_INPUT_PANEL_LANG_ALPHABET      /**< Alphabet @since 1.2 */
+} Edje_Input_Panel_Lang;
+
+typedef enum _Edje_Input_Panel_Return_Key_Type
+{
+   EDJE_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT, /**< Default @since 1.2 */
+   EDJE_INPUT_PANEL_RETURN_KEY_TYPE_DONE,    /**< Done @since 1.2 */
+   EDJE_INPUT_PANEL_RETURN_KEY_TYPE_GO,      /**< Go @since 1.2 */
+   EDJE_INPUT_PANEL_RETURN_KEY_TYPE_JOIN,    /**< Join @since 1.2 */
+   EDJE_INPUT_PANEL_RETURN_KEY_TYPE_LOGIN,   /**< Login @since 1.2 */
+   EDJE_INPUT_PANEL_RETURN_KEY_TYPE_NEXT,    /**< Next @since 1.2 */
+   EDJE_INPUT_PANEL_RETURN_KEY_TYPE_SEARCH,  /**< Search or magnifier icon @since 1.2 */
+   EDJE_INPUT_PANEL_RETURN_KEY_TYPE_SEND     /**< Send @since 1.2 */
+} Edje_Input_Panel_Return_Key_Type;
+
 /**
  * @brief Converts type identifier to string nicer representation.
  *
@@ -886,18 +722,18 @@ struct _Edje_External_Param_Info
                                       used. */
    union {
       struct {
-         int                 def, /**< Default value for the paramter. */
+         int                 def, /**< Default value for the parameter. */
                              min, /**< Minimum value it can have. */
                              max, /**< Maximum value it can have. */
                              step; /**< Values will be a multiple of this. */
-      } i; /**< Info about integer type parametrs. Use #EDJE_EXTERNAL_INT_UNSET
+      } i; /**< Info about integer type parameters. Use #EDJE_EXTERNAL_INT_UNSET
              on any of them to indicate they are not defined.*/
       struct {
-         double              def, /**< Default value for the paramter. */
+         double              def, /**< Default value for the parameter. */
                              min, /**< Minimum value it can have. */
                              max, /**< Maximum value it can have. */
                              step; /**< Values will be a multiple of this. */
-      } d; /**< Info about double type parametrs. Use
+      } d; /**< Info about double type parameters. Use
 #EDJE_EXTERNAL_DOUBLE_UNSET on any of them to indicate they are not defined.*/
       struct {
          const char         *def; /**< Default value. */
@@ -1054,6 +890,7 @@ typedef void         (*Edje_Signal_Cb)          (void *data, Evas_Object *obj, c
 typedef void         (*Edje_Text_Change_Cb)     (void *data, Evas_Object *obj, const char *part);
 typedef 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. */
 typedef void         (*Edje_Text_Filter_Cb)     (void *data, Evas_Object *obj, const char *part, Edje_Text_Filter_Type type, char **text);
+typedef void         (*Edje_Markup_Filter_Cb)   (void *data, Evas_Object *obj, const char *part, char **text);
 typedef Evas_Object *(*Edje_Item_Provider_Cb)   (void *data, Evas_Object *obj, const char *part, const char *item);
 
 /**
@@ -1187,7 +1024,7 @@ EAPI const char  *edje_fontset_append_get         (void);
  * edje_object_scale_set(), that factor will @b override the global
  * one.
  *
- * Scaling affects the values of mininum/maximum @b part sizes, which
+ * Scaling affects the values of minimum/maximum @b part sizes, which
  * are @b multiplied by it. Font sizes are scaled, too.
  *
  * @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)
  *
  * @param obj A handle to an Edje object
  * @param scale The scaling factor (the default value is @c 0.0,
- * meaning indivinual scaling @b not set)
+ * meaning individual scaling @b not set)
  *
  * This function sets an @b individual scaling factor on the @a obj
  * 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
  * 
  * @note You can get a callback every time edje re-calculates the object
  * (either due to animation or some kind of signal or input). This is called
- * in-line just after the recalculation has occured. It is a good idea not
+ * in-line just after the recalculation has occurred. It is a good idea not
  * to go and delete or alter the object inside this callbacks, simply make
- * a note that the recalculation has taken place and then do somethnig about
+ * a note that the recalculation has taken place and then do something about
  * it outside the callback. to register a callback use code like:
  * 
  * @code
@@ -1883,7 +1720,7 @@ EAPI Eina_Bool        edje_object_preload         (Evas_Object *obj, Eina_Bool c
  * buttons on an interface, you'd be registering for notifications on
  * events of mouse buttons being pressed down on either of those parts
  * (those events all have the @c "mouse,down," common prefix on their
- * names, with a suffix giving the button number). The actual emisson
+ * names, with a suffix giving the button number). The actual emission
  * and source strings of an event will be passed in as the @a emission
  * and @a source parameters of the callback function (e.g. @c
  * "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
 EAPI void         edje_object_size_min_get            (const Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
 
 /**
+ * @brief Edje will automatically update the size hints on itself.
+ *
+ * @param obj A handle to an Edje object.
+ * @param update Wether or not update the size hints.
+ *
+ * By default edje doesn't set size hints on itself. With this function
+ * call, it will do so if update is true. Be carefully, it cost a lot to
+ * trigger this feature as it will recalc the object every time it make
+ * sense to be sure that's its minimal size hint is always accurate.
+ */
+EAPI void edje_object_update_hints_set(Evas_Object *obj, Eina_Bool update);
+
+/**
+ * @brief Wether or not Edje will update size hints on itself.
+ *
+ * @param obj A handle to an Edje object.
+ * @return @c true if does, @c false if it doesn't.
+ */
+EAPI Eina_Bool edje_object_update_hints_get(Evas_Object *obj);
+
+/**
  * @brief Get the maximum size specified -- as an EDC property -- for a
  * given Edje object
  *
@@ -2362,12 +2220,12 @@ EAPI Eina_Bool    edje_object_part_exists             (const Evas_Object *obj, c
  * @return A pointer to the Evas object implementing the given part,
  * or @c NULL on failure (e.g. the given part doesn't exist)
  *
- * This function gets a pointer the Evas object corresponding to a
+ * This function gets a pointer of the Evas object corresponding to a
  * given part in the @p obj object's group.
  *
  * You should @b never modify the state of the returned object (with
  * @c evas_object_move() or @c evas_object_hide() for example),
- * because it's meant to be managed be Edje, solely. You are safe to
+ * because it's meant to be managed by Edje, solely. You are safe to
  * query information about its current state (with @c
  * evas_object_visible_get() or @c evas_object_color_get() for
  * example), though.
@@ -2448,6 +2306,43 @@ EAPI Eina_Bool    edje_object_part_text_set           (Evas_Object *obj, const c
 EAPI const char  *edje_object_part_text_get           (const Evas_Object *obj, const char *part);
 
 /**
+ * @brief Set the style of the
+ *
+ * @param obj A valid Evas_Object handle
+ * @param part The part name
+ * @param style The style to set (textblock conventions).
+ *
+ * This function sets the style associated with the textblock part.
+ *
+ * @since 1.2.0
+ */
+EAPI void edje_object_part_text_style_user_push(Evas_Object *obj, const char *part, const char *style);
+
+/**
+ * @brief Return the text of the object part.
+ *
+ * @param obj A valid Evas_Object handle
+ * @param part The part name
+ *
+ * @return The text string
+ *
+ * This function returns the style associated with the textblock part.
+ *
+ * @since 1.2.0
+ */
+EAPI const char *edje_object_part_text_style_user_peek(const Evas_Object *obj, const char *part);
+
+/**
+ * @brief Delete the top style form the user style stack.
+ *
+ * @param obj A valid Evas_Object handle
+ * @param part The part name
+ *
+ * @since 1.2.0
+ */
+EAPI void edje_object_part_text_style_user_pop(Evas_Object *obj, const char *part);
+
+/**
  * @brief Sets the raw (non escaped) text for an object part.
  *
  * @param obj A valid Evas Object handle
@@ -2615,6 +2510,15 @@ EAPI Eina_Bool        edje_object_part_text_item_geometry_get       (const Evas_
 EAPI 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);
 
 /**
+ * @brief Deletes the selection and emits a change event.
+ *
+ * @param obj A valid Evas_Object handle
+ * @param part The part name
+ * @since 1.2.0
+ */
+EAPI void             edje_object_part_text_user_insert        (const Evas_Object *obj, const char *part, const char *text);
+
+/**
  * @brief Enables selection if the entry is an EXPLICIT selection mode
  * type.
  *
@@ -2813,8 +2717,33 @@ EAPI void             edje_object_part_text_cursor_pos_set              (Evas_Ob
 EAPI int              edje_object_part_text_cursor_pos_get              (const Evas_Object *obj, const char *part, Edje_Cursor cur);
 
 /**
+ * @brief Reset the input method context if needed.
+ *
+ * This can be necessary in the case where modifying the buffer would confuse on-going input method behavior
+ *
+ * @param obj A valid Evas_Object handle
+ * @param part The part name
+ * @since 1.2.0
+ */
+EAPI void             edje_object_part_text_imf_context_reset           (const Evas_Object *obj, const char *part);
+
+/**
+ * @brief Get the input method context in entry.
+ *
+ * If ecore_imf was not available when edje was compiled, this function returns NULL
+ * otherwise, the returned pointer is an Ecore_IMF *
+ *
+ * @param obj A valid Evas_Object handle
+ * @param part The part name
+ *
+ * @return The input method context (Ecore_IMF_Context *) in entry 
+ * @since 1.2.0
+ */
+EAPI void              *edje_object_part_text_imf_context_get           (const Evas_Object *obj, const char *part);
+
+/**
  * @brief Set the layout of the input panel.
- * 
+ *
  * The layout of the input panel or virtual keyboard can make it easier or
  * harder to enter content. This allows you to hint what kind of input you
  * 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
  * @param layout layout type
  * @since 1.1
  */
-EAPI void             edje_object_part_text_input_panel_layout_set (const Evas_Object *obj, const char *part, Edje_Input_Panel_Layout layout);
+EAPI void             edje_object_part_text_input_panel_layout_set      (Evas_Object *obj, const char *part, Edje_Input_Panel_Layout layout);
 
 /**
  * @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
  * @param autocapital_type The type of autocapitalization
  * @since 1.1.0
  */
-EAPI void         edje_object_part_text_autocapital_type_set        (const Evas_Object *obj, const char *part, Edje_Text_Autocapital_Type autocapital_type);
+EAPI void         edje_object_part_text_autocapital_type_set            (Evas_Object *obj, const char *part, Edje_Text_Autocapital_Type autocapital_type);
 
 /**
  * @brief Retrieves the autocapitalization type
@@ -2861,6 +2790,26 @@ EAPI void         edje_object_part_text_autocapital_type_set        (const Evas_
 EAPI Edje_Text_Autocapital_Type edje_object_part_text_autocapital_type_get (const Evas_Object *obj, const char *part);
 
 /**
+ * @brief Set whether the prediction is allowed or not.
+ *
+ * @param obj A valid Evas_Object handle
+ * @param part The part name
+ * @param prediction If true, the prediction feature is allowed.
+ * @since 1.2.0
+ */
+EAPI void             edje_object_part_text_prediction_allow_set        (Evas_Object *obj, const char *part, Eina_Bool prediction);
+
+/**
+ * @brief Get whether the prediction is allowed or not.
+ *
+ * @param obj A valid Evas_Object handle
+ * @param part The part name
+ * @return EINA_TRUE if prediction feature is allowed.
+ * @since 1.2.0
+ */
+EAPI Eina_Bool        edje_object_part_text_prediction_allow_get        (const Evas_Object *obj, const char *part);
+
+/**
  * @brief Sets the attribute to show the input panel automatically.
  *
  * @param obj A valid Evas_Object handle
@@ -2868,7 +2817,7 @@ EAPI Edje_Text_Autocapital_Type edje_object_part_text_autocapital_type_get (cons
  * @param enabled If true, the input panel is appeared when entry is clicked or has a focus
  * @since 1.1.0
  */
-EAPI void             edje_object_part_text_input_panel_enabled_set (const Evas_Object *obj, const char *part, Eina_Bool enabled);
+EAPI void             edje_object_part_text_input_panel_enabled_set     (Evas_Object *obj, const char *part, Eina_Bool enabled);
 
 /**
  * @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_
 EAPI Eina_Bool        edje_object_part_text_input_panel_enabled_get (const Evas_Object *obj, const char *part);
 
 /**
+ * @brief Show the input panel (virtual keyboard) based on the input panel property such as layout, autocapital types, and so on.
+ *
+ * Note that input panel is shown or hidden automatically according to the focus state.
+ * This API can be used in the case of manually controlling by using edje_object_part_text_input_panel_enabled_set.
+ *
+ * @param obj A valid Evas_Object handle
+ * @param part The part name
+ * @since 1.2.0
+ */
+EAPI void             edje_object_part_text_input_panel_show(const Evas_Object *obj, const char *part);
+
+/**
+ * @brief Hide the input panel (virtual keyboard).
+ * @see edje_object_part_text_input_panel_show
+ *
+ * Note that input panel is shown or hidden automatically according to the focus state.
+ * This API can be used in the case of manually controlling by using edje_object_part_text_input_panel_enabled_set.
+ *
+ * @param obj A valid Evas_Object handle
+ * @param part The part name
+ * @since 1.2.0
+ */
+EAPI void             edje_object_part_text_input_panel_hide(const Evas_Object *obj, const char *part);
+
+/**
+ * Set the language mode of the input panel.
+ *
+ * This API can be used if you want to show the Alphabet keyboard.
+ *
+ * @param obj A valid Evas_Object handle
+ * @param part The part name
+ * @param lang the language to be set to the input panel.
+ * @since 1.2.0
+ */
+EAPI void             edje_object_part_text_input_panel_language_set(Evas_Object *obj, const char *part, Edje_Input_Panel_Lang lang);
+
+/**
+ * Get the language mode of the input panel.
+ *
+ * See @ref edje_object_part_text_input_panel_language_set for more details.
+ *
+ * @param obj A valid Evas_Object handle
+ * @param part The part name
+ * @return input panel language type
+ * @since 1.2.0
+ */
+EAPI Edje_Input_Panel_Lang edje_object_part_text_input_panel_language_get(const Evas_Object *obj, const char *part);
+
+/**
+ * Set the input panel-specific data to deliver to the input panel.
+ *
+ * This API is used by applications to deliver specific data to the input panel.
+ * The data format MUST be negotiated by both application and the input panel.
+ * The size and format of data are defined by the input panel.
+ *
+ * @param obj A valid Evas_Object handle
+ * @param part The part name
+ * @param data The specific data to be set to the input panel.
+ * @param len the length of data, in bytes, to send to the input panel
+ * @since 1.2.0
+ */
+EAPI void             edje_object_part_text_input_panel_imdata_set(Evas_Object *obj, const char *part, const void *data, int len);
+
+/**
+ * Get the specific data of the current active input panel.
+ *
+ * @param obj A valid Evas_Object handle
+ * @param part The part name
+ * @param data The specific data to be got from the input panel
+ * @param len The length of data
+ * @since 1.2.0
+ */
+EAPI void             edje_object_part_text_input_panel_imdata_get(const Evas_Object *obj, const char *part, void *data, int *len);
+
+/**
+ * Set the "return" key type. This type is used to set string or icon on the "return" key of the input panel.
+ *
+ * An input panel displays the string or icon associated with this type
+ *
+ * @param obj A valid Evas_Object handle
+ * @param part The part name
+ * @param return_key_type The type of "return" key on the input panel
+ * @since 1.2.0
+ */
+EAPI 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);
+
+/**
+ * Get the "return" key type.
+ *
+ * @see edje_object_part_text_input_panel_return_key_type_set() for more details
+ *
+ * @param obj A valid Evas_Object handle
+ * @param part The part name
+ * @return The type of "return" key on the input panel
+ * @since 1.2.0
+ */
+EAPI Edje_Input_Panel_Return_Key_Type edje_object_part_text_input_panel_return_key_type_get(const Evas_Object *obj, const char *part);
+
+/**
+ * Set the return key on the input panel to be disabled.
+ *
+ * @param obj A valid Evas_Object handle
+ * @param part The part name
+ * @param disabled The state
+ * @since 1.2.0
+ */
+EAPI void             edje_object_part_text_input_panel_return_key_disabled_set(Evas_Object *obj, const char *part, Eina_Bool disabled);
+
+/**
+ * Get whether the return key on the input panel should be disabled or not.
+ *
+ * @param obj A valid Evas_Object handle
+ * @param part The part name
+ * @return EINA_TRUE if it should be disabled
+ * @since 1.2.0
+ */
+EAPI Eina_Bool        edje_object_part_text_input_panel_return_key_disabled_get(const Evas_Object *obj, const char *part);
+
+/**
  * Add a filter function for newly inserted text.
  *
  * 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_
  * will make Edje break out of the filter cycle and reject the inserted
  * text.
  *
+ * @warning This function will be deprecated because of difficulty in use.
+ *          The type(format, text, or markup) of text should be always
+ *          checked in the filter function for correct filtering.
+ *          Please use edje_object_text_markup_filter_callback_add() instead. There
+ *          is no need to check the type of text in the filter function
+ *          because the text is always markup.
+ * @warning If you use this function with
+ *          edje_object_text_markup_filter_callback_add() together, all
+ *          Edje_Text_Filter_Cb functions and Edje_Markup_Filter_Cb functions
+ *          will be executed, and then filtered text will be inserted.
+ *
  * @see edje_object_text_insert_filter_callback_del
  * @see edje_object_text_insert_filter_callback_del_full
+ * @see edje_object_text_markup_filter_callback_add
  *
  * @param obj A valid Evas_Object handle
  * @param part The part name
@@ -2920,7 +3000,7 @@ EAPI void             edje_object_text_insert_filter_callback_add       (Evas_Ob
  * @param part The part name
  * @param func The function callback to remove
  *
- * @return The user data pointer if succesful, or NULL otherwise
+ * @return The user data pointer if successful, or NULL otherwise
  */
 EAPI void            *edje_object_text_insert_filter_callback_del       (Evas_Object *obj, const char *part, Edje_Text_Filter_Cb func);
 
@@ -2939,11 +3019,82 @@ EAPI void            *edje_object_text_insert_filter_callback_del       (Evas_Ob
  * @param func The function callback to remove
  * @param data The data passed to the callback function
  *
- * @return The same data pointer if succesful, or NULL otherwise
+ * @return The same data pointer if successful, or NULL otherwise
  */
 EAPI void            *edje_object_text_insert_filter_callback_del_full  (Evas_Object *obj, const char *part, Edje_Text_Filter_Cb func, void *data);
 
 /**
+ * Add a markup filter function for newly inserted text.
+ *
+ * Whenever text is inserted (not the same as set) into the given @p part,
+ * the list of markup filter functions will be called to decide if and how 
+ * the new text will be accepted.
+ * The text parameter in the @p func filter is always markup. It can be 
+ * modified by the user and it's up to him to free the one passed if he's to
+ * change the pointer. If doing so, the newly set text should be malloc'ed,
+ * as once all the filters are called Edje will free it.
+ * If the text is to be rejected, freeing it and setting the pointer to NULL
+ * will make Edje break out of the filter cycle and reject the inserted
+ * text.
+ * This function is different from edje_object_text_insert_filter_callback_add()
+ * in that the text parameter in the @p fucn filter is always markup.
+ *
+ * @warning If you use this function with
+ *          edje_object_text_insert_filter_callback_add() togehter, all
+ *          Edje_Text_Filter_Cb functions and Edje_Markup_Filter_Cb functions
+ *          will be executed, and then filtered text will be inserted.
+ *
+ * @see edje_object_text_markup_filter_callback_del
+ * @see edje_object_text_markup_filter_callback_del_full
+ * @see edje_object_text_insert_filter_callback_add
+ *
+ * @param obj A valid Evas_Object handle
+ * @param part The part name
+ * @param func The callback function that will act as markup filter
+ * @param data User provided data to pass to the filter function
+ * @since 1.2.0
+ */
+EAPI void edje_object_text_markup_filter_callback_add(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func, void *data);
+
+/**
+ * Delete a function from the markup filter list.
+ *
+ * Delete the given @p func filter from the list in @p part. Returns
+ * the user data pointer given when added.
+ *
+ * @see edje_object_text_markup_filter_callback_add
+ * @see edje_object_text_markup_filter_callback_del_full
+ *
+ * @param obj A valid Evas_Object handle
+ * @param part The part name
+ * @param func The function callback to remove
+ *
+ * @return The user data pointer if successful, or NULL otherwise
+ * @since 1.2.0
+ */
+EAPI void *edje_object_text_markup_filter_callback_del(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func);
+
+/**
+ * Delete a function and matching user data from the markup filter list.
+ *
+ * Delete the given @p func filter and @p data user data from the list
+ * in @p part.
+ * Returns the user data pointer given when added.
+ *
+ * @see edje_object_text_markup_filter_callback_add
+ * @see edje_object_text_markup_filter_callback_del
+ *
+ * @param obj A valid Evas_Object handle
+ * @param part The part name
+ * @param func The function callback to remove
+ * @param data The data passed to the callback function
+ *
+ * @return The same data pointer if successful, or NULL otherwise
+ * @since 1.2.0
+ */
+EAPI void *edje_object_text_markup_filter_callback_del_full(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func, void *data);
+
+/**
  * @brief Swallows an object into the edje.
  *
  * @param obj A valid Evas_Object handle
@@ -3244,7 +3395,7 @@ EAPI Eina_Bool                 edje_object_part_external_param_set      (Evas_Ob
  *
  * Parts of type external may carry extra properties that have
  * meanings defined by the external plugin. For instance, it may be a
- * string that defines a button label. This property can be modifed by
+ * string that defines a button label. This property can be modified by
  * state parameters, by explicit calls to
  * edje_object_part_external_param_set() or getting the actual object
  * 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
     * This sets the parameters of the perspective transformation. X, Y and Z
     * values are used. The px and py points specify the "infinite distance" point
     * in the 3D conversion (where all lines converge to like when artists draw
-    * 3D by hand). The @p z0 value specifis the z value at which there is a 1:1
-    * mapping between spatial coorinates and screen coordinates. Any points
+    * 3D by hand). The @p z0 value specifies the z value at which there is a 1:1
+    * mapping between spatial coordinates and screen coordinates. Any points
     * on this z value will not have their X and Y values modified in the transform.
     * Those further away (Z value higher) will shrink into the distance, and
     * 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
     * control and @p foc must be greater than 0.
     *
     * @param m map to change.
-    * @param px The pespective distance X coordinate
-    * @param py The pespective distance Y coordinate
+    * @param px The perspective distance X coordinate
+    * @param py The perspective distance Y coordinate
     * @param z0 The "0" z plane value
     * @param foc The focal distance
     */
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@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PYTHON = @PYTHON@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
 PYTHON_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)
    edc->references = 1;
    edc->part = ce->entry;
 
-   /* For Edje file build with Edje 1.0, people expect text.align to be 0.0 0.0 */
+   /* For Edje file build with Edje 1.0 */
    if (edf->version <= 3 && edf->minor <= 1)
      {
         /* This will preserve previous rendering */
         unsigned int i;
 
+        /* people expect signal to not be broadcasted */
+        edc->broadcast_signal = EINA_FALSE;
+
+        /* people expect text.align to be 0.0 0.0 */
         for (i = 0; i < edc->parts_count; ++i)
           {
              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
         break;
       case EDJE_TWEEN_MODE_DECELERATE:
         npos = FROM_DOUBLE(ecore_animator_pos_map(TO_DOUBLE(pos),
-                                                  ECORE_POS_MAP_DECELERATE, 
+                                                  ECORE_POS_MAP_DECELERATE,
                                                   0.0, 0.0));
         break;
       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
         npos = fp_pos;
         break;
      }
-#endif   
+#endif
    if (npos == ep->description_pos) return;
 
    ep->description_pos = npos;
@@ -564,7 +564,7 @@ _edje_part_description_apply(Edje *ed, Edje_Real_Part *ep, const char *d1, doubl
 
         _edje_real_part_rel_to_apply(ed, ep, ep->param2);
 
-        if (ep->description_pos != 0.0)
+        if (ep->description_pos > FROM_DOUBLE(0.0))
           ep->chosen_description = epd2;
      }
 
@@ -572,6 +572,7 @@ _edje_part_description_apply(Edje *ed, Edje_Real_Part *ep, const char *d1, doubl
        ep->part->type == EDJE_PART_TYPE_EXTERNAL)
      _edje_external_recalc_apply(ed, ep, NULL, chosen_desc);
 
+   ed->recalc_hints = 1;
    ed->dirty = 1;
    ed->recalc_call = 1;
 #ifdef EDJE_CALC_CACHE
@@ -650,6 +651,16 @@ _edje_recalc_do(Edje *ed)
    else
      evas_object_smart_need_recalculate_set(ed->obj, need_calc);
    ed->recalc_call = 0;
+
+   if (ed->update_hints && ed->recalc_hints && !ed->calc_only)
+     {
+        Evas_Coord w, h;
+
+        ed->recalc_hints = 0;
+
+        edje_object_size_min_calc(ed->obj, &w, &h);
+        evas_object_size_hint_min_set(ed->obj, w, h);
+     }
 }
 
 void
@@ -1746,7 +1757,6 @@ _edje_part_recalc_single_min_max(FLOAT_T sc,
           }
      }
 
-
    /* XXX TODO: remove need of EDJE_INF_MAX_H, see edje_util.c */
    if ((ep->swallow_params.max.h <= 0) ||
        (ep->swallow_params.max.h == EDJE_INF_MAX_H))
@@ -1810,9 +1820,9 @@ _edje_part_recalc_single_map(Edje *ed,
      }
    params->map.center.z = 0;
 
-   params->map.rotation.x = TO_DOUBLE(desc->map.rot.x);
-   params->map.rotation.y = TO_DOUBLE(desc->map.rot.y);
-   params->map.rotation.z = TO_DOUBLE(desc->map.rot.z);
+   params->map.rotation.x = desc->map.rot.x;
+   params->map.rotation.y = desc->map.rot.y;
+   params->map.rotation.z = desc->map.rot.z;
 
    if (light)
      {
@@ -1907,7 +1917,7 @@ _edje_part_recalc_single(Edje *ed,
    sc = ed->scale;
    if (sc == ZERO) sc = _edje_scale;
    _edje_part_recalc_single_min_max(sc, ep, desc, &minw, &minh, &maxw, &maxh);
-   
+
    /* relative coords of top left & bottom right */
    _edje_part_recalc_single_rel(ed, ep, desc, rel1_to_x, rel1_to_y, rel2_to_x, rel2_to_y, params);
 
@@ -1959,6 +1969,29 @@ _edje_part_recalc_single(Edje *ed,
              if (lminh > minh) minh = lminh;
           }
      }
+   else if ((ep->part->type == EDJE_PART_TYPE_IMAGE) &&
+            (chosen_desc->min.limit || chosen_desc->max.limit))
+     {
+        Evas_Coord w, h;
+
+        /* We only need pos to find the right image that would be displayed */
+        /* Yes, if someone set aspect preference to SOURCE and also max,min
+           to SOURCE, it will be under efficient, but who cares at the
+           moment. */
+        _edje_real_part_image_set(ed, ep, pos);
+        evas_object_image_size_get(ep->object, &w, &h);
+
+        if (chosen_desc->min.limit)
+          {
+             if (w > minw) minw = w;
+             if (h > minh) minh = h;
+          }
+        if (chosen_desc->max.limit)
+          {
+             if ((maxw <= 0) || (w < maxw)) maxw = w;
+             if ((maxh <= 0) || (h < maxh)) maxh = h;
+          }
+     }
 
    /* remember what our size is BEFORE we go limit it */
    params->req.x = params->x;
@@ -2259,6 +2292,23 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
 #endif
         return;
      }
+
+   if (ep->part->scale &&
+       ep->part->type == EDJE_PART_TYPE_GROUP &&
+       ep->swallowed_object)
+     {
+        edje_object_scale_set(ep->swallowed_object, TO_DOUBLE(ed->scale));
+
+        if (ep->description_pos > FROM_DOUBLE(0.5) && ep->param2)
+          {
+             edje_object_update_hints_set(ep->swallowed_object, ep->param2->description->min.limit);
+          }
+        else
+          {
+             edje_object_update_hints_set(ep->swallowed_object, ep->param1.description->min.limit);
+          }
+     }
+
 #ifdef EDJE_CALC_CACHE
    if (ep->state == ed->state && !state)
      return ;
@@ -2426,7 +2476,8 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
                                       p1, pos);
 
 #ifdef EDJE_CALC_CACHE
-             ep->param1.state = ed->state;
+             if (flags == FLAG_XY)
+               ep->param1.state = ed->state;
 #endif
           }
      }
@@ -2478,7 +2529,8 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
                                       confine_to,
                                       p2, pos);
 #ifdef EDJE_CALC_CACHE
-             ep->param2->state = ed->state;
+             if (flags == FLAG_XY)
+               ep->param2->state = ed->state;
 #endif
           }
 
@@ -2806,7 +2858,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
                }
 
              evas_map_util_3d_rotate(map,
-                                     pf->map.rotation.x, pf->map.rotation.y, pf->map.rotation.z,
+                                     TO_DOUBLE(pf->map.rotation.x), TO_DOUBLE(pf->map.rotation.y), TO_DOUBLE(pf->map.rotation.z),
                                      pf->map.center.x, pf->map.center.y, pf->map.center.z);
 
              // 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)
       EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "minmul.h", minmul.h, EDJE_T_FLOAT); \
       EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "min.w", min.w, EET_T_INT); \
       EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "min.h", min.h, EET_T_INT); \
+      EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "min.limit", min.limit, EET_T_UCHAR); \
       EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "max.w", max.w, EET_T_INT); \
       EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "max.h", max.h, EET_T_INT); \
+      EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "max.limit", max.limit, EET_T_UCHAR); \
       EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "step.x", step.x, EET_T_INT); \
       EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "step.y", step.y, EET_T_INT); \
       EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "aspect.min", aspect.min, EDJE_T_FLOAT); \
@@ -877,4 +879,5 @@ _edje_edd_init(void)
    EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_collection, Edje_Part_Collection, "script_only", script_only, EET_T_UCHAR);
    EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_collection, Edje_Part_Collection, "lua_script_only", lua_script_only, EET_T_UCHAR);
    EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_collection, Edje_Part_Collection, "prop.orientation", prop.orientation, EET_T_INT);
+   EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_collection, Edje_Part_Collection, "broadcast_signal", broadcast_signal, EET_T_UCHAR);
 }
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;
 typedef struct _Anchor Anchor;
 
 static void _edje_entry_imf_cursor_info_set(Entry *en);
-static void _edje_entry_imf_context_reset(Entry *en);
 
 struct _Entry
 {
@@ -29,12 +28,15 @@ struct _Entry
    Eina_List *anchorlist;
    Eina_List *itemlist;
    char *selection;
+   Edje_Input_Panel_Lang input_panel_lang;
    Eina_Bool selecting : 1;
    Eina_Bool have_selection : 1;
    Eina_Bool select_allow : 1;
    Eina_Bool select_mod_start : 1;
    Eina_Bool select_mod_end : 1;
    Eina_Bool had_sel : 1;
+   Eina_Bool input_panel_enable : 1;
+   Eina_Bool prediction_allow : 1;
 
 #ifdef HAVE_ECORE_IMF
    Eina_Bool have_preedit : 1;
@@ -179,6 +181,27 @@ _edje_focus_out_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
 }
 
 static void
+_text_filter_markup_prepend_internal(Entry *en, Evas_Textblock_Cursor *c, char *text)
+{
+   Edje_Markup_Filter_Callback *cb;
+   Eina_List *l;
+
+   EINA_LIST_FOREACH(en->rp->edje->markup_filter_callbacks, l, cb)
+     {
+        if (!strcmp(cb->part, en->rp->part->name))
+          {
+             cb->func(cb->data, en->rp->edje->obj, cb->part, &text);
+             if (!text) break;
+          }
+     }
+   if (text)
+     {
+        evas_object_textblock_text_markup_prepend(c, text);
+        free(text);
+     }
+}
+
+static void
 _text_filter_text_prepend(Entry *en, Evas_Textblock_Cursor *c, const char *text)
 {
    char *text2;
@@ -196,8 +219,11 @@ _text_filter_text_prepend(Entry *en, Evas_Textblock_Cursor *c, const char *text)
      }
    if (text2)
      {
-        evas_textblock_cursor_text_prepend(c, text2);
+        char *markup_text;
+        markup_text = evas_textblock_text_utf8_to_markup(NULL, text2);
         free(text2);
+        if (markup_text)
+          _text_filter_markup_prepend_internal(en, c, markup_text);
      }
 }
 
@@ -219,8 +245,61 @@ _text_filter_format_prepend(Entry *en, Evas_Textblock_Cursor *c, const char *tex
      }
    if (text2)
      {
-        evas_textblock_cursor_format_prepend(c, text2);
+        char *s, *markup_text;
+
+        s = text2;
+        if (*s == '+')
+          {
+             s++;
+             while (*s == ' ') s++;
+             if (!s)
+               {
+                  free(text2);
+                  return;
+               }
+             markup_text = (char*) malloc(strlen(s) + 3);
+             if (markup_text)
+               {
+                  *(markup_text) = '<';
+                  strncpy((markup_text + 1), s, strlen(s));
+                  *(markup_text + strlen(s) + 1) = '>';
+                  *(markup_text + strlen(s) + 2) = '\0';
+               }
+          }
+        else if (s[0] == '-')
+          {
+             s++;
+             while (*s == ' ') s++;
+             if (!s)
+               {
+                  free(text2);
+                  return;
+               }
+             markup_text = (char*) malloc(strlen(s) + 4);
+             if (markup_text)
+               {
+                  *(markup_text) = '<';
+                  *(markup_text + 1) = '/';
+                  strncpy((markup_text + 2), s, strlen(s));
+                  *(markup_text + strlen(s) + 2) = '>';
+                  *(markup_text + strlen(s) + 3) = '\0';
+               }
+          }
+        else
+          {
+             markup_text = (char*) malloc(strlen(s) + 4);
+             if (markup_text)
+               {
+                  *(markup_text) = '<';
+                  strncpy((markup_text + 1), s, strlen(s));
+                  *(markup_text + strlen(s) + 1) = '/';
+                  *(markup_text + strlen(s) + 2) = '>';
+                  *(markup_text + strlen(s) + 3) = '\0';
+               }
+          }
         free(text2);
+        if (markup_text)
+          _text_filter_markup_prepend_internal(en, c, markup_text);
      }
 }
 
@@ -241,10 +320,7 @@ _text_filter_markup_prepend(Entry *en, Evas_Textblock_Cursor *c, const char *tex
           }
      }
    if (text2)
-     {
-        evas_object_textblock_text_markup_prepend(c, text2);
-        free(text2);
-     }
+     _text_filter_markup_prepend_internal(en, c, text2);
 }
 
 static void
@@ -397,7 +473,7 @@ static void
 _sel_extend(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en)
 {
    if (!en->sel_end) return;
-   _edje_entry_imf_context_reset(en);
+   _edje_entry_imf_context_reset(en->rp);
    _sel_enable(c, o, en);
    if (!evas_textblock_cursor_compare(c, en->sel_end)) return;
    evas_textblock_cursor_copy(c, en->sel_end);
@@ -413,7 +489,7 @@ static void
 _sel_preextend(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en)
 {
    if (!en->sel_end) return;
-   _edje_entry_imf_context_reset(en);
+   _edje_entry_imf_context_reset(en->rp);
    _sel_enable(c, o, en);
    if (!evas_textblock_cursor_compare(c, en->sel_start)) return;
    evas_textblock_cursor_copy(c, en->sel_start);
@@ -882,7 +958,7 @@ _anchors_get(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en)
              char *p;
              an = calloc(1, sizeof(Anchor));
              if (!an)
-                break;
+               break;
 
              an->en = en;
              p = strstr(s, "href=");
@@ -903,7 +979,7 @@ _anchors_get(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en)
                {
                   s = evas_textblock_node_format_text_get(node);
                   if ((!strcmp(s, "- a")) || (!strcmp(s, "-a")))
-                     break;
+                    break;
                }
 
              if (node)
@@ -932,7 +1008,7 @@ _anchors_get(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en)
              char *p;
              an = calloc(1, sizeof(Anchor));
              if (!an)
-                break;
+               break;
 
              an->en = en;
              an->item = 1;
@@ -986,12 +1062,14 @@ _range_del_emit(Edje *ed, Evas_Textblock_Cursor *c __UNUSED__, Evas_Object *o __
    _edje_emit(ed, "entry,changed", en->rp->part->name);
    _edje_emit_full(ed, "entry,changed,user", en->rp->part->name, info,
                    _free_entry_change_info);
+   _sel_clear(en->cursor, en->rp->object, en);
 }
 
 static void
 _range_del(Evas_Textblock_Cursor *c __UNUSED__, Evas_Object *o __UNUSED__, Entry *en)
 {
    evas_textblock_cursor_range_delete(en->sel_start, en->sel_end);
+   _sel_clear(en->cursor, en->rp->object, en);
 }
 
 static void
@@ -1041,7 +1119,7 @@ _edje_entry_hide_visible_password(Edje_Real_Part *rp)
              if (!strcmp(text, "+ password=off"))
                {
                   evas_textblock_node_format_remove_pair(rp->object,
-                                                        (Evas_Object_Textblock_Node_Format *) node);
+                                                         (Evas_Object_Textblock_Node_Format *) node);
                   break;
                }
           }
@@ -1075,7 +1153,7 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
    if ((!en) || (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) ||
        (rp->part->entry_mode < EDJE_ENTRY_EDIT_MODE_EDITABLE))
      return;
-   if (!ev->key) return;
+   if (!ev->keyname) return;
 
 #ifdef HAVE_ECORE_IMF
    if (en->imf_context)
@@ -1089,9 +1167,9 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
      }
 #endif
 
-   if ((!strcmp(ev->key, "Escape")) ||
-       (!strcmp(ev->key, "Return")) || (!strcmp(ev->key, "KP_Enter")))
-     _edje_entry_imf_context_reset(en);
+   if ((!strcmp(ev->keyname, "Escape")) ||
+       (!strcmp(ev->keyname, "Return")) || (!strcmp(ev->keyname, "KP_Enter")))
+     _edje_entry_imf_context_reset(rp);
 
    old_cur_pos = evas_textblock_cursor_pos_get(en->cursor);
 
@@ -1100,13 +1178,13 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
    shift = evas_key_modifier_is_set(ev->modifiers, "Shift");
    multiline = rp->part->multiline;
    cursor_changed = EINA_FALSE;
-   if (!strcmp(ev->key, "Escape"))
+   if (!strcmp(ev->keyname, "Escape"))
      {
         // dead keys here. Escape for now (should emit these)
         _edje_emit(ed, "entry,key,escape", rp->part->name);
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
      }
-   else if (!strcmp(ev->key, "Up") || !strcmp(ev->key, "KP_Up"))
+   else if (!strcmp(ev->keyname, "Up") || !strcmp(ev->keyname, "KP_Up"))
      {
         if (multiline)
           {
@@ -1119,14 +1197,14 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
              if (en->select_allow)
                {
                   if (shift) _sel_extend(en->cursor, rp->object, en);
+                  else _sel_clear(en->cursor, rp->object, en);
                }
              ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
           }
-        _sel_clear(en->cursor, rp->object, en);
         _edje_emit(ed, "entry,key,up", rp->part->name);
         _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name);
      }
-   else if (!strcmp(ev->key, "Down") || !strcmp(ev->key, "KP_Down"))
+   else if (!strcmp(ev->keyname, "Down") || !strcmp(ev->keyname, "KP_Down"))
      {
         if (multiline)
           {
@@ -1139,14 +1217,14 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
              if (en->select_allow)
                {
                   if (shift) _sel_extend(en->cursor, rp->object, en);
+                  else _sel_clear(en->cursor, rp->object, en);
                }
              ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
           }
-        _sel_clear(en->cursor, rp->object, en);
         _edje_emit(ed, "entry,key,down", rp->part->name);
         _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name);
      }
-   else if (!strcmp(ev->key, "Left") || !strcmp(ev->key, "KP_Left"))
+   else if (!strcmp(ev->keyname, "Left") || !strcmp(ev->keyname, "KP_Left"))
      {
         if (en->select_allow)
           {
@@ -1159,13 +1237,13 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
         if (en->select_allow)
           {
              if (shift) _sel_extend(en->cursor, rp->object, en);
+             else _sel_clear(en->cursor, rp->object, en);
           }
-        _sel_clear(en->cursor, rp->object, en);
         _edje_emit(ed, "entry,key,left", rp->part->name);
         _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name);
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
      }
-   else if (!strcmp(ev->key, "Right") || !strcmp(ev->key, "KP_Right"))
+   else if (!strcmp(ev->keyname, "Right") || !strcmp(ev->keyname, "KP_Right"))
      {
         if (en->select_allow)
           {
@@ -1178,13 +1256,13 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
         if (en->select_allow)
           {
              if (shift) _sel_extend(en->cursor, rp->object, en);
+             else _sel_clear(en->cursor, rp->object, en);
           }
-        _sel_clear(en->cursor, rp->object, en);
         _edje_emit(ed, "entry,key,right", rp->part->name);
         _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name);
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
      }
-   else if (!strcmp(ev->key, "BackSpace"))
+   else if (!strcmp(ev->keyname, "BackSpace"))
      {
         if (control && !en->have_selection)
           {
@@ -1221,7 +1299,7 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
         _edje_emit(ed, "entry,key,backspace", rp->part->name);
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
      }
-   else if (!strcmp(ev->key, "Delete") || !strcmp(ev->key, "KP_Delete"))
+   else if (!strcmp(ev->keyname, "Delete") || !strcmp(ev->keyname, "KP_Delete"))
      {
         if (control)
           {
@@ -1255,7 +1333,7 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
         _edje_emit(ed, "entry,key,delete", rp->part->name);
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
      }
-   else if (!strcmp(ev->key, "Home") || !strcmp(ev->key, "KP_Home"))
+   else if (!strcmp(ev->keyname, "Home") || !strcmp(ev->keyname, "KP_Home"))
      {
         if (en->select_allow)
           {
@@ -1273,7 +1351,7 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
         _edje_emit(ed, "entry,key,home", rp->part->name);
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
      }
-   else if (!strcmp(ev->key, "End") || !strcmp(ev->key, "KP_End"))
+   else if (!strcmp(ev->keyname, "End") || !strcmp(ev->keyname, "KP_End"))
      {
         if (en->select_allow)
           {
@@ -1291,33 +1369,36 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
         _edje_emit(ed, "entry,key,end", rp->part->name);
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
      }
-   else if ((control) && (!strcmp(ev->key, "v")))
+   else if ((control) && (!shift) && (!strcmp(ev->keyname, "v")))
      {
         _edje_emit(ed, "entry,paste,request", rp->part->name);
         _edje_emit(ed, "entry,paste,request,3", rp->part->name);
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
      }
-   else if ((control) && (!strcmp(ev->key, "a")))
+   else if ((control) && (!strcmp(ev->keyname, "a")))
      {
-          _edje_emit(ed, "entry,selection,all,request", rp->part->name);
-        ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
-     }
-   else if ((control) && (!strcmp(ev->key, "A")))
-     {
-          _edje_emit(ed, "entry,selection,none,request", rp->part->name);
-        ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
+        if (shift)
+          {
+             _edje_emit(ed, "entry,selection,none,request", rp->part->name);
+             ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
+          }
+        else
+          {
+             _edje_emit(ed, "entry,selection,all,request", rp->part->name);
+             ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
+          }
      }
-   else if ((control) && ((!strcmp(ev->key, "c") || (!strcmp(ev->key, "Insert")))))
+   else if ((control) && (((!shift) && !strcmp(ev->keyname, "c")) || !strcmp(ev->keyname, "Insert")))
      {
         _edje_emit(ed, "entry,copy,notify", rp->part->name);
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
      }
-   else if ((control) && ((!strcmp(ev->key, "x") || (!strcmp(ev->key, "m")))))
+   else if ((control) && (!shift) && ((!strcmp(ev->keyname, "x") || (!strcmp(ev->keyname, "m")))))
      {
         _edje_emit(ed, "entry,cut,notify", rp->part->name);
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
      }
-   else if ((control) && (!strcmp(ev->key, "z")))
+   else if ((control) && (!strcmp(ev->keyname, "z")))
      {
         if (shift)
           {
@@ -1331,19 +1412,19 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
           }
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
      }
-   else if ((control) && (!strcmp(ev->key, "y")))
+   else if ((control) && (!shift) && (!strcmp(ev->keyname, "y")))
      {
         // redo
         _edje_emit(ed, "entry,redo,request", rp->part->name);
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
      }
-   else if ((control) && (!strcmp(ev->key, "w")))
+   else if ((control) && (!shift) && (!strcmp(ev->keyname, "w")))
      {
         _sel_clear(en->cursor, rp->object, en);
         // select current word?
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
      }
-   else if (!strcmp(ev->key, "Tab"))
+   else if (!strcmp(ev->keyname, "Tab"))
      {
         if (multiline)
           {
@@ -1362,7 +1443,6 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
                        _range_del_emit(ed, en->cursor, rp->object, en);
                        info->merge = EINA_TRUE;
                     }
-                  _sel_clear(en->cursor, rp->object, en);
                   info->change.insert.pos =
                      evas_textblock_cursor_pos_get(en->cursor);
                   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
           }
         _edje_emit(ed, "entry,key,tab", rp->part->name);
      }
-   else if ((!strcmp(ev->key, "ISO_Left_Tab")) && (multiline))
+   else if ((!strcmp(ev->keyname, "ISO_Left_Tab")) && (multiline))
      {
         // remove a tab
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
      }
-   else if (!strcmp(ev->key, "Prior") || !strcmp(ev->key, "KP_Prior"))
+   else if (!strcmp(ev->keyname, "Prior") || !strcmp(ev->keyname, "KP_Prior"))
      {
         if (en->select_allow)
           {
@@ -1394,12 +1474,12 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
         if (en->select_allow)
           {
              if (shift) _sel_extend(en->cursor, rp->object, en);
+             else _sel_clear(en->cursor, rp->object, en);
           }
-        _sel_clear(en->cursor, rp->object, en);
         _edje_emit(ed, "entry,key,pgup", rp->part->name);
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
      }
-   else if (!strcmp(ev->key, "Next") || !strcmp(ev->key, "KP_Next"))
+   else if (!strcmp(ev->keyname, "Next") || !strcmp(ev->keyname, "KP_Next"))
      {
         if (en->select_allow)
           {
@@ -1410,12 +1490,12 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
         if (en->select_allow)
           {
              if (shift) _sel_extend(en->cursor, rp->object, en);
+             else _sel_clear(en->cursor, rp->object, en);
           }
-        _sel_clear(en->cursor, rp->object, en);
         _edje_emit(ed, "entry,key,pgdn", rp->part->name);
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
      }
-   else if ((!strcmp(ev->key, "Return")) || (!strcmp(ev->key, "KP_Enter")))
+   else if ((!strcmp(ev->keyname, "Return")) || (!strcmp(ev->keyname, "KP_Enter")))
      {
         if (multiline)
           {
@@ -1427,7 +1507,6 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
                   _range_del_emit(ed, en->cursor, rp->object, en);
                   info->merge = EINA_TRUE;
                }
-             _sel_clear(en->cursor, rp->object, en);
 
              info->change.insert.pos =
                 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
                   _range_del_emit(ed, en->cursor, rp->object, en);
                   info->merge = EINA_TRUE;
                }
-             _sel_clear(en->cursor, rp->object, en);
 
              info->change.insert.pos =
                 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
      }
 #endif
 
-   _edje_entry_imf_context_reset(en);
+   _edje_entry_imf_context_reset(rp);
 
    en->select_mod_start = EINA_FALSE;
    en->select_mod_end = EINA_FALSE;
@@ -1593,8 +1671,35 @@ _edje_part_mouse_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS
    if (ev->button == 2) dosel = EINA_FALSE;
    if (dosel)
      {
-        // double click -> select word
-        // triple click -> select line
+        if (ev->flags & EVAS_BUTTON_TRIPLE_CLICK)
+          {
+             en->have_selection = EINA_FALSE;
+             en->selecting = EINA_FALSE;
+             _sel_clear(en->cursor, rp->object, en);
+             tc = evas_object_textblock_cursor_new(rp->object);
+             evas_textblock_cursor_copy(en->cursor, tc);
+             evas_textblock_cursor_line_char_first(en->cursor);
+             _sel_start(en->cursor, rp->object, en);
+             evas_textblock_cursor_line_char_last(en->cursor);
+             _sel_extend(en->cursor, rp->object, en);
+
+             goto end;
+          }
+        else if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
+          {
+             en->have_selection = EINA_FALSE;
+             en->selecting = EINA_FALSE;
+             _sel_clear(en->cursor, rp->object, en);
+             tc = evas_object_textblock_cursor_new(rp->object);
+             evas_textblock_cursor_copy(en->cursor, tc);
+             evas_textblock_cursor_word_start(en->cursor);
+             _sel_start(en->cursor, rp->object, en);
+             evas_textblock_cursor_word_end(en->cursor);
+             evas_textblock_cursor_char_next(en->cursor);
+             _sel_extend(en->cursor, rp->object, en);
+
+             goto end;
+          }
      }
    tc = evas_object_textblock_cursor_new(rp->object);
    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
                }
           }
      }
+ end:
    if (evas_textblock_cursor_compare(tc, en->cursor))
      {
         _edje_emit(rp->edje, "cursor,changed", rp->part->name);
         _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name);
      }
    evas_textblock_cursor_free(tc);
-   
+
    _edje_entry_imf_cursor_info_set(en);
 
    _edje_entry_real_part_configure(rp);
@@ -1724,6 +1830,8 @@ _edje_part_mouse_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED
    if (ev->button != 1) return;
    if (!rp) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
+   if (ev->flags & EVAS_BUTTON_TRIPLE_CLICK) return;
+   if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) return;
    en = rp->entry_data;
    if ((!en) || (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) ||
        (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
      }
 #endif
 
-   _edje_entry_imf_context_reset(en);
+   _edje_entry_imf_context_reset(rp);
 
    tc = evas_object_textblock_cursor_new(rp->object);
    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
           }
         evas_textblock_cursor_free(tc);
 
-        _edje_entry_imf_context_reset(en);
+        _edje_entry_imf_context_reset(rp);
         _edje_entry_imf_cursor_info_set(en);
 
         _edje_entry_real_part_configure(rp);
@@ -2035,6 +2143,8 @@ _edje_entry_real_part_init(Edje_Real_Part *rp)
      {
         evas_object_show(en->cursor_bg);
         evas_object_show(en->cursor_fg);
+        en->input_panel_enable = EINA_TRUE;
+
 #ifdef HAVE_ECORE_IMF
         ecore_imf_init();
 
@@ -2078,6 +2188,9 @@ _edje_entry_real_part_init(Edje_Real_Part *rp)
         ecore_imf_context_input_mode_set(en->imf_context,
                                          rp->part->entry_mode == EDJE_ENTRY_EDIT_MODE_PASSWORD ?
                                          ECORE_IMF_INPUT_MODE_INVISIBLE : ECORE_IMF_INPUT_MODE_FULL);
+
+        if (rp->part->entry_mode == EDJE_ENTRY_EDIT_MODE_PASSWORD)
+          ecore_imf_context_input_panel_language_set(en->imf_context, ECORE_IMF_INPUT_PANEL_LANG_ALPHABET);
 #endif
      }
 #ifdef HAVE_ECORE_IMF
@@ -2111,9 +2224,9 @@ _edje_entry_real_part_shutdown(Edje_Real_Part *rp)
      {
         if (en->imf_context)
           {
-              ecore_imf_context_event_callback_del(en->imf_context, ECORE_IMF_CALLBACK_COMMIT, _edje_entry_imf_event_commit_cb);
-              ecore_imf_context_event_callback_del(en->imf_context, ECORE_IMF_CALLBACK_DELETE_SURROUNDING, _edje_entry_imf_event_delete_surrounding_cb);
-              ecore_imf_context_event_callback_del(en->imf_context, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, _edje_entry_imf_event_preedit_changed_cb);
+             ecore_imf_context_event_callback_del(en->imf_context, ECORE_IMF_CALLBACK_COMMIT, _edje_entry_imf_event_commit_cb);
+             ecore_imf_context_event_callback_del(en->imf_context, ECORE_IMF_CALLBACK_DELETE_SURROUNDING, _edje_entry_imf_event_delete_surrounding_cb);
+             ecore_imf_context_event_callback_del(en->imf_context, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, _edje_entry_imf_event_preedit_changed_cb);
 
              ecore_imf_context_del(en->imf_context);
              en->imf_context = NULL;
@@ -2192,7 +2305,7 @@ _edje_entry_text_markup_set(Edje_Real_Part *rp, const char *text)
 {
    Entry *en = rp->entry_data;
    if (!en) return;
-   _edje_entry_imf_context_reset(en);
+   _edje_entry_imf_context_reset(rp);
    // set text as markup
    _sel_clear(en->cursor, rp->object, en);
    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)
 {
    Entry *en = rp->entry_data;
    if (!en) return;
-   _edje_entry_imf_context_reset(en);
+   _edje_entry_imf_context_reset(rp);
 
    // prepend markup @ cursor pos
    if (en->have_selection)
      _range_del(en->cursor, rp->object, en);
-   _sel_clear(en->cursor, rp->object, en);
    //xx
 //   evas_object_textblock_text_markup_prepend(en->cursor, text);
    _text_filter_markup_prepend(en, en->cursor, text);
@@ -2282,7 +2394,7 @@ _edje_entry_select_all(Edje_Real_Part *rp)
    Entry *en = rp->entry_data;
    if (!en) return;
 
-   _edje_entry_imf_context_reset(en);
+   _edje_entry_imf_context_reset(rp);
 
    _sel_clear(en->cursor, rp->object, en);
    _curs_start(en->cursor, rp->object, en);
@@ -2301,7 +2413,7 @@ _edje_entry_select_begin(Edje_Real_Part *rp)
    Entry *en = rp->entry_data;
    if (!en) return;
 
-   _edje_entry_imf_context_reset(en);
+   _edje_entry_imf_context_reset(rp);
 
    _sel_clear(en->cursor, rp->object, en);
    _sel_enable(en->cursor, rp->object, en);
@@ -2318,7 +2430,7 @@ _edje_entry_select_extend(Edje_Real_Part *rp)
 {
    Entry *en = rp->entry_data;
    if (!en) return;
-   _edje_entry_imf_context_reset(en);
+   _edje_entry_imf_context_reset(rp);
    _sel_extend(en->cursor, rp->object, en);
 
    _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 *
 }
 
 void
+_edje_entry_user_insert(Edje_Real_Part *rp, const char *text)
+{
+   Entry *en = rp->entry_data;
+   Edje_Entry_Change_Info *info = calloc(1, sizeof(*info));
+   info->insert = EINA_TRUE;
+   info->change.insert.plain_length = 1;
+   info->change.insert.content = eina_stringshare_add(text);
+     {
+        char *tmp;
+        tmp = evas_textblock_text_markup_to_utf8(rp->object,
+                                                 info->change.insert.content);
+        info->change.insert.plain_length = eina_unicode_utf8_get_len(tmp);
+        free(tmp);
+     }
+
+   if (en->have_selection)
+     {
+        _range_del_emit(rp->edje, en->cursor, rp->object, en);
+        info->merge = EINA_TRUE;
+     }
+   info->change.insert.pos = evas_textblock_cursor_pos_get(en->cursor);
+   _text_filter_text_prepend(en, en->cursor, text);
+   _edje_emit(rp->edje, "entry,changed", rp->part->name);
+   _edje_emit_full(rp->edje, "entry,changed,user", rp->part->name,
+                   info, _free_entry_change_info);
+   _edje_emit(rp->edje, "cursor,changed", rp->part->name);
+}
+
+void
 _edje_entry_select_allow_set(Edje_Real_Part *rp, Eina_Bool allow)
 {
    Entry *en = rp->entry_data;
@@ -2463,12 +2604,25 @@ _edje_entry_select_abort(Edje_Real_Part *rp)
      {
         en->selecting = EINA_FALSE;
 
-        _edje_entry_imf_context_reset(en);
+        _edje_entry_imf_context_reset(rp);
         _edje_entry_imf_cursor_info_set(en);
         _edje_entry_real_part_configure(rp);
      }
 }
 
+void *
+_edje_entry_imf_context_get(Edje_Real_Part *rp)
+{
+   Entry *en = rp->entry_data;
+   if (!en) return NULL;
+
+#ifdef HAVE_ECORE_IMF
+   return en->imf_context;
+#else
+   return NULL;
+#endif
+}
+
 void
 _edje_entry_autocapital_type_set(Edje_Real_Part *rp, Edje_Text_Autocapital_Type autocapital_type)
 {
@@ -2499,16 +2653,37 @@ _edje_entry_autocapital_type_get(Edje_Real_Part *rp)
 }
 
 void
+_edje_entry_prediction_allow_set(Edje_Real_Part *rp, Eina_Bool prediction)
+{
+   Entry *en = rp->entry_data;
+
+   if (!en) return;
+   en->prediction_allow = prediction;
+#ifdef HAVE_ECORE_IMF
+   if (en->imf_context)
+     ecore_imf_context_prediction_allow_set(en->imf_context, prediction);
+#endif
+}
+
+Eina_Bool
+_edje_entry_prediction_allow_get(Edje_Real_Part *rp)
+{
+   Entry *en = rp->entry_data;
+   if (!en) return EINA_FALSE;
+
+   return en->prediction_allow;
+}
+
+void
 _edje_entry_input_panel_enabled_set(Edje_Real_Part *rp, Eina_Bool enabled)
 {
    Entry *en = rp->entry_data;
 
    if (!en) return;
+   en->input_panel_enable = enabled;
 #ifdef HAVE_ECORE_IMF
    if (en->imf_context)
      ecore_imf_context_input_panel_enabled_set(en->imf_context, enabled);
-#else
-   (void) enabled;
 #endif
 }
 
@@ -2517,11 +2692,121 @@ _edje_entry_input_panel_enabled_get(Edje_Real_Part *rp)
 {
    Entry *en = rp->entry_data;
    if (!en) return EINA_FALSE;
+
+   return en->input_panel_enable;
+}
+
+void
+_edje_entry_input_panel_show(Edje_Real_Part *rp)
+{
+   Entry *en = rp->entry_data;
+
+   if (!en) return;
+#ifdef HAVE_ECORE_IMF
+   if (en->imf_context)
+     ecore_imf_context_input_panel_show(en->imf_context);
+#endif
+}
+
+void
+_edje_entry_input_panel_hide(Edje_Real_Part *rp)
+{
+   Entry *en = rp->entry_data;
+
+   if (!en) return;
 #ifdef HAVE_ECORE_IMF
    if (en->imf_context)
-     return ecore_imf_context_input_panel_enabled_get(en->imf_context);
+     ecore_imf_context_input_panel_hide(en->imf_context);
 #endif
+}
+
+void
+_edje_entry_input_panel_language_set(Edje_Real_Part *rp, Edje_Input_Panel_Lang lang)
+{
+   Entry *en = rp->entry_data;
 
+   if (!en) return;
+   en->input_panel_lang = lang;
+#ifdef HAVE_ECORE_IMF
+   if (en->imf_context)
+     ecore_imf_context_input_panel_language_set(en->imf_context, lang);
+#endif
+}
+
+Edje_Input_Panel_Lang
+_edje_entry_input_panel_language_get(Edje_Real_Part *rp)
+{
+   Entry *en = rp->entry_data;
+   if (!en) return EDJE_INPUT_PANEL_LANG_AUTOMATIC;
+
+   return en->input_panel_lang;
+}
+
+void
+_edje_entry_input_panel_imdata_set(Edje_Real_Part *rp, const void *data, int len)
+{
+   Entry *en = rp->entry_data;
+   if (!en) return;
+#ifdef HAVE_ECORE_IMF
+   if (en->imf_context)
+     ecore_imf_context_input_panel_imdata_set(en->imf_context, data, len);
+#endif
+}
+
+void
+_edje_entry_input_panel_imdata_get(Edje_Real_Part *rp, void *data, int *len)
+{
+   Entry *en = rp->entry_data;
+   if (!en) return;
+#ifdef HAVE_ECORE_IMF
+   if (en->imf_context)
+     ecore_imf_context_input_panel_imdata_get(en->imf_context, data, len);
+#endif
+}
+
+void 
+_edje_entry_input_panel_return_key_type_set(Edje_Real_Part *rp, Edje_Input_Panel_Return_Key_Type return_key_type)
+{
+   Entry *en = rp->entry_data;
+   if (!en) return;
+#ifdef HAVE_ECORE_IMF
+   if (en->imf_context)
+     ecore_imf_context_input_panel_return_key_type_set(en->imf_context, return_key_type);
+#endif
+}
+
+Edje_Input_Panel_Return_Key_Type 
+_edje_entry_input_panel_return_key_type_get(Edje_Real_Part *rp)
+{
+   Entry *en = rp->entry_data;
+   if (!en) return EDJE_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT;
+#ifdef HAVE_ECORE_IMF
+   if (en->imf_context)
+     return ecore_imf_context_input_panel_return_key_type_get(en->imf_context);
+#endif
+   return EDJE_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT;
+}
+
+void 
+_edje_entry_input_panel_return_key_disabled_set(Edje_Real_Part *rp, Eina_Bool disabled)
+{
+   Entry *en = rp->entry_data;
+   if (!en) return;
+#ifdef HAVE_ECORE_IMF
+   if (en->imf_context)
+     ecore_imf_context_input_panel_return_key_disabled_set(en->imf_context, disabled);
+#endif
+}
+
+Eina_Bool 
+_edje_entry_input_panel_return_key_disabled_get(Edje_Real_Part *rp)
+{
+   Entry *en = rp->entry_data;
+   if (!en) return EINA_FALSE;
+#ifdef HAVE_ECORE_IMF
+   if (en->imf_context)
+     return ecore_imf_context_input_panel_return_key_disabled_get(en->imf_context);
+#endif
    return EINA_FALSE;
 }
 
@@ -2568,7 +2853,7 @@ _edje_entry_cursor_next(Edje_Real_Part *rp, Edje_Cursor cur)
    Evas_Textblock_Cursor *c = _cursor_get(rp, cur);
    if (!c) return EINA_FALSE;
 
-   _edje_entry_imf_context_reset(en);
+   _edje_entry_imf_context_reset(rp);
 
    if (!evas_textblock_cursor_char_next(c))
      {
@@ -2589,7 +2874,7 @@ _edje_entry_cursor_prev(Edje_Real_Part *rp, Edje_Cursor cur)
    Evas_Textblock_Cursor *c = _cursor_get(rp, cur);
    if (!c) return EINA_FALSE;
 
-   _edje_entry_imf_context_reset(en);
+   _edje_entry_imf_context_reset(rp);
 
    if (!evas_textblock_cursor_char_prev(c))
      {
@@ -2615,7 +2900,7 @@ _edje_entry_cursor_up(Edje_Real_Part *rp, Edje_Cursor cur)
    int ln;
    if (!c) return EINA_FALSE;
 
-   _edje_entry_imf_context_reset(en);
+   _edje_entry_imf_context_reset(rp);
 
    ln = evas_textblock_cursor_line_geometry_get(c, NULL, NULL, NULL, NULL);
    ln--;
@@ -2649,7 +2934,7 @@ _edje_entry_cursor_down(Edje_Real_Part *rp, Edje_Cursor cur)
    int ln;
    if (!c) return EINA_FALSE;
 
-   _edje_entry_imf_context_reset(en);
+   _edje_entry_imf_context_reset(rp);
 
    ln = evas_textblock_cursor_line_geometry_get(c, NULL, NULL, NULL, NULL);
    ln++;
@@ -2679,7 +2964,7 @@ _edje_entry_cursor_begin(Edje_Real_Part *rp, Edje_Cursor cur)
    Evas_Textblock_Cursor *c = _cursor_get(rp, cur);
    if (!c) return;
 
-   _edje_entry_imf_context_reset(en);
+   _edje_entry_imf_context_reset(rp);
 
    evas_textblock_cursor_paragraph_first(c);
    _sel_update(c, rp->object, rp->entry_data);
@@ -2696,7 +2981,7 @@ _edje_entry_cursor_end(Edje_Real_Part *rp, Edje_Cursor cur)
    Evas_Textblock_Cursor *c = _cursor_get(rp, cur);
    if (!c) return;
 
-   _edje_entry_imf_context_reset(en);
+   _edje_entry_imf_context_reset(rp);
 
    _curs_end(c, rp->object, rp->entry_data);
    _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)
    evas_textblock_cursor_copy(c, d);
    _sel_update(c, rp->object, rp->entry_data);
 
-   _edje_entry_imf_context_reset(en);
+   _edje_entry_imf_context_reset(rp);
    _edje_entry_imf_cursor_info_set(en);
    _edje_emit(rp->edje, "cursor,changed", rp->part->name);
    _edje_entry_real_part_configure(rp);
@@ -2733,7 +3018,7 @@ _edje_entry_cursor_line_begin(Edje_Real_Part *rp, Edje_Cursor cur)
    Entry *en = rp->entry_data;
    Evas_Textblock_Cursor *c = _cursor_get(rp, cur);
    if (!c) return;
-   _edje_entry_imf_context_reset(en);
+   _edje_entry_imf_context_reset(rp);
 
    evas_textblock_cursor_line_char_first(c);
    _sel_update(c, rp->object, rp->entry_data);
@@ -2750,7 +3035,7 @@ _edje_entry_cursor_line_end(Edje_Real_Part *rp, Edje_Cursor cur)
    Entry *en = rp->entry_data;
    Evas_Textblock_Cursor *c = _cursor_get(rp, cur);
    if (!c) return;
-   _edje_entry_imf_context_reset(en);
+   _edje_entry_imf_context_reset(rp);
    evas_textblock_cursor_line_char_last(c);
    _sel_update(c, rp->object, rp->entry_data);
 
@@ -2810,9 +3095,9 @@ _edje_entry_cursor_pos_set(Edje_Real_Part *rp, Edje_Cursor cur, int pos)
    if (!c) return;
    /* Abort if cursor position didn't really change */
    if (evas_textblock_cursor_pos_get(c) == pos)
-      return;
+     return;
 
-   _edje_entry_imf_context_reset(en);
+   _edje_entry_imf_context_reset(rp);
    evas_textblock_cursor_pos_set(c, pos);
    _sel_update(c, rp->object, rp->entry_data);
 
@@ -2855,14 +3140,14 @@ _edje_entry_input_panel_layout_get(Edje_Real_Part *rp)
    return EDJE_INPUT_PANEL_LAYOUT_INVALID;
 }
 
-static void
-_edje_entry_imf_context_reset(Entry *en)
+void
+_edje_entry_imf_context_reset(Edje_Real_Part *rp)
 {
+   Entry *en = rp->entry_data;
+   if (!en) return;
 #ifdef HAVE_ECORE_IMF
    if (en->imf_context)
      ecore_imf_context_reset(en->imf_context);
-#else
-   (void) en;
 #endif
 }
 
@@ -3019,7 +3304,6 @@ _edje_entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx __UN
      {
         /* delete selected characters */
         _range_del_emit(ed, en->cursor, rp->object, en);
-        _sel_clear(en->cursor, rp->object, en);
      }
 
    /* 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)
    edf = _edje_cache_file_coll_open(file, NULL, &error_ret, NULL);
    if (!edf)
       return EINA_FALSE;
-   
+
    for (p = glob; *p; p++)
      {
        if ((*p == '*') || (*p == '?') || (*p == '['))
@@ -141,7 +141,7 @@ edje_file_group_exists(const char *file, const char *glob)
            break;
          }
      }
-  
+
    if (is_glob)
      {
        if (!edf->collection_patterns)
@@ -149,18 +149,18 @@ edje_file_group_exists(const char *file, const char *glob)
            Edje_Part_Collection_Directory_Entry *ce;
            Eina_Iterator *i;
            Eina_List *l = NULL;
-           
+
            i = eina_hash_iterator_data_new(edf->collection);
-           
+
            EINA_ITERATOR_FOREACH(i, ce)
              l = eina_list_append(l, ce);
-           
+
            eina_iterator_free(i);
-           
+
            edf->collection_patterns = edje_match_collection_dir_init(l);
            eina_list_free(l);
          }
-       
+
        succeed = edje_match_collection_dir_exec(edf->collection_patterns, glob);
        if (edf->collection_patterns)
          {
@@ -226,6 +226,20 @@ _edje_programs_patterns_init(Edje *ed)
    if (ssp->signals_patterns)
      return;
 
+   if (getenv("EDJE_DUMP_PROGRAMS"))
+     {
+       INF("Group '%s' programs:", ed->group);
+#define EDJE_DUMP_PROGRAM(Section)                                      \
+       for (i = 0; i < ed->collection->programs.Section##_count; i++)   \
+         INF(#Section" for ('%s', '%s')", ed->collection->programs.Section[i]->signal, ed->collection->programs.Section[i]->source);
+
+       EDJE_DUMP_PROGRAM(strcmp);
+       EDJE_DUMP_PROGRAM(strncmp);
+       EDJE_DUMP_PROGRAM(strrncmp);
+       EDJE_DUMP_PROGRAM(fnmatch);
+       EDJE_DUMP_PROGRAM(nocmp);
+     }
+
    edje_match_program_hash_build(ed->collection->programs.strcmp,
                                  ed->collection->programs.strcmp_count,
                                  &ssp->exact_match);
@@ -294,6 +308,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
 
    ed->load_error = EDJE_LOAD_ERROR_NONE;
    _edje_file_add(ed);
+   ed->block_break = 0;
 
    if (ed->file && ed->file->external_dir)
      {
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 @@
 
 #define RASTER_FORGOT_WHY "this is here."
 
-#ifdef _WIN32
-# define FMT_SIZE_T "%Iu"
-#else
-# define FMT_SIZE_T "%zu"
-#endif
 
 //--------------------------------------------------------------------------//
 #define MAX_LUA_MEM (4 * (1024 * 1024))
@@ -216,7 +211,7 @@ _elua_alloc(void *ud, void *ptr, size_t osize, size_t nsize)
    ela->cur += nsize - osize;
    if (ela->cur > ela->max)
      {
-        ERR("Lua memory limit of " FMT_SIZE_T " bytes reached (" FMT_SIZE_T  " allocated)",
+        ERR("Lua memory limit of %zu bytes reached (%zu allocated)",
             ela->max, ela->cur);
         return NULL;
      }
@@ -228,7 +223,7 @@ _elua_alloc(void *ud, void *ptr, size_t osize, size_t nsize)
 
    ptr2 = realloc(ptr, nsize);
    if (ptr2) return ptr2;
-   ERR("Lua cannot re-allocate " FMT_SIZE_T " bytes", nsize);
+   ERR("Lua cannot re-allocate %zu bytes", nsize);
    return ptr2;
 }
 
@@ -698,7 +693,7 @@ static int
 _elua_echo(lua_State *L)                         // Stack usage [-0, +0, v]
 {
    const char *string = luaL_checkstring(L, 1);  // Stack usage [-0, +0, v]
-   LD("%s\n", string);
+   LD("%s", string);
    return 0;
 }
 
@@ -2657,16 +2652,16 @@ _elua_edje_file(lua_State *L)                                   // Stack usage [
 
              switch (err)
                {
-                  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;
-                  case EDJE_LOAD_ERROR_GENERIC :                      LE("Edje file loading errer %s %s - generic error.\n", obj->ed->file->path, group);  break;
-                  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;
-                  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;
-                  case EDJE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED :   LE("Edje file loading errer %s %s - resource allocation failed.\n", obj->ed->file->path, group);  break;
-                  case EDJE_LOAD_ERROR_CORRUPT_FILE :                 LE("Edje file loading errer %s %s - corrupt file.\n", obj->ed->file->path, group);  break;
-                  case EDJE_LOAD_ERROR_UNKNOWN_FORMAT :               LE("Edje file loading errer %s %s - unknown file format.\n", obj->ed->file->path, group);  break;
-                  case EDJE_LOAD_ERROR_INCOMPATIBLE_FILE :            LE("Edje file loading errer %s %s - incompatible file.\n", obj->ed->file->path, group);  break;
-                  case EDJE_LOAD_ERROR_UNKNOWN_COLLECTION :           LE("Edje file loading errer %s %s - unknown group.\n", obj->ed->file->path, group);  break;
-                  case EDJE_LOAD_ERROR_RECURSIVE_REFERENCE :          LE("Edje file loading errer %s %s - recursive reference in group.\n", obj->ed->file->path, group);  break;
+                  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;
+                  case EDJE_LOAD_ERROR_GENERIC :                      LE("Edje file loading errer %s %s - generic error.", obj->ed->file->path, group);  break;
+                  case EDJE_LOAD_ERROR_DOES_NOT_EXIST :               LE("Edje file loading errer %s %s - file does not exist.", obj->ed->file->path, group);  break;
+                  case EDJE_LOAD_ERROR_PERMISSION_DENIED :            LE("Edje file loading errer %s %s - permission denied reading the file.", obj->ed->file->path, group);  break;
+                  case EDJE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED :   LE("Edje file loading errer %s %s - resource allocation failed.", obj->ed->file->path, group);  break;
+                  case EDJE_LOAD_ERROR_CORRUPT_FILE :                 LE("Edje file loading errer %s %s - corrupt file.", obj->ed->file->path, group);  break;
+                  case EDJE_LOAD_ERROR_UNKNOWN_FORMAT :               LE("Edje file loading errer %s %s - unknown file format.", obj->ed->file->path, group);  break;
+                  case EDJE_LOAD_ERROR_INCOMPATIBLE_FILE :            LE("Edje file loading errer %s %s - incompatible file.", obj->ed->file->path, group);  break;
+                  case EDJE_LOAD_ERROR_UNKNOWN_COLLECTION :           LE("Edje file loading errer %s %s - unknown group.", obj->ed->file->path, group);  break;
+                  case EDJE_LOAD_ERROR_RECURSIVE_REFERENCE :          LE("Edje file loading errer %s %s - recursive reference in group.", obj->ed->file->path, group);  break;
                }
           }
      }
@@ -2865,13 +2860,14 @@ _elua_image_image(lua_State *L)                                 // Stack usage [
              }
         }
 
-        /* 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.
         if (-1 == id)
           {
-             LI("Image %s not found in our edje file, trying external image file %s.\n", key, file);
+             LE("Image %s not found in our edje file.", key);
+             /* 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.
+             LI("Image %s not found in our edje file, trying external image file %s.", key, file);
              evas_object_image_file_set(elo->evas_obj, file, key);
+             */
           }
-        */
      }
    evas_object_image_file_get(elo->evas_obj, &file, &key);
    _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)
         eina_stringshare_del(cb->part);
         free(cb);
      }
+   EINA_LIST_FREE(ed->markup_filter_callbacks, cb)
+     {
+        eina_stringshare_del(cb->part);
+        free(cb);
+     }
 
    if (ed->members.text_class)
      {
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 @@
-#include "config.h"
-#include <string.h>
-#include <fcntl.h>
-#include <Eina.h>
-#include <Edje.h>
 #include "edje_private.h"
 
 typedef 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 @@
 # define _GNU_SOURCE
 #endif
 
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
 #ifdef HAVE_ALLOCA_H
 # include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
+#elif !defined alloca
+# ifdef __GNUC__
+#  define alloca __builtin_alloca
+# elif defined _AIX
+#  define alloca __alloca
+# elif defined _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
+# elif !defined HAVE_ALLOCA
+#  ifdef  __cplusplus
+extern "C"
+#  endif
 void *alloca (size_t);
+# endif
 #endif
 
 #include <string.h>
@@ -35,6 +47,8 @@ void *alloca (size_t);
 # include <unistd.h>
 #endif
 
+#include <fcntl.h>
+
 #include <lua.h>
 #include <lualib.h>
 #include <lauxlib.h>
@@ -62,7 +76,7 @@ void *alloca (size_t);
 
 #include "Edje.h"
 
-EAPI extern int _edje_default_log_dom ; 
+EAPI extern int _edje_default_log_dom ;
 
 #ifdef EDJE_DEFAULT_LOG_COLOR
 # undef EDJE_DEFAULT_LOG_COLOR
@@ -84,6 +98,10 @@ EAPI extern int _edje_default_log_dom ;
 # undef CRIT
 #endif
 #define CRIT(...) EINA_LOG_DOM_CRIT(_edje_default_log_dom, __VA_ARGS__)
+#ifdef DBG
+# undef DBG
+#endif
+#define DBG(...) EINA_LOG_DOM_DBG(_edje_default_log_dom, __VA_ARGS__)
 #ifdef __GNUC__
 # if __GNUC__ >= 4
 // BROKEN in gcc 4 on amd64
@@ -173,7 +191,7 @@ struct _Edje_Smart_Api
 /* increment this when you add new feature to edje file format without
  * breaking backward compatibility.
  */
-#define EDJE_FILE_MINOR 2
+#define EDJE_FILE_MINOR 3
 
 /* FIXME:
  *
@@ -218,6 +236,7 @@ struct _Edje_Position
 struct _Edje_Size
 {
    int w, h;
+   Eina_Bool limit; /* should we limit ourself to the size of the source */
 };
 
 struct _Edje_Rectangle
@@ -322,6 +341,7 @@ typedef struct _Edje_Var_Timer Edje_Var_Timer;
 typedef struct _Edje_Var_Pool Edje_Var_Pool;
 typedef struct _Edje_Signal_Source_Char Edje_Signal_Source_Char;
 typedef struct _Edje_Text_Insert_Filter_Callback Edje_Text_Insert_Filter_Callback;
+typedef struct _Edje_Markup_Filter_Callback Edje_Markup_Filter_Callback;
 
 #define EDJE_INF_MAX_W 100000
 #define EDJE_INF_MAX_H 100000
@@ -612,6 +632,8 @@ struct _Edje_Program /* a conditional program to be run */
       int src; /* part where parameter is being retrieved */
       int dst; /* part where parameter is being stored */
    } param;
+
+   Eina_Bool exec : 1;
 };
 
 struct _Edje_Program_Target /* the target of an action */
@@ -752,6 +774,8 @@ struct _Edje_Part_Collection
 
    unsigned char    lua_script_only;
 
+   unsigned char    broadcast_signal;
+
    unsigned char    checked : 1;
 };
 
@@ -839,7 +863,7 @@ struct _Edje_Part_Description_Common
       unsigned char have;
       FLOAT_T w, h;
    } minmul;
-   
+
    Edje_Size min, max;
    Edje_Position step; /* size stepping by n pixels, 0 = none */
    Edje_Aspect_Prefer aspect;
@@ -1074,6 +1098,7 @@ struct _Edje
    Edje_Real_Part       *focused_part;
    Eina_List            *subobjs;
    Eina_List            *text_insert_filter_callbacks;
+   Eina_List            *markup_filter_callbacks;
    void                 *script_only_data;
 
    int                   table_programs_size;
@@ -1145,6 +1170,8 @@ struct _Edje
 #endif
    unsigned int          have_mapped_part : 1;
    unsigned int          recalc_call : 1;
+   unsigned int          update_hints : 1;
+   unsigned int          recalc_hints : 1;
 };
 
 struct _Edje_Calc_Params
@@ -1179,7 +1206,7 @@ struct _Edje_Calc_Params
          int x, y, z;
       } center; // 12
       struct {
-         double x, y, z;
+         FLOAT_T x, y, z;
       } rotation; // 24
       struct {
          int x, y, z;
@@ -1334,6 +1361,13 @@ struct _Edje_Text_Insert_Filter_Callback
    void        *data;
 };
 
+struct _Edje_Markup_Filter_Callback
+{
+   const char  *part;
+   Edje_Markup_Filter_Cb func;
+   void        *data;
+};
+
 struct _Edje_Pending_Program
 {
    Edje         *edje;
@@ -1907,10 +1941,11 @@ const Eina_List *_edje_entry_anchors_list(Edje_Real_Part *rp);
 Eina_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);
 const Eina_List *_edje_entry_items_list(Edje_Real_Part *rp);
 void _edje_entry_cursor_geometry_get(Edje_Real_Part *rp, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
+void _edje_entry_user_insert(Edje_Real_Part *rp, const char *text);
 void _edje_entry_select_allow_set(Edje_Real_Part *rp, Eina_Bool allow);
 Eina_Bool _edje_entry_select_allow_get(const Edje_Real_Part *rp);
 void _edje_entry_select_abort(Edje_Real_Part *rp);
-
+void *_edje_entry_imf_context_get(Edje_Real_Part *rp);
 Eina_Bool _edje_entry_cursor_next(Edje_Real_Part *rp, Edje_Cursor cur);
 Eina_Bool _edje_entry_cursor_prev(Edje_Real_Part *rp, Edje_Cursor cur);
 Eina_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
 char *_edje_entry_cursor_content_get(Edje_Real_Part *rp, Edje_Cursor cur);
 void _edje_entry_cursor_pos_set(Edje_Real_Part *rp, Edje_Cursor cur, int pos);
 int _edje_entry_cursor_pos_get(Edje_Real_Part *rp, Edje_Cursor cur);
+void _edje_entry_imf_context_reset(Edje_Real_Part *rp);
 void _edje_entry_input_panel_layout_set(Edje_Real_Part *rp, Edje_Input_Panel_Layout layout);
 Edje_Input_Panel_Layout _edje_entry_input_panel_layout_get(Edje_Real_Part *rp);
 void _edje_entry_autocapital_type_set(Edje_Real_Part *rp, Edje_Text_Autocapital_Type autocapital_type);
 Edje_Text_Autocapital_Type _edje_entry_autocapital_type_get(Edje_Real_Part *rp);
+void _edje_entry_prediction_allow_set(Edje_Real_Part *rp, Eina_Bool prediction);
+Eina_Bool _edje_entry_prediction_allow_get(Edje_Real_Part *rp);
 void _edje_entry_input_panel_enabled_set(Edje_Real_Part *rp, Eina_Bool enabled);
 Eina_Bool _edje_entry_input_panel_enabled_get(Edje_Real_Part *rp);
+void _edje_entry_input_panel_show(Edje_Real_Part *rp);
+void _edje_entry_input_panel_hide(Edje_Real_Part *rp);
+void _edje_entry_input_panel_language_set(Edje_Real_Part *rp, Edje_Input_Panel_Lang lang);
+Edje_Input_Panel_Lang _edje_entry_input_panel_language_get(Edje_Real_Part *rp);
+void _edje_entry_input_panel_imdata_set(Edje_Real_Part *rp, const void *data, int len);
+void _edje_entry_input_panel_imdata_get(Edje_Real_Part *rp, void *data, int *len);
+void _edje_entry_input_panel_return_key_type_set(Edje_Real_Part *rp, Edje_Input_Panel_Return_Key_Type return_key_type);
+Edje_Input_Panel_Return_Key_Type _edje_entry_input_panel_return_key_type_get(Edje_Real_Part *rp);
+void _edje_entry_input_panel_return_key_disabled_set(Edje_Real_Part *rp, Eina_Bool disabled);
+Eina_Bool _edje_entry_input_panel_return_key_disabled_get(Edje_Real_Part *rp);
 
 void _edje_external_init();
 void _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,
                               }
 
                             if (rp->program)
-                              _edje_program_end(ed, rp->program);
+                              _edje_program_end(ed, rp->program);
                             _edje_part_description_apply(ed, rp,
                                                          rp->param1.description->state.name,
                                                          rp->param1.description->state.value,
@@ -570,7 +570,7 @@ _edje_program_run(Edje *ed, Edje_Program *pr, Eina_Bool force, const char *ssig,
                        if (rp)
                          {
                             if (rp->program)
-                              _edje_program_end(ed, rp->program);
+                              _edje_program_end(ed, rp->program);
                             _edje_part_description_apply(ed, rp,
                                                          pr->state,
                                                          pr->value,
@@ -873,8 +873,11 @@ _edje_emit_full(Edje *ed, const char *sig, const char *src, void *data, void (*f
 {
    Edje_Message_Signal emsg;
    const char *sep;
+   Eina_Bool broadcast;
 
+   if (!ed->collection) return;
    if (ed->delete_me) return;
+   broadcast = ed->collection->broadcast_signal;
 
    sep = strchr(sig, EDJE_PART_PATH_SEPARATOR);
 
@@ -958,6 +961,7 @@ _edje_emit_full(Edje *ed, const char *sig, const char *src, void *data, void (*f
               if (!ed2) goto end;
 
               _edje_emit(ed2, newsig, src);
+              broadcast = EINA_FALSE;
               break;
 
            case EDJE_PART_TYPE_EXTERNAL:
@@ -976,6 +980,7 @@ _edje_emit_full(Edje *ed, const char *sig, const char *src, void *data, void (*f
                    if (!ed2) goto end;
                    _edje_emit(ed2, newsig, src);
                 }
+              broadcast = EINA_FALSE;
               break ;
 
            case EDJE_PART_TYPE_BOX:
@@ -988,6 +993,7 @@ _edje_emit_full(Edje *ed, const char *sig, const char *src, void *data, void (*f
                    ed2 = _edje_fetch(child);
                    if (!ed2) goto end;
                    _edje_emit(ed2, newsig, src);
+                   broadcast = EINA_FALSE;
                 }
               break ;
 
@@ -1012,7 +1018,10 @@ _edje_emit_full(Edje *ed, const char *sig, const char *src, void *data, void (*f
         emsg.data = NULL;
      }
 /* new sends code */
-   edje_object_message_send(ed->obj, EDJE_MESSAGE_SIGNAL, 0, &emsg);
+   if (broadcast)
+     edje_object_message_send(ed->obj, EDJE_MESSAGE_SIGNAL, 0, &emsg);
+   else
+     _edje_message_send(ed, EDJE_QUEUE_SCRIPT, EDJE_MESSAGE_SIGNAL, 0, &emsg);
 /* old send code - use api now
    _edje_message_send(ed, EDJE_QUEUE_SCRIPT, EDJE_MESSAGE_SIGNAL, 0, &emsg);
    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
 
 struct _Edje_Program_Data
 {
-#ifdef EDJE_PROGRAM_CACHE
   Eina_List     *matches;
-  int            matched;
-#endif
   Edje          *ed;
-  const char    *signal;
   const char    *source;
 };
 
@@ -1056,33 +1061,16 @@ static Eina_Bool _edje_glob_callback(Edje_Program *pr, void *dt)
      {
         rp = _edje_real_part_get(data->ed, pr->filter.part ? pr->filter.part : data->source);
         if (rp)
-          exec = (rp->chosen_description->state.name == pr->filter.state);
+          exec = (rp->chosen_description->state.name == pr->filter.state);
      }
 
-#ifdef EDJE_PROGRAM_CACHE
-   data->matched++;
-#endif
-
-   if (exec)
-     _edje_program_run(data->ed, pr, 0, data->signal, data->source);
+   pr->exec = exec;
 
-   if (_edje_block_break(data->ed))
-     {
-#ifdef EDJE_PROGRAM_CACHE
-        eina_list_free(data->matches);
-        data->matches = NULL;
-#endif
-        return EINA_TRUE;
-     }
-
-#ifdef EDJE_PROGRAM_CACHE
    data->matches = eina_list_append(data->matches, pr);
-#endif
 
    return EINA_FALSE;
 }
 
-
 void
 _edje_callbacks_patterns_clean(Edje *ed)
 {
@@ -1127,7 +1115,7 @@ _edje_emit_handle(Edje *ed, const char *sig, const char *src,
    
    if (ed->collection && ed->L)
      _edje_lua2_script_func_signal(ed, sig, src);
-   
+
    if (ed->collection)
      {
 #ifdef EDJE_PROGRAM_CACHE
@@ -1156,11 +1144,11 @@ _edje_emit_handle(Edje *ed, const char *sig, const char *src,
 
              if (eina_hash_find(ec->prog_cache.no_matches, tmps))
                {
-                  done = 1;
+                  done = 1;
                }
              else if ((matches = eina_hash_find(ec->prog_cache.matches, tmps)))
                {
-                 EINA_LIST_FOREACH(matches, l, pr)
+                  EINA_LIST_FOREACH(matches, l, pr)
                     {
                        Eina_Bool exec = EINA_TRUE;
 
@@ -1169,10 +1157,12 @@ _edje_emit_handle(Edje *ed, const char *sig, const char *src,
                             Edje_Real_Part *rp;
 
                             rp = _edje_real_part_get(ed, pr->filter.part ? pr->filter.part : src);
-                            if (rp)
+                            if (rp && !rp->program)
                               exec = (rp->chosen_description->state.name == pr->filter.state);
                          }
 
+                       pr->exec = exec;
+#if 0
                        if (exec)
                          {
                             _edje_program_run(ed, pr, 0, sig, src);
@@ -1181,7 +1171,19 @@ _edje_emit_handle(Edje *ed, const char *sig, const char *src,
                                  goto break_prog;
                               }
                          }
+#endif
                     }
+
+                  EINA_LIST_FOREACH(matches, l, pr)
+                    if (pr->exec)
+                      {
+                         _edje_program_run(ed, pr, 0, sig, src);
+                         if (_edje_block_break(ed))
+                           {
+                              goto break_prog;
+                           }
+                      }
+
                   done = 1;
                }
           }
@@ -1192,11 +1194,8 @@ _edje_emit_handle(Edje *ed, const char *sig, const char *src,
 
              data.ed = ed;
              data.source = src;
-             data.signal = sig;
-#ifdef EDJE_PROGRAM_CACHE
-             data.matched = 0;
              data.matches = NULL;
-#endif
+
              if (ed->table_programs_size > 0)
                {
                   const Eina_List *match;
@@ -1218,12 +1217,29 @@ _edje_emit_handle(Edje *ed, const char *sig, const char *src,
                                                             ed->patterns.programs.exact_match);
                   EINA_LIST_FOREACH(match, l, pr)
                     _edje_glob_callback(pr, &data);
+
+#ifdef EDJE_PROGRAM_CACHE
+                  EINA_LIST_FOREACH(data.matches, l, pr)
+#else
+                  EINA_LIST_FREE(data.matches, pr)
+#endif
+                    {
+                       if (pr->exec)
+                         _edje_program_run(ed, pr, 0, sig, src);
+
+                       if (_edje_block_break(ed))
+                         {
+                            eina_list_free(data.matches);
+                            data.matches = NULL;
+                            goto break_prog;
+                         }
+                    }
                }
 
 #ifdef EDJE_PROGRAM_CACHE
              if (tmps)
                {
-                  if (data.matched == 0)
+                  if (data.matches == NULL)
                     {
                       if (!ec->prog_cache.no_matches)
                         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)
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return EINA_FALSE;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return EINA_FALSE;
    return EINA_TRUE;
 }
@@ -922,7 +922,7 @@ edje_object_part_object_get(const Evas_Object *obj, const char *part)
    /* Need to recalc before providing the object. */
    _edje_recalc_do(ed);
 
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return NULL;
    return rp->object;
 }
@@ -946,7 +946,7 @@ edje_object_part_geometry_get(const Evas_Object *obj, const char *part, Evas_Coo
    /* Need to recalc before providing the object. */
    _edje_recalc_do(ed);
 
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp)
      {
         if (x) *x = 0;
@@ -1014,6 +1014,7 @@ _edje_object_part_text_raw_set(Evas_Object *obj, Edje_Real_Part *rp, const char
      if (text) rp->text.text = eina_stringshare_add(text);
    rp->edje->dirty = 1;
    rp->edje->recalc_call = 1;
+   rp->edje->recalc_hints = 1;
 #ifdef EDJE_CALC_CACHE
    rp->invalidate = 1;
 #endif
@@ -1058,6 +1059,63 @@ _edje_object_part_text_raw_append(Evas_Object *obj, Edje_Real_Part *rp, const ch
    return EINA_TRUE;
 }
 
+EAPI void
+edje_object_part_text_style_user_push(Evas_Object *obj, const char *part,
+                                const char *style)
+{
+   Edje *ed;
+   Edje_Real_Part *rp;
+   Evas_Textblock_Style *ts;
+
+   ed = _edje_fetch(obj);
+   if ((!ed) || (!part) || (!style)) return;
+   rp = _edje_real_part_recursive_get(ed, part);
+   if (!rp) return;
+   if (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) return;
+
+   ts = evas_textblock_style_new();
+   evas_textblock_style_set(ts, style);
+   evas_object_textblock_style_user_push(rp->object, ts);
+   evas_textblock_style_free(ts);
+   ed->recalc_hints = 1;
+}
+
+EAPI void
+edje_object_part_text_style_user_pop(Evas_Object *obj, const char *part)
+{
+   Edje *ed;
+   Edje_Real_Part *rp;
+
+   ed = _edje_fetch(obj);
+   if ((!ed) || (!part)) return;
+   rp = _edje_real_part_recursive_get(ed, part);
+   if (!rp) return;
+   if (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) return;
+
+   evas_object_textblock_style_user_pop(rp->object);
+   ed->recalc_hints = 1;
+}
+
+EAPI const char *
+edje_object_part_text_style_user_peek(const Evas_Object *obj, const char *part)
+{
+   Edje *ed;
+   Edje_Real_Part *rp;
+   const Evas_Textblock_Style *ts;
+
+   ed = _edje_fetch(obj);
+   if ((!ed) || (!part)) return NULL;
+   rp = _edje_real_part_recursive_get(ed, part);
+   if (!rp) return NULL;
+   if (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) return NULL;
+
+   ts = evas_object_textblock_style_user_peek(rp->object);
+   if (ts)
+      return evas_textblock_style_get(ts);
+   else
+      return NULL;
+}
+
 EAPI Eina_Bool
 edje_object_part_text_set(Evas_Object *obj, const char *part, const char *text)
 {
@@ -1066,7 +1124,7 @@ edje_object_part_text_set(Evas_Object *obj, const char *part, const char *text)
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return EINA_FALSE;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return EINA_FALSE;
    if ((rp->part->type != EDJE_PART_TYPE_TEXT) &&
        (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)
    /* Need to recalc before providing the object. */
    _edje_recalc_do(ed);
 
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return NULL;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      return _edje_entry_text_get(rp);
@@ -1241,7 +1299,7 @@ edje_object_part_text_unescaped_get(const Evas_Object *obj, const char *part)
    /* Need to recalc before providing the object. */
    _edje_recalc_do(ed);
 
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return NULL;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      {
@@ -1268,7 +1326,7 @@ edje_object_part_text_selection_get(const Evas_Object *obj, const char *part)
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return NULL;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return NULL;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      return _edje_entry_selection_get(rp);
@@ -1283,7 +1341,7 @@ edje_object_part_text_select_none(const Evas_Object *obj, const char *part)
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      _edje_entry_select_none(rp);
@@ -1297,7 +1355,7 @@ edje_object_part_text_select_all(const Evas_Object *obj, const char *part)
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      _edje_entry_select_all(rp);
@@ -1311,13 +1369,14 @@ edje_object_part_text_insert(Evas_Object *obj, const char *part, const char *tex
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return;
    if ((rp->part->type != EDJE_PART_TYPE_TEXTBLOCK)) return;
    if (rp->part->entry_mode <= EDJE_ENTRY_EDIT_MODE_NONE) return;
    _edje_entry_text_markup_insert(rp, text);
    rp->edje->dirty = 1;
    rp->edje->recalc_call = 1;
+   rp->edje->recalc_hints = 1;
 #ifdef EDJE_CALC_CACHE
    rp->invalidate = 1;
 #endif
@@ -1334,12 +1393,13 @@ edje_object_part_text_append(Evas_Object *obj, const char *part, const char *tex
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return;
    if ((rp->part->type != EDJE_PART_TYPE_TEXTBLOCK)) return;
    _edje_object_part_text_raw_append(obj, rp, part, text);
    rp->edje->dirty = 1;
    rp->edje->recalc_call = 1;
+   rp->edje->recalc_hints = 1;
 #ifdef EDJE_CALC_CACHE
    rp->invalidate = 1;
 #endif
@@ -1356,7 +1416,7 @@ edje_object_part_text_anchor_list_get(const Evas_Object *obj, const char *part)
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return NULL;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return NULL;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      return _edje_entry_anchors_list(rp);
@@ -1371,7 +1431,7 @@ edje_object_part_text_anchor_geometry_get(const Evas_Object *obj, const char *pa
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return NULL;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return NULL;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      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)
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return NULL;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return NULL;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      return _edje_entry_items_list(rp);
@@ -1401,7 +1461,7 @@ edje_object_part_text_item_geometry_get(const Evas_Object *obj, const char *part
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return EINA_FALSE;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return EINA_FALSE;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      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
    if (w) *w = 0;
    if (h) *h = 0;
    if ((!ed) || (!part)) return;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      {
@@ -1432,6 +1492,20 @@ edje_object_part_text_cursor_geometry_get(const Evas_Object *obj, const char *pa
 }
 
 EAPI void
+edje_object_part_text_user_insert(const Evas_Object *obj, const char *part, const char *text)
+{
+   Edje *ed;
+   Edje_Real_Part *rp;
+
+   ed = _edje_fetch(obj);
+   if ((!ed) || (!part)) return;
+   rp = _edje_real_part_recursive_get(ed, part);
+   if (!rp) return;
+   if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
+     _edje_entry_user_insert(rp, text);
+}
+
+EAPI void
 edje_object_part_text_select_allow_set(const Evas_Object *obj, const char *part, Eina_Bool allow)
 {
    Edje *ed;
@@ -1439,7 +1513,7 @@ edje_object_part_text_select_allow_set(const Evas_Object *obj, const char *part,
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      _edje_entry_select_allow_set(rp, allow);
@@ -1453,7 +1527,7 @@ edje_object_part_text_select_abort(const Evas_Object *obj, const char *part)
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      _edje_entry_select_abort(rp);
@@ -1467,7 +1541,7 @@ edje_object_part_text_select_begin(const Evas_Object *obj, const char *part)
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      _edje_entry_select_begin(rp);
@@ -1481,12 +1555,30 @@ edje_object_part_text_select_extend(const Evas_Object *obj, const char *part)
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      _edje_entry_select_extend(rp);
 }
 
+EAPI void *
+edje_object_part_text_imf_context_get(const Evas_Object *obj, const char *part)
+{
+   Edje *ed;
+   Edje_Real_Part *rp;
+
+   ed = _edje_fetch(obj);
+   if ((!ed) || (!part)) return NULL;
+
+   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   if (!rp) return NULL;
+
+   if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
+     return _edje_entry_imf_context_get(rp);
+   else
+     return NULL;
+}
+
 EAPI Eina_Bool
 edje_object_part_text_cursor_next(Evas_Object *obj, const char *part, Edje_Cursor cur)
 {
@@ -1495,7 +1587,7 @@ edje_object_part_text_cursor_next(Evas_Object *obj, const char *part, Edje_Curso
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return EINA_FALSE;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return EINA_FALSE;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      {
@@ -1512,7 +1604,7 @@ edje_object_part_text_cursor_prev(Evas_Object *obj, const char *part, Edje_Curso
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return EINA_FALSE;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return EINA_FALSE;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      {
@@ -1529,7 +1621,7 @@ edje_object_part_text_cursor_up(Evas_Object *obj, const char *part, Edje_Cursor
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return EINA_FALSE;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return EINA_FALSE;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      {
@@ -1546,7 +1638,7 @@ edje_object_part_text_cursor_down(Evas_Object *obj, const char *part, Edje_Curso
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return EINA_FALSE;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return EINA_FALSE;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      {
@@ -1563,7 +1655,7 @@ edje_object_part_text_cursor_begin_set(Evas_Object *obj, const char *part, Edje_
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      {
@@ -1579,7 +1671,7 @@ edje_object_part_text_cursor_end_set(Evas_Object *obj, const char *part, Edje_Cu
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      {
@@ -1595,7 +1687,7 @@ edje_object_part_text_cursor_copy(Evas_Object *obj, const char *part, Edje_Curso
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      {
@@ -1611,7 +1703,7 @@ edje_object_part_text_cursor_line_begin_set(Evas_Object *obj, const char *part,
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      {
@@ -1627,7 +1719,7 @@ edje_object_part_text_cursor_line_end_set(Evas_Object *obj, const char *part, Ed
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      {
@@ -1644,7 +1736,7 @@ edje_object_part_text_cursor_coord_set(Evas_Object *obj, const char *part,
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return EINA_FALSE;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return EINA_FALSE;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      {
@@ -1661,7 +1753,7 @@ edje_object_part_text_cursor_is_format_get(const Evas_Object *obj, const char *p
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return EINA_FALSE;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return EINA_FALSE;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      {
@@ -1678,7 +1770,7 @@ edje_object_part_text_cursor_is_visible_format_get(const Evas_Object *obj, const
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return 0;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return 0;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      {
@@ -1738,7 +1830,7 @@ edje_object_part_text_cursor_pos_get(const Evas_Object *obj, const char *part, E
 }
 
 EAPI void
-edje_object_part_text_input_panel_layout_set(const Evas_Object *obj, const char *part, Edje_Input_Panel_Layout layout)
+edje_object_part_text_imf_context_reset(const Evas_Object *obj, const char *part)
 {
    Edje *ed;
    Edje_Real_Part *rp;
@@ -1749,7 +1841,23 @@ edje_object_part_text_input_panel_layout_set(const Evas_Object *obj, const char
    if (!rp) return;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      {
-        return _edje_entry_input_panel_layout_set(rp, layout);
+        _edje_entry_imf_context_reset(rp);
+     }
+}
+
+EAPI void
+edje_object_part_text_input_panel_layout_set(Evas_Object *obj, const char *part, Edje_Input_Panel_Layout layout)
+{
+   Edje *ed;
+   Edje_Real_Part *rp;
+
+   ed = _edje_fetch(obj);
+   if ((!ed) || (!part)) return;
+   rp = _edje_real_part_recursive_get(ed, part);
+   if (!rp) return;
+   if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
+     {
+        _edje_entry_input_panel_layout_set(rp, layout);
      }
 }
 
@@ -1771,14 +1879,14 @@ edje_object_part_text_input_panel_layout_get(const Evas_Object *obj, const char
 }
 
 EAPI void
-edje_object_part_text_autocapital_type_set(const Evas_Object *obj, const char *part, Edje_Text_Autocapital_Type autocapital_type)
+edje_object_part_text_autocapital_type_set(Evas_Object *obj, const char *part, Edje_Text_Autocapital_Type autocapital_type)
 {
    Edje *ed;
    Edje_Real_Part *rp;
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      {
@@ -1794,7 +1902,7 @@ edje_object_part_text_autocapital_type_get(const Evas_Object *obj, const char *p
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return EDJE_TEXT_AUTOCAPITAL_TYPE_NONE;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return EDJE_TEXT_AUTOCAPITAL_TYPE_NONE;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      {
@@ -1804,7 +1912,40 @@ edje_object_part_text_autocapital_type_get(const Evas_Object *obj, const char *p
 }
 
 EAPI void
-edje_object_part_text_input_panel_enabled_set(const Evas_Object *obj, const char *part, Eina_Bool enabled)
+edje_object_part_text_prediction_allow_set(Evas_Object *obj, const char *part, Eina_Bool prediction)
+{
+   Edje *ed;
+   Edje_Real_Part *rp;
+
+   ed = _edje_fetch(obj);
+   if ((!ed) || (!part)) return;
+   rp = _edje_real_part_recursive_get(ed, part);
+   if (!rp) return;
+   if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
+     {
+        _edje_entry_prediction_allow_set(rp, prediction);
+     }
+}
+
+EAPI Eina_Bool
+edje_object_part_text_prediction_allow_get(const Evas_Object *obj, const char *part)
+{
+   Edje *ed;
+   Edje_Real_Part *rp;
+
+   ed = _edje_fetch(obj);
+   if ((!ed) || (!part)) return EINA_FALSE;
+   rp = _edje_real_part_recursive_get(ed, part);
+   if (!rp) return EINA_FALSE;
+   if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
+     {
+        return _edje_entry_prediction_allow_get(rp);
+     }
+   return EINA_FALSE;
+}
+
+EAPI void
+edje_object_part_text_input_panel_enabled_set(Evas_Object *obj, const char *part, Eina_Bool enabled)
 {
    Edje *ed;
    Edje_Real_Part *rp;
@@ -1815,7 +1956,7 @@ edje_object_part_text_input_panel_enabled_set(const Evas_Object *obj, const char
    if (!rp) return;
    if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
      {
-        return _edje_entry_input_panel_enabled_set(rp, enabled);
+        _edje_entry_input_panel_enabled_set(rp, enabled);
      }
 }
 
@@ -1837,6 +1978,165 @@ edje_object_part_text_input_panel_enabled_get(const Evas_Object *obj, const char
 }
 
 EAPI void
+edje_object_part_text_input_panel_show(const Evas_Object *obj, const char *part)
+{
+   Edje *ed;
+   Edje_Real_Part *rp;
+
+   ed = _edje_fetch(obj);
+   if ((!ed) || (!part)) return;
+   rp = _edje_real_part_recursive_get(ed, part);
+   if (!rp) return;
+   if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
+     _edje_entry_input_panel_show(rp);
+}
+
+EAPI void
+edje_object_part_text_input_panel_hide(const Evas_Object *obj, const char *part)
+{
+   Edje *ed;
+   Edje_Real_Part *rp;
+
+   ed = _edje_fetch(obj);
+   if ((!ed) || (!part)) return;
+   rp = _edje_real_part_recursive_get(ed, part);
+   if (!rp) return;
+   if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
+     _edje_entry_input_panel_hide(rp);
+}
+
+EAPI void
+edje_object_part_text_input_panel_language_set(Evas_Object *obj, const char *part, Edje_Input_Panel_Lang lang)
+{
+   Edje *ed;
+   Edje_Real_Part *rp;
+
+   ed = _edje_fetch(obj);
+   if ((!ed) || (!part)) return;
+   rp = _edje_real_part_recursive_get(ed, part);
+   if (!rp) return;
+   if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
+     {
+        _edje_entry_input_panel_language_set(rp, lang);
+     }
+}
+
+EAPI Edje_Input_Panel_Lang
+edje_object_part_text_input_panel_language_get(const Evas_Object *obj, const char *part)
+{
+   Edje *ed;
+   Edje_Real_Part *rp;
+
+   ed = _edje_fetch(obj);
+   if ((!ed) || (!part)) return EDJE_INPUT_PANEL_LANG_AUTOMATIC;
+   rp = _edje_real_part_recursive_get(ed, part);
+   if (!rp) return EDJE_INPUT_PANEL_LANG_AUTOMATIC;
+   if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
+     {
+        return _edje_entry_input_panel_language_get(rp);
+     }
+   return EDJE_INPUT_PANEL_LANG_AUTOMATIC;
+}
+
+EAPI void
+edje_object_part_text_input_panel_imdata_set(Evas_Object *obj, const char *part, const void *data, int len)
+{
+   Edje *ed;
+   Edje_Real_Part *rp;
+
+   ed = _edje_fetch(obj);
+   if ((!ed) || (!part)) return;
+   rp = _edje_real_part_recursive_get(ed, part);
+   if (!rp) return;
+   if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
+     {
+        _edje_entry_input_panel_imdata_set(rp, data, len);
+     }
+}
+
+EAPI void
+edje_object_part_text_input_panel_imdata_get(const Evas_Object *obj, const char *part, void *data, int *len)
+{
+   Edje *ed;
+   Edje_Real_Part *rp;
+
+   ed = _edje_fetch(obj);
+   if ((!ed) || (!part)) return;
+   rp = _edje_real_part_recursive_get(ed, part);
+   if (!rp) return;
+   if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
+     {
+        _edje_entry_input_panel_imdata_get(rp, data, len);
+     }
+}
+
+EAPI 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)
+{
+   Edje *ed;
+   Edje_Real_Part *rp;
+
+   ed = _edje_fetch(obj);
+   if ((!ed) || (!part)) return;
+   rp = _edje_real_part_recursive_get(ed, part);
+   if (!rp) return;
+   if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
+     {
+        _edje_entry_input_panel_return_key_type_set(rp, return_key_type);
+     }
+}
+
+EAPI Edje_Input_Panel_Return_Key_Type
+edje_object_part_text_input_panel_return_key_type_get(const Evas_Object *obj, const char *part)
+{
+   Edje *ed;
+   Edje_Real_Part *rp;
+
+   ed = _edje_fetch(obj);
+   if ((!ed) || (!part)) return EDJE_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT;
+   rp = _edje_real_part_recursive_get(ed, part);
+   if (!rp) return EDJE_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT;
+   if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
+     {
+        return _edje_entry_input_panel_return_key_type_get(rp);
+     }
+   return EDJE_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT;
+}
+
+EAPI void
+edje_object_part_text_input_panel_return_key_disabled_set(Evas_Object *obj, const char *part, Eina_Bool disabled)
+{
+   Edje *ed;
+   Edje_Real_Part *rp;
+
+   ed = _edje_fetch(obj);
+   if ((!ed) || (!part)) return;
+   rp = _edje_real_part_recursive_get(ed, part);
+   if (!rp) return;
+   if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
+     {
+        _edje_entry_input_panel_return_key_disabled_set(rp, disabled);
+     }
+}
+
+EAPI Eina_Bool
+edje_object_part_text_input_panel_return_key_disabled_get(const Evas_Object *obj, const char *part)
+{
+   Edje *ed;
+   Edje_Real_Part *rp;
+
+   ed = _edje_fetch(obj);
+   if ((!ed) || (!part)) return EINA_FALSE;
+   rp = _edje_real_part_recursive_get(ed, part);
+   if (!rp) return EINA_FALSE;
+   if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
+     {
+        return _edje_entry_input_panel_return_key_disabled_get(rp);
+     }
+   return EINA_FALSE;
+}
+
+EAPI void
 edje_object_text_insert_filter_callback_add(Evas_Object *obj, const char *part, Edje_Text_Filter_Cb func, void *data)
 {
    Edje *ed;
@@ -1901,6 +2201,71 @@ edje_object_text_insert_filter_callback_del_full(Evas_Object *obj, const char *p
    return NULL;
 }
 
+EAPI void
+edje_object_text_markup_filter_callback_add(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func, void *data)
+{
+   Edje *ed;
+   Edje_Markup_Filter_Callback *cb;
+
+   ed = _edje_fetch(obj);
+   if ((!ed) || (!part)) return;
+   cb = calloc(1, sizeof(Edje_Markup_Filter_Callback));
+   cb->part = eina_stringshare_add(part);
+   cb->func = func;
+   cb->data = (void *)data;
+   ed->markup_filter_callbacks =
+     eina_list_append(ed->markup_filter_callbacks, cb);
+}
+
+EAPI void *
+edje_object_text_markup_filter_callback_del(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func)
+{
+   Edje *ed;
+   Edje_Markup_Filter_Callback *cb;
+   Eina_List *l;
+
+   ed = _edje_fetch(obj);
+   if ((!ed) || (!part)) return NULL;
+   EINA_LIST_FOREACH(ed->markup_filter_callbacks, l, cb)
+     {
+        if ((!strcmp(cb->part, part)) && (cb->func == func))
+          {
+             void *data = cb->data;
+             ed->markup_filter_callbacks =
+                eina_list_remove_list(ed->markup_filter_callbacks, l);
+             eina_stringshare_del(cb->part);
+             free(cb);
+             return data;
+          }
+     }
+   return NULL;
+}
+
+EAPI void *
+edje_object_text_markup_filter_callback_del_full(Evas_Object *obj, const char *part, Edje_Markup_Filter_Cb func, void *data)
+{
+   Edje *ed;
+   Edje_Markup_Filter_Callback *cb;
+   Eina_List *l;
+
+   ed = _edje_fetch(obj);
+   if ((!ed) || (!part)) return NULL;
+   EINA_LIST_FOREACH(ed->markup_filter_callbacks, l, cb)
+     {
+        if ((!strcmp(cb->part, part)) && (cb->func == func) &&
+            (cb->data == data))
+          {
+             void *tmp = cb->data;
+             ed->markup_filter_callbacks =
+                eina_list_remove_list(ed->markup_filter_callbacks, l);
+             eina_stringshare_del(cb->part);
+             free(cb);
+             return tmp;
+          }
+     }
+   return NULL;
+}
+
 EAPI Eina_Bool
 edje_object_part_swallow(Evas_Object *obj, const char *part, Evas_Object *obj_swallow)
 {
@@ -1927,8 +2292,12 @@ edje_object_part_swallow(Evas_Object *obj, const char *part, Evas_Object *obj_sw
         edje_object_part_unswallow(rp->edje->obj, obj_swallow);
      }
 
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
-   if (!rp) return EINA_FALSE;
+   rp = _edje_real_part_recursive_get(ed, part);
+   if (!rp)
+     {
+        DBG("cannot swallow part %s: part not exist!", part);
+        return EINA_FALSE;
+     }
    if (rp->part->type != EDJE_PART_TYPE_SWALLOW)
      {
         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)
    /* Need to recalc before providing the object. */
    _edje_recalc_do(ed);
 
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return NULL;
    return rp->swallowed_object;
 }
@@ -2353,8 +2722,8 @@ EAPI Eina_Bool
 edje_object_parts_extends_calc(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
 {
    Edje *ed;
-   Evas_Coord x1 = INT_MAX, y1 = INT_MAX;
-   Evas_Coord x2 = 0, y2 = 0;
+   Evas_Coord xx1 = INT_MAX, yy1 = INT_MAX;
+   Evas_Coord xx2 = 0, yy2 = 0;
    unsigned int i;
 
    ed = _edje_fetch(obj);
@@ -2386,18 +2755,18 @@ edje_object_parts_extends_calc(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, E
         rpx2 = rpx1 + rp->w;
         rpy2 = rpy1 + rp->h;
 
-        if (x1 > rpx1) x1 = rpx1;
-        if (y1 > rpy1) y1 = rpy1;
-        if (x2 < rpx2) x2 = rpx2;
-        if (y2 < rpy2) y2 = rpy2;
+        if (xx1 > rpx1) xx1 = rpx1;
+        if (yy1 > rpy1) yy1 = rpy1;
+        if (xx2 < rpx2) xx2 = rpx2;
+        if (yy2 < rpy2) yy2 = rpy2;
      }
 
    ed->calc_only = 0;
 
-   if (x) *x = x1;
-   if (y) *y = y1;
-   if (w) *w = x2 - x1;
-   if (h) *h = y2 - y1;
+   if (x) *x = xx1;
+   if (y) *y = yy1;
+   if (w) *w = xx2 - xx1;
+   if (h) *h = yy2 - yy1;
 
    return EINA_TRUE;
 }
@@ -2448,6 +2817,7 @@ edje_object_size_min_restricted_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Co
              maxh = 0;
           }
         pep = NULL;
+        has_non_fixed_tb = EINA_FALSE;
         for (i = 0; i < ed->table_parts_size; i++)
           {
              Edje_Real_Part *ep;
@@ -2569,7 +2939,7 @@ edje_object_part_state_get(const Evas_Object *obj, const char *part, double *val
    /* Need to recalc before providing the object. */
    _edje_recalc_do(ed);
 
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp)
      {
         if (val_ret) *val_ret = 0;
@@ -2609,7 +2979,7 @@ edje_object_part_drag_dir_get(const Evas_Object *obj, const char *part)
    /* Need to recalc before providing the object. */
    _edje_recalc_do(ed);
 
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return EDJE_DRAG_DIR_NONE;
    if ((rp->part->dragable.x) && (rp->part->dragable.y)) return EDJE_DRAG_DIR_XY;
    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
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return EINA_FALSE;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return EINA_FALSE;
    if (!rp->drag) return EINA_FALSE;
    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
    /* Need to recalc before providing the object. */
    _edje_recalc_do(ed);
 
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp || !rp->drag)
      {
         if (dx) *dx = 0;
@@ -2690,7 +3060,7 @@ edje_object_part_drag_size_set(Evas_Object *obj, const char *part, double dw, do
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return EINA_FALSE;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return EINA_FALSE;
    if (!rp->drag) return EINA_FALSE;
    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
    /* Need to recalc before providing the object. */
    _edje_recalc_do(ed);
 
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp || !rp->drag)
      {
         if (dw) *dw = 0;
@@ -2746,7 +3116,7 @@ edje_object_part_drag_step_set(Evas_Object *obj, const char *part, double dx, do
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return EINA_FALSE;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return EINA_FALSE;
    if (!rp->drag) return EINA_FALSE;
    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
    /* Need to recalc before providing the object. */
    _edje_recalc_do(ed);
 
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp || !rp->drag)
      {
         if (dx) *dx = 0;
@@ -2798,7 +3168,7 @@ edje_object_part_drag_page_set(Evas_Object *obj, const char *part, double dx, do
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return EINA_FALSE;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return EINA_FALSE;
    if (!rp->drag) return EINA_FALSE;
    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
    /* Need to recalc before providing the object. */
    _edje_recalc_do(ed);
 
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp || !rp->drag)
      {
         if (dx) *dx = 0;
@@ -2851,7 +3221,7 @@ edje_object_part_drag_step(Evas_Object *obj, const char *part, double dx, double
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return EINA_FALSE;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return EINA_FALSE;
    if (!rp->drag) return EINA_FALSE;
    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
 
    ed = _edje_fetch(obj);
    if ((!ed) || (!part)) return EINA_FALSE;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
+   rp = _edje_real_part_recursive_get(ed, part);
    if (!rp) return EINA_FALSE;
    if (!rp->drag) return EINA_FALSE;
    if (rp->drag->down.count > 0) return EINA_FALSE;
@@ -3557,9 +3927,21 @@ edje_object_preload(Evas_Object *obj, Eina_Bool cancel)
              else if (ep->type == EDJE_PART_TYPE_GROUP)
                {
                   if (rp->swallowed_object) {
-                     edje_object_signal_callback_del(rp->swallowed_object, EDJE_PRELOAD_EMISSION, EDJE_PRELOAD_SOURCE, _edje_object_signal_preload_cb);
-                     edje_object_signal_callback_add(rp->swallowed_object, EDJE_PRELOAD_EMISSION, EDJE_PRELOAD_SOURCE, _edje_object_signal_preload_cb, ed);
-                     edje_object_preload(rp->swallowed_object, cancel);
+                     char *tmp;
+
+                     if (rp->part->name)
+                       {
+                          tmp = alloca(strlen(rp->part->name) + 2);
+                          sprintf(tmp, "%s:", rp->part->name);
+
+                          edje_object_signal_callback_del(obj, EDJE_PRELOAD_EMISSION, tmp, _edje_object_signal_preload_cb);
+                          edje_object_signal_callback_add(obj, EDJE_PRELOAD_EMISSION, tmp, _edje_object_signal_preload_cb, ed);
+                          edje_object_preload(rp->swallowed_object, cancel);
+                       }
+                     else
+                       {
+                          ed->preload_count--;
+                       }
 
                      count--;
                   }
@@ -3574,6 +3956,30 @@ edje_object_preload(Evas_Object *obj, Eina_Bool cancel)
    return EINA_TRUE;
 }
 
+EAPI void
+edje_object_update_hints_set(Evas_Object *obj, Eina_Bool update)
+{
+   Edje *ed;
+
+   ed = _edje_fetch(obj);
+   if (!ed) return ;
+   if (ed->update_hints == !!update) return ;
+
+   ed->update_hints = !!update;
+   if (update) ed->recalc_hints = 1;
+}
+
+EAPI Eina_Bool
+edje_object_update_hints_get(Evas_Object *obj)
+{
+   Edje *ed;
+
+   ed = _edje_fetch(obj);
+   if (!ed) return EINA_FALSE;
+
+   return ed->update_hints;
+}
+
 Eina_Bool
 _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)
 {
@@ -4037,9 +4443,11 @@ _edje_real_part_swallow_hints_update(Edje_Real_Part *rp)
      {
         Evas_Coord w, h;
 
+#if 0
         edje_object_size_min_get(rp->swallowed_object, &w, &h);
         rp->swallow_params.min.w = w;
         rp->swallow_params.min.h = h;
+#endif
         edje_object_size_max_get(rp->swallowed_object, &w, &h);
         rp->swallow_params.max.w = w;
         rp->swallow_params.max.h = h;
@@ -4050,8 +4458,10 @@ _edje_real_part_swallow_hints_update(Edje_Real_Part *rp)
         Evas_Coord w, h;
 
         evas_object_geometry_get(rp->swallowed_object, NULL, NULL, &w, &h);
+#if 0
         rp->swallow_params.min.w = w;
         rp->swallow_params.min.h = h;
+#endif
         rp->swallow_params.max.w = w;
         rp->swallow_params.max.h = h;
      }
@@ -4127,6 +4537,7 @@ _edje_real_part_swallow(Edje_Real_Part *rp,
                _edje_real_part_swallow_hints_update(rp);
              rp->edje->dirty = 1;
              rp->edje->recalc_call = 1;
+             rp->edje->recalc_hints = 1;
              _edje_recalc(rp->edje);
              return;
           }
@@ -4171,6 +4582,7 @@ _edje_real_part_swallow(Edje_Real_Part *rp,
 
    rp->edje->dirty = 1;
    rp->edje->recalc_call = 1;
+   rp->edje->recalc_hints = 1;
    _edje_recalc(rp->edje);
 }
 
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@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PYTHON = @PYTHON@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
 PYTHON_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@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PYTHON = @PYTHON@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
 PYTHON_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@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PYTHON = @PYTHON@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
 PYTHON_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@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PYTHON = @PYTHON@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
 PYTHON_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@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PYTHON = @PYTHON@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@