revert to the migration tempoary
[framework/uifw/elementary.git] / src / lib / elm_cnp_helper.c
index 69ca044..59554ca 100644 (file)
@@ -55,7 +55,7 @@ enum
    CNP_ATOM_TEXT,
    CNP_ATOM_text_plain_utf8,
    CNP_ATOM_text_plain,
-   
+
    CNP_N_ATOMS,
 };
 
@@ -82,7 +82,7 @@ struct _Cnp_Selection
 
    Elm_Sel_Format    format;
    Ecore_X_Selection ecore_sel;
-   
+
    Eina_Bool         active : 1;
 };
 
@@ -142,7 +142,6 @@ static char *mark_up(const char *start, int inlen, int *lenp);
 static Evas_Object *image_provider(void *images, Evas_Object *entry, const char *item);
 static void entry_deleted(void *images, Evas *e, Evas_Object *entry, void *unused);
 
-
 static Eina_Bool targets_converter(char *target, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize);
 static Eina_Bool text_converter(char *target, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize);
 static Eina_Bool html_converter(char *target, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize);
@@ -157,237 +156,225 @@ static int notify_handler_targets(Cnp_Selection *sel, Ecore_X_Event_Selection_No
 static int notify_handler_text(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify);
 static int notify_handler_image(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify);
 static int notify_handler_uri(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify);
+static int notify_handler_edje(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify);
 static int notify_handler_html(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify);
 static int vcard_receive(Cnp_Selection *sed, Ecore_X_Event_Selection_Notify *notify);
 
 static Paste_Image *pasteimage_alloc(const char *file, int pathlen);
 static Eina_Bool pasteimage_append(Paste_Image *pi, Evas_Object *entry);
 static void pasteimage_free(Paste_Image *pi);
+static void entry_insert_filter(Evas_Object* entry, char* str);
 
 /* Optimisation: Turn this into a 256 byte table:
  *     then can lookup in one index, not N checks */
 static const Escape escapes[] = {
-   { "<br>",   '\n' },
-   { "<\t>",   '\t' },
-   { "gt;",    '>'  },
-   { "lt;",    '<'  },
-   { "amp;",   '&'  },
-   { "quot;",  '\'' },
-   { "dquot;", '"'  }
+  { "<br>",   '\n' },
+  { "<ps>",   '\n' },
+  { "<\t>",   '\t' },
+  { "gt;",    '>'  },
+  { "lt;",    '<'  },
+  { "amp;",   '&'  },
+  { "quot;",  '\'' },
+  { "dquot;", '"'  }
 };
 #define N_ESCAPES ((int)(sizeof(escapes) / sizeof(escapes[0])))
 
-static const char *image_extensions[] =
-{
-   ".png",
-   ".jpg", ".jpeg", ".jpe", ".jfif", ".jfi",
-   ".bmp",
-   ".xpm",
-   ".ppm", "pgm", ".pbm", ".pnm",
-   ".gif",
-   ".tif", ".tiff",
-   ".svg", ".svg.gz",
-   ".tga", ".targa",
-   
-   NULL
-};
-
 static Cnp_Atom atoms[CNP_N_ATOMS] = {
-   [CNP_ATOM_TARGETS] = {
-      "TARGETS",
-      (Elm_Sel_Format) -1, // everything
-      targets_converter,
-      response_handler_targets,
-      notify_handler_targets,
-      0
-   },
-   [CNP_ATOM_XELM] =  {
-      "application/x-elementary-markup",
-      ELM_SEL_FORMAT_MARKUP,
-      edje_converter,
-      NULL,
-      NULL,
-      0
-   },
-   [CNP_ATOM_text_uri] = {
-      "text/uri",
-      ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_IMAGE, /* Either images or entries */
-      uri_converter,
-      NULL,
-      notify_handler_uri,
-      0
-   },
-   [CNP_ATOM_text_urilist] = {
-      "text/uri-list",
-      ELM_SEL_FORMAT_IMAGE | ELM_SEL_FORMAT_MARKUP,
-      uri_converter,
-      NULL,
-      notify_handler_uri,
-      0
-   },
-   [CNP_ATOM_text_x_vcard] = {
-      "text/x-vcard",
-      ELM_SEL_FORMAT_VCARD,
-      vcard_send, NULL,
-      vcard_receive, 0
-   },
-   [CNP_ATOM_image_png] = {
-      "image/png",
-      ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_IMAGE,
-      image_converter,
-      NULL,
-      notify_handler_image,
-      0
-   },
-   [CNP_ATOM_image_jpeg] = {
-      "image/jpeg",
-      ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_IMAGE,
-      image_converter,
-      NULL,
-      notify_handler_image,/* Raw image data is the same */
-      0
-   },
-   [CNP_ATOM_image_bmp] = {
-      "image/x-ms-bmp",
-      ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_IMAGE,
-      image_converter,
-      NULL,
-      notify_handler_image,/* Raw image data is the same */
-      0
-   },
-   [CNP_ATOM_image_gif] = {
-      "image/gif",
-      ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_IMAGE,
-      image_converter,
-      NULL,
-      notify_handler_image,/* Raw image data is the same */
-      0
-   },
-   [CNP_ATOM_image_tiff] = {
-      "image/tiff",
-      ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_IMAGE,
-      image_converter,
-      NULL,
-      notify_handler_image,/* Raw image data is the same */
-      0
-   },
-   [CNP_ATOM_image_svg] = {
-      "image/svg+xml",
-      ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_IMAGE,
-      image_converter,
-      NULL,
-      notify_handler_image,/* Raw image data is the same */
-      0
-   },
-   [CNP_ATOM_image_xpm] = {
-      "image/x-xpixmap",
-      ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_IMAGE,
-      image_converter,
-      NULL,
-      notify_handler_image,/* Raw image data is the same */
-      0
-   },
-   [CNP_ATOM_image_tga] = {
-      "image/x-tga",
-      ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_IMAGE,
-      image_converter,
-      NULL,
-      notify_handler_image,/* Raw image data is the same */
-      0
-   },
-   [CNP_ATOM_image_ppm] = {
-      "image/x-portable-pixmap",
-      ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_IMAGE,
-      image_converter,
-      NULL,
-      notify_handler_image,/* Raw image data is the same */
-      0
-   },
-   [CNP_ATOM_text_html_utf8] = {
-      "text/html;charset=utf-8",
-      ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_HTML,
-      html_converter,
-      NULL,
-      notify_handler_html,
-      0
-   },
-   [CNP_ATOM_text_html] = {
-      "text/html",
-      ELM_SEL_FORMAT_HTML,
-      html_converter,
-      NULL,
-      notify_handler_html, /* No encoding: Webkit only */
-      0
-   },
-   [CNP_ATOM_UTF8STRING] = {
-      "UTF8_STRING",
-      ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_HTML,
-      text_converter,
-      NULL,
-      notify_handler_text,
-      0
-   },
-   [CNP_ATOM_STRING] = {
-      "STRING",
-      ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_HTML,
-      text_converter,
-      NULL,
-      notify_handler_text,
-      0
-   },
-   [CNP_ATOM_TEXT] = {
-      "TEXT",
-      ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_HTML,
-      text_converter,
-      NULL,
-      NULL,
-      0
-   },
-   [CNP_ATOM_text_plain_utf8] = {
-      "text/plain;charset=utf-8",
-      ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_HTML,
-      text_converter,
-      NULL,
-      NULL,
-      0
-   },
-   [CNP_ATOM_text_plain] = {
-      "text/plain",
-      ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_HTML,
-      text_converter,
-      NULL,
-      NULL,
-      0
-   },
+     [CNP_ATOM_TARGETS] = {
+          "TARGETS",
+          (Elm_Sel_Format) -1, // everything
+          targets_converter,
+          response_handler_targets,
+          notify_handler_targets,
+          0
+     },
+     [CNP_ATOM_XELM] =  {
+          "application/x-elementary-markup",
+          ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_HTML,
+          edje_converter,
+          NULL,
+          notify_handler_edje,
+          0
+     },
+     [CNP_ATOM_text_uri] = {
+          "text/uri",
+          ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_IMAGE, /* Either images or entries */
+          uri_converter,
+          NULL,
+          notify_handler_uri,
+          0
+     },
+     [CNP_ATOM_text_urilist] = {
+          "text/uri-list",
+          ELM_SEL_FORMAT_IMAGE,
+          uri_converter,
+          NULL,
+          notify_handler_uri,
+          0
+     },
+     [CNP_ATOM_text_x_vcard] = {
+          "text/x-vcard",
+          ELM_SEL_FORMAT_VCARD,
+          vcard_send, NULL,
+          vcard_receive, 0
+     },
+     [CNP_ATOM_image_png] = {
+          "image/png",
+          ELM_SEL_FORMAT_IMAGE,
+          image_converter,
+          NULL,
+          notify_handler_image,
+          0
+     },
+     [CNP_ATOM_image_jpeg] = {
+          "image/jpeg",
+          ELM_SEL_FORMAT_IMAGE,
+          image_converter,
+          NULL,
+          notify_handler_image,/* Raw image data is the same */
+          0
+     },
+     [CNP_ATOM_image_bmp] = {
+          "image/x-ms-bmp",
+          ELM_SEL_FORMAT_IMAGE,
+          image_converter,
+          NULL,
+          notify_handler_image,/* Raw image data is the same */
+          0
+     },
+     [CNP_ATOM_image_gif] = {
+          "image/gif",
+          ELM_SEL_FORMAT_IMAGE,
+          image_converter,
+          NULL,
+          notify_handler_image,/* Raw image data is the same */
+          0
+     },
+     [CNP_ATOM_image_tiff] = {
+          "image/tiff",
+          ELM_SEL_FORMAT_IMAGE,
+          image_converter,
+          NULL,
+          notify_handler_image,/* Raw image data is the same */
+          0
+     },
+     [CNP_ATOM_image_svg] = {
+          "image/svg+xml",
+          ELM_SEL_FORMAT_IMAGE,
+          image_converter,
+          NULL,
+          notify_handler_image,/* Raw image data is the same */
+          0
+     },
+     [CNP_ATOM_image_xpm] = {
+          "image/x-xpixmap",
+          ELM_SEL_FORMAT_IMAGE,
+          image_converter,
+          NULL,
+          notify_handler_image,/* Raw image data is the same */
+          0
+     },
+     [CNP_ATOM_image_tga] = {
+          "image/x-tga",
+          ELM_SEL_FORMAT_IMAGE,
+          image_converter,
+          NULL,
+          notify_handler_image,/* Raw image data is the same */
+          0
+     },
+     [CNP_ATOM_image_ppm] = {
+          "image/x-portable-pixmap",
+          ELM_SEL_FORMAT_IMAGE,
+          image_converter,
+          NULL,
+          notify_handler_image,/* Raw image data is the same */
+          0
+     },
+     [CNP_ATOM_text_html_utf8] = {
+          "text/html;charset=utf-8",
+          ELM_SEL_FORMAT_HTML,
+          html_converter,
+          NULL,
+          notify_handler_html,
+          0
+     },
+     [CNP_ATOM_text_html] = {
+          "text/html",
+          ELM_SEL_FORMAT_HTML,
+          html_converter,
+          NULL,
+          notify_handler_html, /* No encoding: Webkit only */
+          0
+     },
+     [CNP_ATOM_UTF8STRING] = {
+          "UTF8_STRING",
+          ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_HTML,
+          text_converter,
+          NULL,
+          notify_handler_text,
+          0
+     },
+     [CNP_ATOM_STRING] = {
+          "STRING",
+          ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_HTML,
+          text_converter,
+          NULL,
+          notify_handler_text,
+          0
+     },
+     [CNP_ATOM_TEXT] = {
+          "TEXT",
+          ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_HTML,
+          text_converter,
+          NULL,
+          NULL,
+          0
+     },
+     [CNP_ATOM_text_plain_utf8] = {
+          "text/plain;charset=utf-8",
+          ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_HTML,
+          text_converter,
+          NULL,
+          NULL,
+          0
+     },
+     [CNP_ATOM_text_plain] = {
+          "text/plain",
+          ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_HTML,
+          text_converter,
+          NULL,
+          NULL,
+          0
+     },
 };
 
 static Cnp_Selection selections[ELM_SEL_MAX] = {
-   ARRAYINIT(ELM_SEL_PRIMARY) {
-      .debug = "Primary",
-      .ecore_sel = ECORE_X_SELECTION_PRIMARY,
-      .set = ecore_x_selection_primary_set,
-      .clear = ecore_x_selection_primary_clear,
-      .request = ecore_x_selection_primary_request,
-   },
-   ARRAYINIT(ELM_SEL_SECONDARY) {
-      .debug = "Secondary",
-      .ecore_sel = ECORE_X_SELECTION_SECONDARY,
-      .set = ecore_x_selection_secondary_set,
-      .clear = ecore_x_selection_secondary_clear,
-      .request = ecore_x_selection_secondary_request,
-   },
-   ARRAYINIT(ELM_SEL_CLIPBOARD) {
-      .debug = "Clipboard",
-      .ecore_sel = ECORE_X_SELECTION_CLIPBOARD,
-      .set = ecore_x_selection_clipboard_set,
-      .clear = ecore_x_selection_clipboard_clear,
-      .request = ecore_x_selection_clipboard_request,
-   },
-   ARRAYINIT(ELM_SEL_XDND) {
-      .debug = "XDnD",
-      .ecore_sel = ECORE_X_SELECTION_XDND,
-      .request = ecore_x_selection_xdnd_request,
-   },
+     ARRAYINIT(ELM_SEL_PRIMARY) {
+          .debug = "Primary",
+          .ecore_sel = ECORE_X_SELECTION_PRIMARY,
+          .set = ecore_x_selection_primary_set,
+          .clear = ecore_x_selection_primary_clear,
+          .request = ecore_x_selection_primary_request,
+     },
+     ARRAYINIT(ELM_SEL_SECONDARY) {
+          .debug = "Secondary",
+          .ecore_sel = ECORE_X_SELECTION_SECONDARY,
+          .set = ecore_x_selection_secondary_set,
+          .clear = ecore_x_selection_secondary_clear,
+          .request = ecore_x_selection_secondary_request,
+     },
+     ARRAYINIT(ELM_SEL_CLIPBOARD) {
+          .debug = "Clipboard",
+          .ecore_sel = ECORE_X_SELECTION_CLIPBOARD,
+          .set = ecore_x_selection_clipboard_set,
+          .clear = ecore_x_selection_clipboard_clear,
+          .request = ecore_x_selection_clipboard_request,
+     },
+     ARRAYINIT(ELM_SEL_XDND) {
+          .debug = "XDnD",
+          .ecore_sel = ECORE_X_SELECTION_XDND,
+          .request = ecore_x_selection_xdnd_request,
+     },
 };
 
 /* Data for DND in progress */
@@ -420,23 +407,801 @@ static Ecore_Event_Handler *handler_status = NULL;
 /* Stringshared, so I can just compare pointers later */
 static const char *text_uri;
 
+/* For convert EFL to HTML */
+
+#define TAGPOS_START    0x00000001
+#define TAGPOS_END      0x00000002
+#define TAGPOS_ALONE    0x00000003
+
+/* TEXTBLOCK tag using stack but close tag word has no mean maybe bug...
+ * TEXTBLOCK <b>bold<font>font</b>bold</font>
+ * HTML <b>bold<font>font bold</b>font</font> */
+
+typedef struct _TagTable {
+     char *src;
+     char *dst;
+     char tagType;
+}TagTable;
+
+TagTable _EFLtoHTMLConvertTable[] = {
+       {"font", "font", 0},
+       {"underline", "del", 0},
+       {"strikethrough", "ins", 0},
+       {"br", "br", 1},
+       {"ps", "br", 1},
+       {"b", "b", 1},
+       {"item", "img", 1}
+};
+
+TagTable _HTMLtoEFLConvertTable[] = {
+       {"font", "", 0},
+       {"del", "underline", 0},
+       {"u", "underline", 0},
+       {"ins", "strikethrough", 0},
+       {"s", "strikethrough", 0},
+       {"br", "br", 1},
+       {"b", "b", 1},
+       {"strong", "b", 1},
+       {"img", "item", 1}
+};
+
+
+typedef struct _TagNode TagNode, *PTagNode;
+struct _TagNode {
+     char *tag;  //EINA_STRINGSHARE if NULL just str
+     char *tag_str;
+     char *str;
+     char *pos_in_ori_str;
+     PTagNode matchTag;
+     void *tagData;
+     unsigned char tagPosType;
+};
+
+typedef struct _FontTagData FontTagData, *PFontTagData;
+struct _FontTagData {
+     char *name;
+     char *color;
+     char *size;
+     char *bg_color;
+};
+
+
+typedef struct _ItemTagData ItemTagData, *PItemTagData;
+struct _ItemTagData {
+     char *href;
+     char *width;
+     char *height;
+};
+
+#define SAFEFREE(ptr) \
+   do\
+{\
+   if (ptr)\
+   free(ptr);\
+   ptr = NULL;\
+} while(0);\
+
+#define freeAndAssign(dst, value) \
+   do\
+{\
+   if (value)\
+     {\
+        SAFEFREE(dst);\
+        dst = value;\
+     }\
+} while(0);
+
+
+static PTagNode _new_tag_node(char *tag, char *tag_str, char* str, char *pos_in_ori_str);
+static PTagNode _get_start_node(char *str);
+static PTagNode _get_next_node(PTagNode prev);
+static void _delete_node(PTagNode node);
+static void _link_match_tags(Eina_List *nodes);
+static char *_get_tag_value(const char *tag_str, const char *tag_name);
+static char *_convert_to_html(Eina_List* nodes);
+static void _set_EFL_tag_data(Eina_List* nodes);
+static char *_convert_to_edje(Eina_List* nodes);
+static void _set_HTML_tag_data(Eina_List* nodes);
+static PFontTagData _set_EFL_font_data(PFontTagData data, const char *tag_str);
+static PItemTagData _set_EFL_item_data(PItemTagData data, const char *tag_str);
+static PFontTagData _set_HTML_font_data(PFontTagData data, const char *tag_str);
+static PItemTagData _set_HTML_img_data(PItemTagData data, const char *tag_str);
+
+#ifdef DEBUGON
+static void _dumpNode(Eina_List* nodes);
+#endif
+
+static PTagNode
+_new_tag_node(char *tag, char *tag_str, char* str, char *pos_in_ori_str)
+{
+   PTagNode newNode = calloc(1, sizeof(TagNode));
+   if (tag)
+     eina_str_tolower(&tag);
+   newNode->tag = tag;
+   if (tag_str)
+     eina_str_tolower(&tag_str);
+   newNode->tag_str = tag_str;
+   newNode->str = str;
+   newNode->pos_in_ori_str = pos_in_ori_str;
+   return newNode;
+}
+
+static PTagNode
+_get_start_node(char *str)
+{
+   char *startStr = NULL;
+   if (!str || str[0] == '\0')
+     return NULL;
+
+   if (str[0] != '<')
+     {
+        char *tagStart = strchr(str, '<');
+        if (!tagStart)
+          startStr = strdup(str);
+        else
+          {
+             int strLength = tagStart - str;
+             startStr = malloc(sizeof(char) * (strLength + 1));
+             strncpy(startStr, str, strLength);
+             startStr[strLength] = '\0';
+          }
+     }
+
+   return _new_tag_node(NULL, NULL, startStr, str);
+}
+
+static PTagNode
+_get_next_node(PTagNode prev)
+{
+   PTagNode retTag = NULL;
+   char *tagStart;
+   char *tagEnd;
+   char *tagNameEnd = NULL;
+   char *nextTagStart;
+
+   if (prev->tag == NULL)
+     tagStart = strchr(prev->pos_in_ori_str, '<');
+   else
+     tagStart = strchr(prev->pos_in_ori_str + 1, '<');
+
+   if (!tagStart)
+     return retTag;
+
+   tagEnd = strchr(tagStart, '>');
+   nextTagStart = strchr(tagStart + 1, '<');
+
+   if (!tagEnd || (nextTagStart && (nextTagStart < tagEnd)))
+        return _get_start_node(tagStart + 1);
+
+   int spCnt = 5;
+   char *spArray[spCnt];
+   spArray[0] = strchr(tagStart, '=');
+   spArray[1] = strchr(tagStart, '_');
+   spArray[2] = strchr(tagStart, ' ');
+   spArray[3] = strchr(tagStart, '\t');
+   spArray[4] = strchr(tagStart, '\n');
+   tagNameEnd = tagEnd;
+
+   int i;
+   for (i = 0; i < spCnt; i++)
+     {
+        if (spArray[i] && spArray[i] < tagNameEnd)
+          tagNameEnd = spArray[i];
+     }
+
+   int tagLength = tagNameEnd - tagStart - 1;
+   char *tagName = NULL;
+   if (!strncmp(&tagStart[1], "color", tagLength))
+     tagName = strndup("font", 4);
+   else if (!strncmp(&tagStart[1], "/color", tagLength))
+     tagName = strndup("/font", 5);
+   else if (!strncmp(&tagStart[1], "/item", tagLength))
+     tagName = strdup("");
+   else
+     tagName = strndup(&tagStart[1], tagLength);
+
+   int tagStrLength = 0;
+   char *tagStr = NULL;
+   if (tagName)
+     {
+        tagStrLength = tagEnd - tagStart + 1;
+        tagStr = strndup(tagStart, tagStrLength);
+     }
+
+   unsigned int strLength = nextTagStart ? (unsigned int)(nextTagStart - tagEnd - 1) : strlen(&tagEnd[1]);
+   char *str = strndup(&tagEnd[1], strLength);
+
+   retTag = _new_tag_node(tagName, tagStr, str, tagStart);
+   return retTag;
+}
+
+
+static void
+_delete_node(PTagNode node)
+{
+   if (node)
+     {
+        SAFEFREE(node->tag_str);
+        SAFEFREE(node->str);
+
+        if (node->tagData)
+          {
+             if (node->tag)
+               {
+                  if (!strcmp("font", node->tag))
+                    {
+                       PFontTagData data = node->tagData;
+                       SAFEFREE(data->name);
+                       SAFEFREE(data->color);
+                       SAFEFREE(data->size);
+                       SAFEFREE(data->bg_color);
+                    }
+                  if (!strcmp("item", node->tag))
+                    {
+                       PItemTagData data = node->tagData;
+                       SAFEFREE(data->href);
+                       SAFEFREE(data->width);
+                       SAFEFREE(data->height);
+                    }
+
+               }
+             SAFEFREE(node->tagData);
+          }
+        SAFEFREE(node->tag);
+        SAFEFREE(node);
+     }
+}
+
+static void
+_link_match_tags(Eina_List *nodes)
+{
+   Eina_List *stack = NULL;
+
+   PTagNode trail, popData;
+   Eina_List *l, *r;
+
+   EINA_LIST_FOREACH(nodes, l, trail)
+     {
+        if (!trail->tag || trail->tag[0] == '\0')
+          continue;
+        if (!strcmp("br", trail->tag))
+          {
+             trail->tagPosType = TAGPOS_ALONE;
+             continue;
+          }
+        else if (!strcmp("item", trail->tag) || !strcmp("img", trail->tag))
+          {
+             trail->tagPosType = TAGPOS_ALONE;
+             continue;
+          }
+
+        if (trail->tag[0] != '/') // PUSH
+          {
+             stack = eina_list_append(stack, trail);
+/*             eina_array_push(stack, trail);
+             cnp_debug("stack: %d, tag %s\n", eina_array_count_get(stack), trail->tag);*/
+             cnp_debug("stack: %d, tag %s\n", eina_list_count(stack), trail->tag);
+          }
+        else // POP
+          {
+             if (!eina_list_count(stack))
+               {
+                  cnp_debug("tag not matched %s\n", trail->tag);
+                  continue;
+               }
+
+             EINA_LIST_REVERSE_FOREACH(stack, r, popData)
+               {
+                  if (popData->tag && !strcmp(popData->tag, &trail->tag[1]))
+                    {
+                       popData->tagPosType = TAGPOS_START;
+                       trail->tagPosType = TAGPOS_END;
+                       popData->matchTag = trail;
+                       trail->matchTag = popData;
+                       stack = eina_list_remove_list(stack, r);
+                       break;
+                    }
+               }
+/*             popData = eina_array_pop(stack);
+
+             popData->tagPosType = TAGPOS_START;
+             trail->tagPosType = TAGPOS_END;
+             popData->matchTag = trail;
+             trail->matchTag = popData;
+             cnp_debug("pop stack: %d, tag %s\n", eina_array_count_get(stack), trail->tag);
+             */
+          }
+     }
+
+/*   if (eina_array_count_get(stack))
+     cnp_debug("stack state: %d, tag %s\n", eina_array_count_get(stack), trail->tag);*/
+
+   /* Make Dummy close tag */
+/*   while ((popData = eina_array_pop(stack)))  */
+
+   EINA_LIST_REVERSE_FOREACH(stack, r, popData)
+     {
+        PTagNode newData;
+        int tagLength = strlen(popData->tag);
+        char *tagName = malloc(sizeof(char) * (tagLength + 2));
+
+        tagName[0] = '/';
+        tagName[1] = '\0';
+        strcat(tagName, popData->tag);
+
+        newData = _new_tag_node(tagName, NULL, NULL, NULL);
+        popData->tagPosType = TAGPOS_START;
+        newData->tagPosType = TAGPOS_END;
+        popData->matchTag = newData;
+        newData->matchTag = popData;
+        nodes = eina_list_append(nodes, newData);
+/*        cnp_debug("stack: %d, tag %s\n", eina_array_count_get(stack), popData->tag);*/
+     }
+/*   cnp_debug("stack_top: %d\n", eina_array_count_get(stack));
+   eina_array_free(stack);*/
+   eina_list_free(stack);
+}
+
+static char *
+_get_tag_value(const char *tag_str, const char *tag_name)
+{
+   if (!tag_name || !tag_str)
+     return NULL;
+
+   char *tag;
+   if ((tag = strstr(tag_str, tag_name)))
+     {
+        if (tag[strlen(tag_name)] == '_')
+          return NULL;
+        char *value = strchr(tag, '=');
+        if (value)
+          {
+             do
+               {
+                  value++;
+               } while (!isalnum(*value) && *value != '#');
+
+             int spCnt = 6;
+             char *spArray[spCnt];
+             spArray[0] = strchr(value, ' ');
+             spArray[1] = strchr(value, '>');
+             spArray[2] = strchr(value, '\"');
+             spArray[3] = strchr(value, '\'');
+             spArray[4] = strchr(value, '\t');
+             spArray[5] = strchr(value, '\n');
+             char *valueEnd = strchr(value, '\0');
+
+             int i;
+             int start = 0;
+             if ((!strncmp(tag_str, "<item", 5) && !strcmp(tag_name, "href")) // EFL img tag
+               || (!strncmp(tag_str, "<img", 4) && !strcmp(tag_name, "src"))) // HTML img tag
+               start = 1;
+
+             for (i = start; i < spCnt; i++)
+               {
+                  if (spArray[i] && spArray[i] < valueEnd)
+                    valueEnd = spArray[i];
+               }
+
+             int valueLength = valueEnd - value;
+             return strndup(value, valueLength);
+          }
+     }
+   return NULL;
+}
+
+static PFontTagData
+_set_EFL_font_data(PFontTagData data, const char *tag_str)
+{
+   char *value;
+
+   if (!data)
+     data = calloc(1, sizeof(FontTagData));
+   value = _get_tag_value(tag_str, "font_size");
+   freeAndAssign(data->size, value);
+   value = _get_tag_value(tag_str, "color");
+   freeAndAssign(data->color, value);
+   value = _get_tag_value(tag_str, "bgcolor");
+   freeAndAssign(data->bg_color, value);
+   value = _get_tag_value(tag_str, "font");
+   freeAndAssign(data->name, value);
+
+   return data;
+}
+
+static PItemTagData
+_set_EFL_item_data(PItemTagData data, const char *tag_str)
+{
+   char *value;
+
+   if (!data)
+     data = calloc(1, sizeof(ItemTagData));
+   value = _get_tag_value(tag_str, "href");
+   if (value)
+     {
+        char *path = strstr(value, "file://");
+        if (path)
+          {
+             char *modify = malloc(sizeof(char) * (strlen(value) + 1));
+             strncpy(modify, "file://", 8);
+             path += 7;
+             while (path[1] && path[0] && path[1] == '/' && path[0] == '/')
+               {
+                  path++;
+               }
+             strcat(modify, path);
+             data->href = modify;
+             cnp_debug("image href ---%s---\n", data->href);
+             free(value);
+          }
+        else
+          freeAndAssign(data->href, value);
+     }
+
+   value = _get_tag_value(tag_str, "absize");
+   if (value)
+     {
+        char *xpos = strchr(value, 'x');
+        if (xpos)
+          {
+             int absizeLen = strlen(value);
+             freeAndAssign(data->width, strndup(value, xpos - value));
+             freeAndAssign(data->height, strndup(xpos + 1, absizeLen - (xpos - value) - 1));
+             cnp_debug("image width: -%s-, height: -%s-\n", data->width, data->height);
+          }
+        free(value);
+     }
+   return data;
+}
+
+static void
+_set_EFL_tag_data(Eina_List* nodes)
+{
+   PTagNode trail;
+   Eina_List *l;
+
+   EINA_LIST_FOREACH(nodes, l, trail)
+     {
+        if (!trail->tag)
+          continue;
+        if (!strcmp("font", trail->tag))
+             trail->tagData = _set_EFL_font_data(trail->tagData, trail->tag_str);
+        else if (!strcmp("item", trail->tag))
+             trail->tagData = _set_EFL_item_data(trail->tagData, trail->tag_str);
+     }
+}
+
+static PFontTagData
+_set_HTML_font_data(PFontTagData data, const char *tag_str)
+{
+   char *value;
+
+   if (!data)
+     data = calloc(1, sizeof(FontTagData));
+   value = _get_tag_value(tag_str, "size");
+   freeAndAssign(data->size, value);
+   value = _get_tag_value(tag_str, "color");
+   freeAndAssign(data->color, value);
+   value = _get_tag_value(tag_str, "bgcolor");
+   freeAndAssign(data->bg_color, value);
+   value = _get_tag_value(tag_str, "face");
+   freeAndAssign(data->name, value);
+
+   return data;
+}
+
+static PItemTagData
+_set_HTML_img_data(PItemTagData data, const char *tag_str)
+{
+   char *value;
+
+   if (!data)
+     data = calloc(1, sizeof(ItemTagData));
+   value = _get_tag_value(tag_str, "src");
+   if (value)
+     {
+        char *path = strstr(value, "file://");
+        if (path)
+          {
+             char *modify = malloc(sizeof(char) * (strlen(value) + 1));
+             strncpy(modify, "file://", 8);
+             path += 7;
+             while (path[1] && path[0] && path[1] == '/' && path[0] == '/')
+               {
+                  path++;
+               }
+             strcat(modify, path);
+             data->href = modify;
+             cnp_debug("image src ---%s---\n", data->href);
+             free(value);
+          }
+        else
+          freeAndAssign(data->href, value);
+     }
+
+   value = _get_tag_value(tag_str, "width");
+   freeAndAssign(data->width, value);
+   value = _get_tag_value(tag_str, "height");
+   freeAndAssign(data->height, value);
+   return data;
+}
+
+static void
+_set_HTML_tag_data(Eina_List* nodes)
+{
+   PTagNode trail;
+   Eina_List *l;
+
+   EINA_LIST_FOREACH(nodes, l, trail)
+     {
+        if (!trail->tag)
+          continue;
+        if (!strcmp("font", trail->tag))
+             trail->tagData = _set_HTML_font_data(trail->tagData, trail->tag_str);
+        else if (!strcmp("img", trail->tag))
+             trail->tagData = _set_HTML_img_data(trail->tagData, trail->tag_str);
+     }
+}
+
+#ifdef DEBUGON
+static void
+_dumpNode(Eina_List* nodes)
+{
+   PTagNode trail;
+   Eina_List *l;
+
+   EINA_LIST_FOREACH(nodes, l, trail)
+     {
+        cnp_debug("tag: %s, tag_str: %s, str: %s, tagPosType: %d\n",
+               trail->tag, trail->tag_str, trail->str, trail->tagPosType);
+        cnp_debug("matchTag: %x ", (unsigned int)trail->matchTag);
+        if (trail->matchTag)
+          cnp_debug("matchTag->tag_str: %s", trail->matchTag->tag_str);
+        if (trail->tagData)
+          {
+             if (!strcmp(trail->tag, "font"))
+               {
+                  PFontTagData data = trail->tagData;
+                  cnp_debug(" tagData->name: %s, tagData->color: %s, tagData->size: %s, tagData->bg_color: %s",
+                         data->name, data->color, data->size, data->bg_color);
+               }
+             else if (!strcmp(trail->tag, "item") || !strcmp(trail->tag, "img"))
+               {
+                  PItemTagData data = trail->tagData;
+                  cnp_debug(" tagData->href: %s, tagData->width: %s, tagData->height: %s",
+                         data->href, data->width, data->height);
+               }
+             else
+               cnp_debug("\nERROR!!!! not need tagData");
+          }
+        cnp_debug("\n");
+     }
+}
+#endif
+
+static char *
+_convert_to_html(Eina_List* nodes)
+{
+   PTagNode trail;
+   Eina_List *l;
+
+   Eina_Strbuf *html = eina_strbuf_new();
+
+   int tableCnt = sizeof(_EFLtoHTMLConvertTable) / sizeof(TagTable);
+
+   EINA_LIST_FOREACH(nodes, l, trail)
+     {
+        if (trail->tag)
+          {
+             char *tagName = trail->tagPosType == TAGPOS_END ?
+                trail->matchTag->tag : trail->tag;
+             int j;
+             for(j = 0; j < tableCnt; j++)
+               {
+                  if (!strcmp(_EFLtoHTMLConvertTable[j].src, tagName))
+                    {
+                       switch(trail->tagPosType)
+                         {
+                          case TAGPOS_END:
+                             eina_strbuf_append(html, "</");
+                             break;
+                          default:
+                             eina_strbuf_append(html, "<");
+                             break;
+                         }
+
+                       eina_strbuf_append(html, _EFLtoHTMLConvertTable[j].dst);
+                       if (trail->tagPosType != TAGPOS_END)
+                         {
+                            if (!strcmp(_EFLtoHTMLConvertTable[j].src, "font"))
+                              {
+                                 PFontTagData data = trail->tagData;
+                                 if (data->name)
+                                   {
+                                   }
+                                 if (data->color)
+                                   eina_strbuf_append_printf(html, " color=\"%s\"", data->color);
+                                 if (data->size)
+                                   eina_strbuf_append_printf(html, " size=\"%s\"", data->size);
+                                 if (data->bg_color)
+                                   {
+                                   }
+                              }
+                            else if (!strcmp(_EFLtoHTMLConvertTable[j].src, "item"))
+                              {
+                                 PItemTagData data = trail->tagData;
+                                 if (data->href)
+                                   eina_strbuf_append_printf(html, " src=\"%s\"", data->href);
+                                 if (data->width)
+                                   eina_strbuf_append_printf(html, " width=\"%s\"", data->width);
+                                 if (data->height)
+                                   eina_strbuf_append_printf(html, " height=\"%s\"", data->height);
+                              }
+                         }
+                       switch(trail->tagPosType)
+                         {
+                            /* closed tag does not need in HTML
+                          case TAGPOS_ALONE:
+                             eina_strbuf_append(html, " />");
+                             break;*/
+                          default:
+                             eina_strbuf_append(html, ">");
+                             break;
+                         }
+                       break;
+                    }
+               }
+          }
+        if (trail->str)
+          eina_strbuf_append(html, trail->str);
+     }
+
+   char *ret = eina_strbuf_string_steal(html);
+   eina_strbuf_free(html);
+   return ret;
+}
+
+#define IMAGE_DEFAULT_WIDTH "240"
+#define IMAGE_DEFAULT_HEIGHT "180"
+
+
+static char *
+_convert_to_edje(Eina_List* nodes)
+{
+   PTagNode trail;
+   Eina_List *l;
+
+   Eina_Strbuf *html = eina_strbuf_new();
+
+   int tableCnt = sizeof(_HTMLtoEFLConvertTable) / sizeof(TagTable);
+
+   EINA_LIST_FOREACH(nodes, l, trail)
+     {
+        if (trail->tag)
+          {
+             char *tagName = trail->tagPosType == TAGPOS_END ?
+                trail->matchTag->tag : trail->tag;
+             int j;
+             for(j = 0; j < tableCnt; j++)
+               {
+                  if (!strcmp(_HTMLtoEFLConvertTable[j].src, tagName))
+                    {
+                       if (_HTMLtoEFLConvertTable[j].dst[0] != '\0')
+                         {
+                            switch(trail->tagPosType)
+                              {
+                               case TAGPOS_END:
+                                  eina_strbuf_append(html, "</");
+                                  break;
+                               default:
+                                  eina_strbuf_append(html, "<");
+                                  break;
+                              }
+
+                            eina_strbuf_append(html, _HTMLtoEFLConvertTable[j].dst);
+                         }
+                       if (trail->tagPosType != TAGPOS_END)
+                         {
+                            if (!strcmp(_HTMLtoEFLConvertTable[j].src, "font"))
+                              {
+                                 PFontTagData data = trail->tagData;
+                                 if (data->name)
+                                   {
+                                   }
+                                 if (data->color)
+                                   eina_strbuf_append_printf(html, "<color=%s>", data->color);
+                                 if (data->size)
+                                   eina_strbuf_append_printf(html, "<font_size=%s>", data->size);
+                                 if (data->bg_color)
+                                   {
+                                   }
+                                 break;
+                              }
+                            else if (!strcmp(_HTMLtoEFLConvertTable[j].src, "img"))
+                              {
+                                 PItemTagData data = trail->tagData;
+                                 char *width = IMAGE_DEFAULT_WIDTH, *height = IMAGE_DEFAULT_HEIGHT;
+                                 if (data->width)
+                                   width = data->width;
+                                 if (data->height)
+                                   height = data->height;
+                                 eina_strbuf_append_printf(html, " absize=%sx%s", width, height);
+                                 if (data->href)
+                                   eina_strbuf_append_printf(html, " href=%s></item>", data->href);
+                                 break;
+                              }
+                         }
+                       else
+                         {
+                            if (_HTMLtoEFLConvertTable[j].dst[0] == '\0')
+                              {
+                                 if (!strcmp(_HTMLtoEFLConvertTable[j].src, "font"))
+                                   {
+                                      if (trail->matchTag->tagData)
+                                        {
+                                           PFontTagData data = trail->matchTag->tagData;
+                                           if (data->name)
+                                             {
+                                             }
+                                           if (data->color)
+                                             eina_strbuf_append_printf(html, "</color>");
+                                           if (data->size)
+                                             eina_strbuf_append_printf(html, "</font>");
+                                           if (data->bg_color)
+                                             {
+                                             }
+                                           break;
+                                        }
+                                   }
+                              }
+                         }
+                       switch(trail->tagPosType)
+                         {
+                            /* not support in efl
+                          case TAGPOS_ALONE:
+                             eina_strbuf_append(html, " />");
+                             break;
+                             */
+                          default:
+                             eina_strbuf_append(html, ">");
+                             break;
+                         }
+                       break;
+                    }
+               }/* for(j = 0; j < tableCnt; j++) end */
+          }
+        if (trail->str)
+          eina_strbuf_append(html, trail->str);
+     }
+
+   char *ret = eina_strbuf_string_steal(html);
+   eina_strbuf_free(html);
+   return ret;
+
+}
+
 Eina_Bool
 elm_selection_set(Elm_Sel_Type selection, Evas_Object *widget, Elm_Sel_Format format, const char *selbuf)
 {
 #ifdef HAVE_ELEMENTARY_X
+   Evas_Object *top = elm_widget_top_get(widget);
+   Ecore_X_Window xwin;
    Cnp_Selection *sel;
 
+   if (top) xwin = elm_win_xwindow_get(top);
+   else xwin = elm_win_xwindow_get(widget);
+   if (!xwin) return EINA_FALSE;
    if ((unsigned int)selection >= (unsigned int)ELM_SEL_MAX) return EINA_FALSE;
    if (!_elm_cnp_init_count) _elm_cnp_init();
    if ((!selbuf) && (format != ELM_SEL_FORMAT_IMAGE))
-      return elm_selection_clear(selection, widget);
+     return elm_selection_clear(selection, widget);
 
    sel = selections + selection;
 
    sel->active = 1;
    sel->widget = widget;
 
-   sel->set(elm_win_xwindow_get(widget),&selection,sizeof(Elm_Sel_Type));
+   sel->set(xwin, &selection, sizeof(Elm_Sel_Type));
    sel->format = format;
    sel->selbuf = selbuf ? strdup(selbuf) : NULL;
 
@@ -472,7 +1237,7 @@ elm_selection_clear(Elm_Sel_Type selection, Evas_Object *widget)
 
 Eina_Bool
 elm_selection_get(Elm_Sel_Type selection, Elm_Sel_Format format,
-                       Evas_Object *widget, Elm_Drop_Cb datacb, void *udata)
+                  Evas_Object *widget, Elm_Drop_Cb datacb, void *udata)
 {
 #ifdef HAVE_ELEMENTARY_X
    Evas_Object *top;
@@ -503,19 +1268,19 @@ static Eina_Bool
 _elm_cnp_init(void)
 {
    int i;
-   
+
    if (_elm_cnp_init_count++) return EINA_TRUE;
    for (i = 0; i < CNP_N_ATOMS; i++)
      {
-       atoms[i].atom = ecore_x_atom_get(atoms[i].name);
-       ecore_x_selection_converter_atom_add(atoms[i].atom,
+        atoms[i].atom = ecore_x_atom_get(atoms[i].name);
+        ecore_x_selection_converter_atom_add(atoms[i].atom,
                                              atoms[i].converter);
      }
    clipboard_atom = ecore_x_atom_get("CLIPBOARD");
 
    ecore_event_handler_add(ECORE_X_EVENT_SELECTION_CLEAR, selection_clear, NULL);
    ecore_event_handler_add(ECORE_X_EVENT_SELECTION_NOTIFY, selection_notify, NULL);
-   
+
    text_uri = eina_stringshare_add("text/uri-list");
    return EINA_TRUE;
 }
@@ -526,10 +1291,10 @@ selection_clear(void *udata __UNUSED__, int type __UNUSED__, void *event)
    Ecore_X_Event_Selection_Clear *ev = event;
    Cnp_Selection *sel;
    int i;
-   
+
    for (i = 0; i < ELM_SEL_MAX; i++)
      {
-       if (selections[i].ecore_sel == ev->selection) break;
+        if (selections[i].ecore_sel == ev->selection) break;
      }
    cnp_debug("selection %d clear\n", i);
    /* Not me... Don't care */
@@ -556,41 +1321,41 @@ selection_notify(void *udata __UNUSED__, int type __UNUSED__, void *event)
    Ecore_X_Event_Selection_Notify *ev = event;
    Cnp_Selection *sel;
    int i;
-   
+
    cnp_debug("selection notify callback: %d\n",ev->selection);
    switch (ev->selection)
      {
       case ECORE_X_SELECTION_CLIPBOARD:
-        sel = selections + ELM_SEL_CLIPBOARD;
-        break;
+         sel = selections + ELM_SEL_CLIPBOARD;
+         break;
       case ECORE_X_SELECTION_PRIMARY:
-        sel = selections + ELM_SEL_PRIMARY;
-        break;
+         sel = selections + ELM_SEL_PRIMARY;
+         break;
       case ECORE_X_SELECTION_SECONDARY:
-        sel = selections + ELM_SEL_SECONDARY;
-        break;
+         sel = selections + ELM_SEL_SECONDARY;
+         break;
       case ECORE_X_SELECTION_XDND:
-        sel = selections + ELM_SEL_XDND;
-        break;
+         sel = selections + ELM_SEL_XDND;
+         break;
       default:
-        return ECORE_CALLBACK_PASS_ON;
+         return ECORE_CALLBACK_PASS_ON;
      }
    cnp_debug("Target is %s\n", ev->target);
-   
+
    for (i = 0; i < CNP_N_ATOMS; i++)
      {
-       if (!strcmp(ev->target, atoms[i].name))
-         {
-            if (atoms[i].notify)
+        if (!strcmp(ev->target, atoms[i].name))
+          {
+             if (atoms[i].notify)
                {
                   cnp_debug("Found something: %s\n", atoms[i].name);
-                 atoms[i].notify(sel, ev);
-               } 
-             else 
+                  atoms[i].notify(sel, ev);
+               }
+             else
                {
-                 cnp_debug("Ignored: No handler!\n");
+                  cnp_debug("Ignored: No handler!\n");
                }
-         }
+          }
      }
 
    return ECORE_CALLBACK_PASS_ON;
@@ -604,20 +1369,22 @@ targets_converter(char *target __UNUSED__, void *data, int size __UNUSED__, void
    int i,count;
    Ecore_X_Atom *aret;
    Cnp_Selection *sel;
-   
+
    if (!data_ret) return EINA_FALSE;
+   if (!data || (*((unsigned int *)data) >= ELM_SEL_MAX))
+     return EINA_FALSE;
 
    sel = selections + *((int *)data);
 
    for (i = 0, count = 0; i < CNP_N_ATOMS ; i++)
      {
-       if (sel->format & atoms[i].formats) count++;
+        if (sel->format & atoms[i].formats) count++;
      }
 
    aret = malloc(sizeof(Ecore_X_Atom) * count);
    for (i = 0, count = 0; i < CNP_N_ATOMS; i++)
      {
-       if (sel->format & atoms[i].formats) aret[count ++] = atoms[i].atom;
+        if (sel->format & atoms[i].formats) aret[count ++] = atoms[i].atom;
      }
 
    *data_ret = aret;
@@ -641,7 +1408,7 @@ vcard_send(char *target __UNUSED__, void *data __UNUSED__, int size __UNUSED__,
    Cnp_Selection *sel;
 
    cnp_debug("Vcard send called\n");
-   
+
    sel = selections + *((int *)data);
 
    if (data_ret) *data_ret = strdup(sel->selbuf);
@@ -649,6 +1416,28 @@ vcard_send(char *target __UNUSED__, void *data __UNUSED__, int size __UNUSED__,
 
    return EINA_TRUE;
 }
+
+static Eina_Bool
+is_uri_type_data(Cnp_Selection *sel __UNUSED__, Ecore_X_Event_Selection_Notify *notify)
+{
+   Ecore_X_Selection_Data *data;
+   char *p;
+
+   data = notify->data;
+   cnp_debug("data->format is %d %p %p\n", data->format, notify, data);
+   if (data->content == ECORE_X_SELECTION_CONTENT_FILES) return EINA_TRUE;
+   else p = (char *)data->data;
+
+   if (!p) return EINA_TRUE;
+   cnp_debug("Got %s\n", p);
+   if (strncmp(p, "file://", 7))
+     {
+        if (*p != '/') return EINA_FALSE;
+     }
+
+   return EINA_TRUE;
+}
+
 /*
  * Callback to handle a targets response on a selection request:
  * So pick the format we'd like; and then request it.
@@ -658,31 +1447,41 @@ notify_handler_targets(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notif
 {
    Ecore_X_Selection_Data_Targets *targets;
    Ecore_X_Atom *atomlist;
+   Evas_Object *top;
    int i, j;
-   
+
    targets = notify->data;
    atomlist = (Ecore_X_Atom *)(targets->data.data);
 
    for (j = 1; j < CNP_N_ATOMS; j++)
      {
-       cnp_debug("\t%s %d\n", atoms[j].name, atoms[j].atom);
-       if (!(atoms[j].formats & sel->requestformat)) continue;
-       for (i = 0; i < targets->data.length; i++)
-         {
-            if ((atoms[j].atom == atomlist[i]) && (atoms[j].notify))
-              {
-                 cnp_debug("Atom %s matches\n",atoms[j].name);
-                 goto done;
-              }
-         }
+        cnp_debug("\t%s %d\n", atoms[j].name, atoms[j].atom);
+        if (!(atoms[j].formats & sel->requestformat)) continue;
+        for (i = 0; i < targets->data.length; i++)
+          {
+             if ((atoms[j].atom == atomlist[i]) && (atoms[j].notify))
+               {
+#if 0
+                  if ((j == CNP_ATOM_text_uri) ||
+                      (j == CNP_ATOM_text_urilist))
+                    {
+                      if(!is_uri_type_data(sel, notify)) continue;
+                    }
+#endif
+                  cnp_debug("Atom %s matches\n",atoms[j].name);
+                  goto done;
+               }
+          }
      }
 
    cnp_debug("Couldn't find anything that matches\n");
    return ECORE_CALLBACK_PASS_ON;
 
-   done:
-   cnp_debug("Sending request for %s\n",atoms[j].name);
-   sel->request(elm_win_xwindow_get(sel->requestwidget), atoms[j].name);
+done:
+   top = elm_widget_top_get(sel->requestwidget);
+   if (!top) top = sel->requestwidget;
+   cnp_debug("Sending request for %s\n", atoms[j].name);
+   sel->request(elm_win_xwindow_get(top), atoms[j].name);
 
    return ECORE_CALLBACK_PASS_ON;
 }
@@ -701,44 +1500,107 @@ response_handler_targets(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *not
    /* Start from 1: Skip targets */
    for (j = 1 ; j < CNP_N_ATOMS ; j ++)
      {
-       if (!(atoms[j].formats & sel->requestformat)) continue;
-       for (i = 0 ; i < targets->data.length ; i ++)
-         {
-            if ((atoms[j].atom == atomlist[i]) && (atoms[j].response))
+        if (!(atoms[j].formats & sel->requestformat)) continue;
+        for (i = 0 ; i < targets->data.length ; i ++)
+          {
+             if ((atoms[j].atom == atomlist[i]) && (atoms[j].response))
                {
-                 /* Found a match: Use it */
-                 goto found;
+                  /* Found a match: Use it */
+                  goto found;
                }
           }
      }
 found:
    if (j == CNP_N_ATOMS)
      {
-       cnp_debug("No matching type found\n");
-       return 0;
+        cnp_debug("No matching type found\n");
+        return 0;
      }
-   
+
    top = elm_widget_top_get(sel->requestwidget);
    if (!top) return 0;
-   
+
    sel->request(elm_win_xwindow_get(top), atoms[j].name);
    return 0;
 }
 
+static void
+entry_insert_filter(Evas_Object* entry, char* str)
+{
+   if (!entry || !str)
+     return;
+
+   char *insertStr = str;
+   // if entry has text only set then remove item tags
+   if (elm_entry_cnp_textonly_get(entry))
+     {
+        while (EINA_TRUE)
+          {
+             char *startTag = NULL;
+             char *endTag = NULL;
+
+             startTag = strstr(insertStr, "<item");
+             if (!startTag)
+               startTag = strstr(insertStr, "</item");
+             if (startTag)
+               endTag = strstr(startTag, ">");
+             else
+               break;
+             if (!endTag || startTag > endTag)
+               {
+                  cnp_debug("Broken tag: %s\n", str);
+                  break;
+               }
+
+             size_t sindex = startTag - insertStr;
+             size_t eindex = endTag - insertStr + 1;
+
+             Eina_Strbuf *buf = eina_strbuf_new();
+             if (buf)
+               {
+                  eina_strbuf_append(buf, insertStr);
+                  eina_strbuf_remove(buf, sindex, eindex);
+                  insertStr = eina_strbuf_string_steal(buf);
+                  eina_strbuf_free(buf);
+               }
+          }
+     }
+   cnp_debug("remove item tag: %s\n", insertStr);
+
+   // if entry has single line set then remove <br> & <ps> tags
+   if (elm_entry_single_line_get(entry))
+     {
+        Eina_Strbuf *buf = eina_strbuf_new();
+        if (buf)
+          {
+             eina_strbuf_append(buf, insertStr);
+             eina_strbuf_replace_all(buf, "<br>", "");
+             eina_strbuf_replace_all(buf, "<ps>", "");
+             insertStr = eina_strbuf_string_steal(buf);
+             eina_strbuf_free(buf);
+          }
+     }
+   cnp_debug("remove break tag: %s\n", insertStr);
+
+   elm_entry_entry_insert(entry, insertStr);
+
+   if (insertStr != str)
+     free(insertStr);
+}
 
 static int
 notify_handler_text(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify)
 {
    Ecore_X_Selection_Data *data;
    char *str;
-   
+
    data = notify->data;
 
    if (sel->datacb)
      {
         Elm_Selection_Data ddata;
-        
-        str = mark_up((char *)data->data, data->length, NULL);
+
+        str = strdup(data->data);
         ddata.x = ddata.y = 0;
         ddata.format = ELM_SEL_FORMAT_TEXT;
         ddata.data = str;
@@ -747,11 +1609,12 @@ notify_handler_text(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify)
         free(str);
         return 0;
      }
-   
+
    cnp_debug("Notify handler text %d %d %p\n", data->format,data->length, data->data);
    str = mark_up((char *)data->data, data->length, NULL);
    cnp_debug("String is %s (from %s)\n", str, data->data);
-   elm_entry_entry_insert(sel->requestwidget, str);
+   entry_insert_filter(sel->requestwidget, str);
+   //elm_entry_entry_insert(sel->requestwidget, str);
    free(str);
    return 0;
 }
@@ -766,7 +1629,7 @@ notify_handler_uri(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify)
    Ecore_X_Selection_Data *data;
    Ecore_X_Selection_Data_Files *files;
    Paste_Image *pi;
-   char *p, *pp;
+   char *p, *stripstr;
 
    data = notify->data;
    cnp_debug("data->format is %d %p %p\n", data->format, notify, data);
@@ -780,9 +1643,13 @@ notify_handler_uri(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify)
              cnp_debug("more then one file: Bailing\n");
              return 0;
           }
-        p = files->files[0];
+        stripstr = p = strdup(files->files[0]);
      }
-   else p = (char *)data->data;
+   else
+     {
+        stripstr = p = strndup((char *)data->data, data->length);
+     }
+
    if (!p)
      {
         cnp_debug("Couldn't find a file\n");
@@ -792,23 +1659,31 @@ notify_handler_uri(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify)
    if (sel->datacb)
      {
         Elm_Selection_Data ddata;
-        
+
         ddata.x = ddata.y = 0;
         ddata.format = ELM_SEL_FORMAT_MARKUP;
         ddata.data = p;
         ddata.len = data->length;
         sel->datacb(sel->udata, sel->widget, &ddata);
+        free(p);
         return 0;
      }
    if (strncmp(p, "file://", 7))
      {
         /* Try and continue if it looks sane */
-        if (*p != '/') return 0;
+        if (*p != '/')
+          {
+             free(p);
+             return 0;
+          }
+     }
+   else
+     {
+        p += strlen("file://");
      }
-   else p += strlen("file://");
-   
+
    if (savedtypes.pi) pasteimage_free(savedtypes.pi);
-   pi = pasteimage_alloc(p, data->length);
+   pi = pasteimage_alloc(p, strlen(p));
    if (savedtypes.textreq)
      {
         savedtypes.textreq = 0;
@@ -819,6 +1694,7 @@ notify_handler_uri(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify)
         pasteimage_append(pi, sel->requestwidget);
         savedtypes.pi = NULL;
      }
+   free(stripstr);
    return 0;
 }
 
@@ -838,7 +1714,7 @@ vcard_receive(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify)
    if (sel == (selections + ELM_SEL_XDND))
      {
         Elm_Selection_Data ddata;
-        
+
         cnp_debug("drag & drop\n");
         /* FIXME: this needs to be generic: Used for all receives */
         EINA_LIST_FOREACH(drops, l, dropable)
@@ -873,7 +1749,7 @@ vcard_receive(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify)
      {
         cnp_debug("Paste request\n");
      }
-   
+
    return 0;
 
 }
@@ -885,16 +1761,16 @@ notify_handler_image(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify)
    Ecore_X_Selection_Data *data;
    Tmp_Info *tmp;
    Paste_Image *pi;
-   
+
    cnp_debug("got a png (or a jpeg)!\n");
    data = notify->data;
-   
+
    cnp_debug("Size if %d\n", data->length);
 
    if (sel->datacb)
      {
         Elm_Selection_Data ddata;
-        
+
         ddata.x = ddata.y = 0;
         ddata.format = ELM_SEL_FORMAT_IMAGE;
         ddata.data = data->data;
@@ -902,20 +1778,49 @@ notify_handler_image(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify)
         sel->datacb(sel->udata, sel->widget, &ddata);
         return 0;
      }
-   
+
    /* generate tmp name */
    tmp = elm_cnp_tempfile_create(data->length);
    memcpy(tmp->map, data->data, data->length);
    munmap(tmp->map,data->length);
-   
+
    /* FIXME: Add to paste image data to clean up */
-   pi = pasteimage_alloc(tmp->filename, data->length);
+   pi = pasteimage_alloc(tmp->filename, strlen(tmp->filename));
    pasteimage_append(pi, sel->requestwidget);
 
    tmpinfo_free(tmp);
    return 0;
 }
 
+static int
+notify_handler_edje(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify)
+{
+   Ecore_X_Selection_Data *data;
+
+   data = notify->data;
+
+   char *stripstr = NULL;
+   stripstr = malloc(sizeof(char) * (data->length + 1));
+   strncpy(stripstr, (char *)data->data, data->length);
+   stripstr[data->length] = '\0';
+
+   if (sel->datacb)
+     {
+        Elm_Selection_Data ddata;
+        ddata.x = ddata.y = 0;
+        ddata.format = ELM_SEL_FORMAT_MARKUP;
+        ddata.data = stripstr;
+        ddata.len = data->length;
+        sel->datacb(sel->udata, sel->widget, &ddata);
+     }
+   else
+     entry_insert_filter(sel->requestwidget, stripstr);
+     //elm_entry_entry_insert(sel->requestwidget, stripstr);
+
+   cnp_debug("String is %s (%d bytes)\n", stripstr, data->length);
+   free(stripstr);
+   return 0;
+}
 
 /**
  *    Warning: Generic text/html can';t handle it sanely.
@@ -926,27 +1831,29 @@ static int
 notify_handler_html(Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notify)
 {
    Ecore_X_Selection_Data *data;
-   
+
    cnp_debug("Got some HTML: Checking encoding is useful\n");
    data = notify->data;
-   
+
+   char *stripstr = NULL;
+   stripstr = malloc(sizeof(char) * (data->length + 1));
+   strncpy(stripstr, (char *)data->data, data->length);
+   stripstr[data->length] = '\0';
+
    if (sel->datacb)
      {
         Elm_Selection_Data ddata;
         ddata.x = ddata.y = 0;
         ddata.format = ELM_SEL_FORMAT_HTML;
-        ddata.data = data->data;
+        ddata.data = stripstr;
         ddata.len = data->length;
         sel->datacb(sel->udata, sel->widget, &ddata);
-        return 0;
      }
+   else
+     entry_insert_filter(sel->requestwidget, stripstr);
+     //elm_entry_entry_insert(sel->requestwidget, stripstr);
 
-   char *stripstr = NULL;
-   stripstr = malloc(sizeof(char) * (data->length + 1));
-   strncpy(stripstr, (char *)data->data, data->length);
-   stripstr[data->length] = '\0';
    cnp_debug("String is %s (%d bytes)\n", stripstr, data->length);
-   elm_entry_entry_insert(sel->requestwidget, stripstr);
    free(stripstr);
    return 0;
 }
@@ -960,25 +1867,25 @@ text_converter(char *target __UNUSED__, void *data, int size __UNUSED__, void **
    cnp_debug("text converter\n");
    sel = selections + *((int *)data);
    if (!sel->active) return EINA_TRUE;
-   
-   if ((sel->format == ELM_SEL_FORMAT_MARKUP) ||
-       (sel->format == ELM_SEL_FORMAT_HTML))
+
+   if ((sel->format & ELM_SEL_FORMAT_MARKUP) ||
+       (sel->format & ELM_SEL_FORMAT_HTML))
      {
-       *data_ret = remove_tags(sel->selbuf, size_ret);
+        *data_ret = remove_tags(sel->selbuf, size_ret);
      }
-   else if (sel->format == ELM_SEL_FORMAT_TEXT)
+   else if (sel->format & ELM_SEL_FORMAT_TEXT)
      {
         *data_ret = strdup(sel->selbuf);
         *size_ret = strlen(sel->selbuf);
      }
-   else if (sel->format == ELM_SEL_FORMAT_IMAGE)
+   else if (sel->format & ELM_SEL_FORMAT_IMAGE)
      {
-       cnp_debug("Image %s\n", evas_object_type_get(sel->widget));
-       cnp_debug("Elm type: %s\n", elm_object_widget_type_get(sel->widget));
-       evas_object_image_file_get(elm_photocam_internal_image_get(sel->widget), (const char **)data_ret, NULL);
-       if (!*data_ret) *data_ret = strdup("No file");
-       else *data_ret = strdup(*data_ret);
-       *size_ret = strlen(*data_ret);
+        cnp_debug("Image %s\n", evas_object_type_get(sel->widget));
+        cnp_debug("Elm type: %s\n", elm_object_widget_type_get(sel->widget));
+        evas_object_image_file_get(elm_photocam_internal_image_get(sel->widget), (const char **)data_ret, NULL);
+        if (!*data_ret) *data_ret = strdup("No file");
+        else *data_ret = strdup(*data_ret);
+        *size_ret = strlen(*data_ret);
      }
    return EINA_TRUE;
 }
@@ -987,23 +1894,142 @@ static Eina_Bool
 edje_converter(char *target __UNUSED__, void *data, int size __UNUSED__, void **data_ret, int *size_ret, Ecore_X_Atom *ttype __UNUSED__, int *typesize __UNUSED__)
 {
    Cnp_Selection *sel;
-
    sel = selections + *((int *)data);
-   if (data_ret) *data_ret = strdup(sel->selbuf);
-   if (size_ret) *size_ret = strlen(sel->selbuf);
+/*   if (data_ret) *data_ret = strdup(sel->selbuf);
+   if (size_ret) *size_ret = strlen(sel->selbuf);*/
+   char *edje = NULL;
+
+   if (data_ret && (sel->format == ELM_SEL_FORMAT_TEXT))
+     {
+        if (sel->selbuf && sel->selbuf[0] != '\0')
+          edje = mark_up(sel->selbuf, strlen(sel->selbuf), NULL);
+     }
+   else if (data_ret && ((sel->format & ELM_SEL_FORMAT_HTML)))
+     {
+        Eina_List *nodeList = NULL;
+        Eina_List *trail;
+        PTagNode nodeData;
+
+        nodeData = _get_start_node(sel->selbuf);
+
+        while (nodeData)
+          {
+             nodeList = eina_list_append(nodeList, nodeData);
+             nodeData = _get_next_node(nodeData);
+          }
+
+        _link_match_tags(nodeList);
+
+        _set_HTML_tag_data(nodeList);
+
+#ifdef DEBUGON
+        _dumpNode(nodeList);
+#endif
+        edje = _convert_to_edje(nodeList);
+
+        cnp_debug("convert edje: %s\n", edje);
+
+        EINA_LIST_FOREACH(nodeList, trail, nodeData)
+           _delete_node(nodeData);
+        eina_list_free(nodeList);
+
+     }
+   if (data_ret)
+     {
+        if (edje)
+          *data_ret = edje;
+        else
+           if (sel->selbuf)
+             *data_ret = strdup(sel->selbuf);
+           else
+             *data_ret = strdup("");
+     }
+   if (size_ret)
+     {
+        if (edje)
+          *size_ret = strlen(edje);
+        else
+          if (sel->selbuf)
+            *size_ret = strlen(sel->selbuf);
+          else
+            *size_ret = 0;
+     }
 
    return EINA_TRUE;
 }
 
-
 static Eina_Bool
 html_converter(char *target __UNUSED__, void *data, int size __UNUSED__, void **data_ret, int *size_ret, Ecore_X_Atom *ttype __UNUSED__, int *typesize __UNUSED__)
 {
    Cnp_Selection *sel;
 
    sel = selections + *(int *)data;
-   if (data_ret) *data_ret = strdup(sel->selbuf);
-   if (size_ret) *size_ret = strlen(sel->selbuf);
+
+   char *html = NULL;
+   char *convert_target = sel->selbuf;
+   Eina_Bool convert_edje = EINA_FALSE;
+
+   if (data_ret && (sel->format == ELM_SEL_FORMAT_TEXT))
+     {
+        if (sel->selbuf && sel->selbuf[0] != '\0')
+          {
+             convert_target = mark_up(sel->selbuf, strlen(sel->selbuf), NULL);
+             convert_edje = EINA_TRUE;
+          }
+     }
+
+   if (data_ret && ((sel->format & ELM_SEL_FORMAT_MARKUP) || convert_edje))
+     {
+        Eina_List *nodeList = NULL;
+        Eina_List *trail;
+        PTagNode nodeData;
+
+        nodeData = _get_start_node(convert_target);
+
+        while (nodeData)
+          {
+             nodeList = eina_list_append(nodeList, nodeData);
+             nodeData = _get_next_node(nodeData);
+          }
+
+        _link_match_tags(nodeList);
+
+        _set_EFL_tag_data(nodeList);
+
+#ifdef DEBUGON
+        _dumpNode(nodeList);
+#endif
+        html = _convert_to_html(nodeList);
+
+        cnp_debug("convert html: %s\n", html);
+
+        EINA_LIST_FOREACH(nodeList, trail, nodeData)
+           _delete_node(nodeData);
+        eina_list_free(nodeList);
+     }
+   if (data_ret)
+     {
+        if (html)
+          *data_ret = html;
+        else
+          if (sel->selbuf)
+            *data_ret = strdup(sel->selbuf);
+          else
+            *data_ret = strdup("");
+     }
+
+   if (size_ret)
+     {
+        if (html)
+          *size_ret = strlen(html);
+        else
+          if (sel->selbuf)
+            *size_ret = strlen(sel->selbuf);
+          else
+            *size_ret = 0;
+     }
+   if (convert_target != sel->selbuf)
+     free(convert_target);
 
    return EINA_TRUE;
 }
@@ -1011,12 +2037,12 @@ html_converter(char *target __UNUSED__, void *data, int size __UNUSED__, void **
 static Eina_Bool
 uri_converter(char *target __UNUSED__, void *data, int size __UNUSED__, void **data_ret, int *size_ret, Ecore_X_Atom *ttype __UNUSED__, int *typesize __UNUSED__)
 {
-    Cnp_Selection *sel;
-    sel = selections + *((int *)data);
-    cnp_debug("Uri converter\n");
-    if (data_ret) *data_ret = strdup(sel->selbuf);
-    if (size_ret) *size_ret = strlen(sel->selbuf);
-    return EINA_TRUE;
+   Cnp_Selection *sel;
+   sel = selections + *((int *)data);
+   cnp_debug("Uri converter\n");
+   if (data_ret) *data_ret = strdup(sel->selbuf);
+   if (size_ret) *size_ret = strlen(sel->selbuf);
+   return EINA_TRUE;
 }
 
 /*
@@ -1034,17 +2060,17 @@ image_provider(void *images __UNUSED__, Evas_Object *entry, const char *item)
    cnp_debug("image provider for %s called\n", item);
    EINA_LIST_FOREACH(pastedimages, l, pi)
      {
-       cnp_debug("is it %s?\n",pi->tag);
-       if (!strcmp(pi->tag, item))
+        cnp_debug("is it %s?\n",pi->tag);
+        if (!strcmp(pi->tag, item))
           {
-            /* Found it */
-            Evas_Object *o;
-            o = evas_object_image_filled_add(evas_object_evas_get(entry));
-            /* FIXME: Handle eets */
-            cnp_debug("file is %s (object is %p)\n", pi->file, o);
-            evas_object_image_file_set(o, pi->file, NULL);
-            evas_object_show(o);
-            return o;
+             /* Found it */
+             Evas_Object *o;
+             o = evas_object_image_filled_add(evas_object_evas_get(entry));
+             /* FIXME: Handle eets */
+             cnp_debug("file is %s (object is %p)\n", pi->file, o);
+             evas_object_image_file_set(o, pi->file, NULL);
+             evas_object_show(o);
+             return o;
           }
      }
    return NULL;
@@ -1061,7 +2087,7 @@ pasteimage_alloc(const char *file, int pathlen)
 
    pi = calloc(1, sizeof(Paste_Image));
    if (!pi) return NULL;
-   
+
    len = snprintf(NULL, 0, "pasteimage-%p", pi);
    len++;
    buf = malloc(len);
@@ -1072,13 +2098,13 @@ pasteimage_alloc(const char *file, int pathlen)
      }
    snprintf(buf, len, "pasteimage-%p", pi);
    pi->tag = buf;
-   
+
    if (file)
      {
         if (strstr(file,"file://")) file += prefixlen;
-        filebuf = alloca(sizeof(char) * (pathlen - prefixlen + 1));
-        strncpy(filebuf, file, pathlen - prefixlen);
-        filebuf[pathlen-prefixlen] = '\0';
+        filebuf = alloca(pathlen + 1);
+        strncpy(filebuf, file, pathlen);
+        filebuf[pathlen] = 0;
         pi->file = strdup(filebuf);
      }
 
@@ -1099,12 +2125,12 @@ pasteimage_provider_set(Evas_Object *entry)
 {
    void *v;
    const char *type;
-   
+
    if (!entry) return EINA_FALSE;
    type = elm_widget_type_get(entry);
    cnp_debug("type is %s\n", type);
    if ((!type) || (strcmp(type, "entry"))) return EINA_FALSE;
-   
+
    v = evas_object_data_get(entry, PROVIDER_SET);
    if (!v)
      {
@@ -1121,16 +2147,20 @@ static Eina_Bool
 pasteimage_append(Paste_Image *pi, Evas_Object *entry)
 {
    char *entrytag;
-   char *tagstring = "<item absize=240x180 href=file://%s></item>";
-   
+   int len;
+   static const char *tagstring = "<item absize=240x180 href=file://%s></item>";
+
    if (!pi) return EINA_FALSE;
    if (!entry) return EINA_FALSE;
+   if (elm_entry_cnp_textonly_get(entry)) return EINA_FALSE;
 
    pasteimage_provider_set(entry);
 
+   len = strlen(tagstring)+strlen(pi->file);
+
    pastedimages = eina_list_append(pastedimages, pi);
-   entrytag = alloca(sizeof(char)*(strlen(tagstring)+strlen(pi->file)+1));
-   snprintf(entrytag, (strlen(tagstring)+strlen(pi->file)), tagstring, pi->file);
+   entrytag = alloca(len + 1);
+   snprintf(entrytag, len + 1, tagstring, pi->file);
    elm_entry_entry_insert(entry, entrytag);
 
    return EINA_TRUE;
@@ -1144,8 +2174,8 @@ entry_deleted(void *images __UNUSED__, Evas *e __UNUSED__, Evas_Object *entry, v
 
    EINA_LIST_FOREACH_SAFE(pastedimages, l, next, pi)
      {
-       if (pi->entry == entry)
-           pastedimages = eina_list_remove_list(pastedimages, l);
+        if (pi->entry == entry)
+          pastedimages = eina_list_remove_list(pastedimages, l);
      }
 }
 
@@ -1156,36 +2186,36 @@ remove_tags(const char *p, int *len)
    char *q,*ret;
    int i;
    if (!p) return NULL;
-   
+
    q = malloc(strlen(p) + 1);
    if (!q) return NULL;
    ret = q;
 
    while (*p)
      {
-       if ((*p != '<') && (*p != '&')) *q++ = *p++;
+        if ((*p != '<') && (*p != '&')) *q++ = *p++;
         else if (*p == '<')
           {
-            if ((p[1] == 'b') && (p[2] == 'r') &&
+             if ((p[1] == 'b') && (p[2] == 'r') &&
                  ((p[3] == ' ') || (p[3] == '/') || (p[3] == '>')))
-               *q++ = '\n';
-            while ((*p) && (*p != '>')) p++;
-            p++;
-          } 
+               *q++ = '\n';
+             while ((*p) && (*p != '>')) p++;
+             p++;
+          }
         else if (*p == '&')
           {
-            p++;
-            for (i = 0 ; i < N_ESCAPES ; i++)
+             p++;
+             for (i = 0 ; i < N_ESCAPES ; i++)
                {
                   if (!strncmp(p,escapes[i].escape, strlen(escapes[i].escape)))
                     {
                        p += strlen(escapes[i].escape);
-                      *q = escapes[i].value;
-                      q++;
-                      break;
+                       *q = escapes[i].value;
+                       q++;
+                       break;
                     }
                }
-            if (i == N_ESCAPES) *q ++= '&';
+             if (i == N_ESCAPES) *q ++= '&';
           }
      }
    *q = 0;
@@ -1201,7 +2231,7 @@ mark_up(const char *start, int inlen, int *lenp)
    const char *p;
    char *q, *ret;
    const char *endp = NULL;
-   
+
    if (!start) return NULL;
    if (inlen >= 0) endp = start + inlen;
    /* First pass: Count characters */
@@ -1211,32 +2241,34 @@ mark_up(const char *start, int inlen, int *lenp)
           {
              if (*p == escapes[i].value)
                {
+                  if (!iscntrl(escapes[i].value)) l++;
                   l += strlen(escapes[i].escape);
                   break;
                }
           }
         if (i == N_ESCAPES) l++;
      }
-   
+
    q = ret = malloc(l + 1);
-   
+
    /* Second pass: Change characters */
-  for (p = start; *p; )
-    {
-       for (i = 0; i < N_ESCAPES; i++)
-         {
-            if (*p == escapes[i].value)
-              {
-                 strcpy(q, escapes[i].escape);
-                 q += strlen(escapes[i].escape);
-                 p ++;
-                 break;
-              }
-         }
-       if (i == N_ESCAPES) *q++ = *p++;
-    }
+   for (p = start; ((!endp) || (p < endp)) && (*p); )
+     {
+        for (i = 0; i < N_ESCAPES; i++)
+          {
+             if (*p == escapes[i].value)
+               {
+                  if (!iscntrl(escapes[i].value)) *q++ = '&';
+                  strcpy(q, escapes[i].escape);
+                  q += strlen(escapes[i].escape);
+                  p ++;
+                  break;
+               }
+          }
+        if (i == N_ESCAPES) *q++ = *p++;
+     }
    *q = 0;
-   
+
    if (lenp) *lenp = l;
    return ret;
 }
@@ -1256,7 +2288,7 @@ _dnd_enter(void *data __UNUSED__, int etype __UNUSED__, void *ev)
    if (savedtypes.types) free(savedtypes.types);
    savedtypes.types = malloc(sizeof(char *) * enter->num_types);
    if (!savedtypes.types) return EINA_FALSE;
-   
+
    for (i = 0; i < enter->num_types; i++)
      {
         savedtypes.types[i] = eina_stringshare_add(enter->types[i]);
@@ -1267,6 +2299,7 @@ _dnd_enter(void *data __UNUSED__, int etype __UNUSED__, void *ev)
              /* Request it, so we know what it is */
              cnp_debug("Sending uri request\n");
              savedtypes.textreq = 1;
+             if (savedtypes.pi) pasteimage_free(savedtypes.pi);
              savedtypes.pi = NULL; /* FIXME: Free? */
              ecore_x_selection_xdnd_request(enter->win, text_uri);
           }
@@ -1312,7 +2345,7 @@ _dnd_drop(void *data __UNUSED__, int etype __UNUSED__, void *ev)
    ecore_evas_geometry_get(ee, &x, &y, NULL, NULL);
    savedtypes.x = drop->position.x - x;
    savedtypes.y = drop->position.y - y;
-   
+
    cnp_debug("Drop position is %d,%d\n", savedtypes.x, savedtypes.y);
 
    for (; l; l = l->next)
@@ -1321,68 +2354,82 @@ _dnd_drop(void *data __UNUSED__, int etype __UNUSED__, void *ev)
         evas_object_geometry_get(dropable->obj, &x, &y, &w, &h);
         if ((savedtypes.x >= x) && (savedtypes.y >= y) &&
             (savedtypes.x < x + w) && (savedtypes.y < y + h))
-           break; /* found! */
+          break; /* found! */
      }
-   
+
    if (!l) return EINA_TRUE; /* didn't find one */
-   
+
    evas_object_geometry_get(dropable->obj, &x, &y, NULL, NULL);
    savedtypes.x -= x;
    savedtypes.y -= y;
-   
+
    /* Find our type from the previous list */
    for (i = 0; i < CNP_N_ATOMS; i++)
      {
-       for (j = 0; j < savedtypes.ntypes; j++)
+        for (j = 0; j < savedtypes.ntypes; j++)
           {
              if (!strcmp(savedtypes.types[j], atoms[i].name)) goto found;
           }
      }
-   
+
    cnp_debug("Didn't find a target\n");
    return EINA_TRUE;
-   
+
 found:
    cnp_debug("Found a target we'd like: %s\n", atoms[i].name);
    cnp_debug("0x%x\n",xwin);
-   
+
    if (i == CNP_ATOM_text_urilist)
      {
-        cnp_debug("We found a URI... (%scached)\n", savedtypes.pi ? "" : "not ");
+        cnp_debug("We found a URI... (%scached) %s\n",
+                  savedtypes.pi ? "" : "not ",
+                  savedtypes.pi->file);
         if (savedtypes.pi)
           {
              char *entrytag;
-             char *tagstring = "<item absize=240x180 href=file://%s></item>";
-             
+             static const char *tagstring = "<item absize=240x180 href="
+                "file://%s></item>";
              ddata.x = savedtypes.x;
              ddata.y = savedtypes.y;
 
-             if (dropable->types & ELM_SEL_FORMAT_IMAGE)
+             /* If it's markup that also supports images */
+             if ((dropable->types & ELM_SEL_FORMAT_MARKUP) &&
+                 (dropable->types & ELM_SEL_FORMAT_IMAGE))
+               {
+                  int len;
+                  ddata.format = ELM_SEL_FORMAT_MARKUP;
+                  pasteimage_provider_set(dropable->obj);
+
+                  pastedimages = eina_list_append(pastedimages, savedtypes.pi);
+                  len = strlen(tagstring) + strlen(savedtypes.pi->file);
+                  entrytag = alloca(len + 1);
+                  snprintf(entrytag, len + 1, tagstring, savedtypes.pi->file);
+                  ddata.data = entrytag;
+                  cnp_debug("Insert %s\n", (char *)ddata.data);
+                  dropable->dropcb(dropable->cbdata, dropable->obj, &ddata);
+                  ecore_x_dnd_send_finished();
+
+                  if (savedtypes.pi) pasteimage_free(savedtypes.pi);
+                  savedtypes.pi = NULL;
+                  return EINA_TRUE;
+               }
+             else if (dropable->types & ELM_SEL_FORMAT_IMAGE)
                {
                   cnp_debug("Doing image insert (%s)\n", savedtypes.pi->file);
                   ddata.format = ELM_SEL_FORMAT_IMAGE;
                   ddata.data = (char *)savedtypes.pi->file;
                   dropable->dropcb(dropable->cbdata, dropable->obj, &ddata);
                   ecore_x_dnd_send_finished();
-                  
-                  pasteimage_free(savedtypes.pi);
+
+                  if (savedtypes.pi) pasteimage_free(savedtypes.pi);
                   savedtypes.pi = NULL;
-                  
+
                   return EINA_TRUE;
                }
-             else if (dropable->types & ELM_SEL_FORMAT_MARKUP)
+             else
                {
-                  ddata.format = ELM_SEL_FORMAT_MARKUP;
-                  pasteimage_provider_set(dropable->obj);
-                  
-                  pastedimages = eina_list_append(pastedimages, savedtypes.pi);
-                  entrytag = alloca(sizeof(char)*(strlen(tagstring)+strlen(savedtypes.pi->file)+1));
-                  snprintf(entrytag, (strlen(tagstring)+strlen(savedtypes.pi->file)),
-                           tagstring, savedtypes.pi->file);
-                  ddata.data = entrytag;
-                  cnp_debug("Insert %s\n", (char *)ddata.data);
-                  dropable->dropcb(dropable->cbdata, dropable->obj, &ddata);
-                  ecore_x_dnd_send_finished();
+                  cnp_debug("Item doesn't support images... passing\n");
+                  pasteimage_free(savedtypes.pi);
                   return EINA_TRUE;
                }
           }
@@ -1410,9 +2457,9 @@ _dnd_position(void *data __UNUSED__, int etype __UNUSED__, void *ev)
 {
    struct _Ecore_X_Event_Xdnd_Position *pos;
    Ecore_X_Rectangle rect;
-   
+
    pos = ev;
-   
+
    /* Need to send a status back */
    /* FIXME: Should check I can drop here */
    /* FIXME: Should highlight widget */
@@ -1436,7 +2483,7 @@ _dnd_status(void *data __UNUSED__, int etype __UNUSED__, void *ev)
    struct _Ecore_X_Event_Xdnd_Status *status = ev;
 
    if (!status) return EINA_TRUE;
-   
+
    /* Only thing we care about: will accept */
    if (status->will_accept)
      {
@@ -1457,48 +2504,57 @@ elm_drop_target_add(Evas_Object *obj, Elm_Sel_Type format, Elm_Drop_Cb dropcb, v
 {
    Dropable *drop;
    Ecore_X_Window xwin;
+   Eina_List *item;
    int first;
-   
+
    if (!obj) return EINA_FALSE;
    if (!_elm_cnp_init_count) _elm_cnp_init();
-   
+
    /* Is this the first? */
    first = (!drops) ? 1 : 0;
-   
+
+   EINA_LIST_FOREACH(drops, item, drop)
+     {
+        if (drop->obj == obj)
+          {
+             /* Update: Not a new one */
+             drop->dropcb = dropcb;
+             drop->cbdata = cbdata;
+             drop->types = format;
+             return EINA_TRUE;
+          }
+     }
+
+   /* Create new drop */
    drop = calloc(1, sizeof(Dropable));
    if (!drop) return EINA_FALSE;
-   drop->dropcb = dropcb;
-   drop->cbdata = cbdata;
-   
-   /* FIXME: Check it's not already there */
-   
    /* FIXME: Check for eina's deranged error method */
    drops = eina_list_append(drops, drop);
-   
+
    if (!drops/* || or other error */)
      {
         free(drop);
         return EINA_FALSE;
      }
-   
-   drop->obj = obj;
-   /* Something for now */
+   drop->dropcb = dropcb;
+   drop->cbdata = cbdata;
    drop->types = format;
-   
+   drop->obj = obj;
+
    evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL,
                                   /* I love C and varargs */
                                   (Evas_Object_Event_Cb)elm_drop_target_del,
                                   obj);
    /* FIXME: Handle resizes */
-   
+
    /* If not the first: We're done */
    if (!first) return EINA_TRUE;
-   
+
    xwin = (Ecore_X_Window)ecore_evas_window_get
       (ecore_evas_ecore_evas_get(evas_object_evas_get(obj)));
-   
+
    ecore_x_dnd_aware_set(xwin, EINA_TRUE);
-   
+
    cnp_debug("Adding drop target calls\n");
    handler_enter = ecore_event_handler_add(ECORE_X_EVENT_XDND_ENTER,
                                            _dnd_enter, NULL);
@@ -1506,7 +2562,7 @@ elm_drop_target_add(Evas_Object *obj, Elm_Sel_Type format, Elm_Drop_Cb dropcb, v
                                          _dnd_position, NULL);
    handler_drop = ecore_event_handler_add(ECORE_X_EVENT_XDND_DROP,
                                           _dnd_drop, NULL);
-   
+
    return EINA_TRUE;
 }
 
@@ -1516,7 +2572,7 @@ elm_drop_target_del(Evas_Object *obj)
    Dropable *drop,*del;
    Eina_List *item;
    Ecore_X_Window xwin;
-   
+
    del = NULL;
    EINA_LIST_FOREACH(drops, item, drop)
      {
@@ -1528,28 +2584,28 @@ elm_drop_target_del(Evas_Object *obj)
           }
      }
    if (!del) return EINA_FALSE;
-   
+
    evas_object_event_callback_del(obj, EVAS_CALLBACK_FREE,
                                   (Evas_Object_Event_Cb)elm_drop_target_del);
    free(drop);
    /* If still drops there: All fine.. continue */
    if (drops) return EINA_TRUE;
-   
+
    cnp_debug("Disabling DND\n");
    xwin = (Ecore_X_Window)ecore_evas_window_get
       (ecore_evas_ecore_evas_get(evas_object_evas_get(obj)));
    ecore_x_dnd_aware_set(xwin, EINA_FALSE);
-   
+
    ecore_event_handler_del(handler_pos);
    ecore_event_handler_del(handler_drop);
    ecore_event_handler_del(handler_enter);
-   
+
    if (savedtypes.pi)
      {
         pasteimage_free(savedtypes.pi);
         savedtypes.pi = NULL;
      }
-   
+
    return EINA_TRUE;
 }
 
@@ -1574,8 +2630,8 @@ _drag_mouse_up(void *un __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *
 static void
 _drag_move(void *data __UNUSED__, Ecore_X_Xdnd_Position *pos)
 {
-   evas_object_move(dragwin, 
-                    pos->position.x - _dragx, 
+   evas_object_move(dragwin,
+                    pos->position.x - _dragx,
                     pos->position.y - _dragy);
 }
 
@@ -1590,9 +2646,9 @@ elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data, void (
    int x, y, x2, y2, x3, y3;
    Evas_Object *icon;
    int w, h;
-   
+
    if (!_elm_cnp_init_count) _elm_cnp_init();
-   
+
    xwin = elm_win_xwindow_get(obj);
 
    cnp_debug("starting drag...\n");
@@ -1605,18 +2661,18 @@ elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data, void (
    sel->selbuf = data ? strdup(data) : NULL;
    dragdonecb = dragdone;
    dragdonedata = donecbdata;
-   
+
    ecore_x_dnd_callback_pos_update_set(_drag_move, NULL);
    ecore_x_dnd_begin(xwin, (unsigned char *)&xdnd, sizeof(Elm_Sel_Type));
    evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_UP,
                                   _drag_mouse_up, NULL);
-   
+
    handler_status = ecore_event_handler_add(ECORE_X_EVENT_XDND_STATUS,
                                             _dnd_status, NULL);
-   
+
    dragwin = elm_win_add(NULL, "Elm Drag Object", ELM_WIN_UTILITY);
    elm_win_override_set(dragwin, 1);
-   
+
    /* FIXME: Images only */
    icon = elm_icon_add(dragwin);
    elm_icon_file_set(icon, data + 7, NULL); /* 7!? "file://" */
@@ -1633,7 +2689,7 @@ elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data, void (
    evas_object_move(dragwin, x, y);
    evas_object_resize(icon, w, h);
    evas_object_resize(dragwin, w, h);
-   
+
    evas_object_show(icon);
    evas_object_show(dragwin);
 
@@ -1650,13 +2706,12 @@ elm_cnp_tempfile_create(int size)
    Tmp_Info *info;
    const char *tmppath;
    int len;
-   
+
    info = malloc(sizeof(Tmp_Info));
    if (!info) return NULL;
-   
+
    tmppath = getenv("TMP");
    if (!tmppath) tmppath = P_tmpdir;
-   if (!tmppath) tmppath = "/tmp";
    len = snprintf(NULL, 0, "%s/%sXXXXXX", tmppath, "elmcnpitem-");
    if (len < 0)
      {
@@ -1671,15 +2726,15 @@ elm_cnp_tempfile_create(int size)
         return NULL;
      }
    snprintf(info->filename,len,"%s/%sXXXXXX", tmppath, "elmcnpitem-");
-   
+
    info->fd = mkstemp(info->filename);
-   
+
 # ifdef __linux__
      {
         char *tmp;
         /* And before someone says anything see POSIX 1003.1-2008 page 400 */
         long pid;
-        
+
         pid = (long)getpid();
         /* Use pid instead of /proc/self: That way if can be passed around */
         len = snprintf(NULL,0,"/proc/%li/fd/%i", pid, info->fd);
@@ -1694,7 +2749,7 @@ elm_cnp_tempfile_create(int size)
           }
      }
 # endif
-   
+
    cnp_debug("filename is %s\n", info->filename);
    if (size < 1)
      {
@@ -1703,7 +2758,7 @@ elm_cnp_tempfile_create(int size)
         info->len = 0;
         return info;
      }
-   
+
    /* Map it in */
    if (ftruncate(info->fd, size))
      {
@@ -1712,7 +2767,9 @@ elm_cnp_tempfile_create(int size)
         info->len = 0;
         return info;
      }
-   
+
+   eina_mmap_safety_enabled_set(EINA_TRUE);
+
    info->map = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_SHARED, info->fd, 0);
    if (info->map == MAP_FAILED)
      {
@@ -1720,7 +2777,7 @@ elm_cnp_tempfile_create(int size)
         info->map = NULL;
         info->len = 0;
      }
-   
+
    return info;
 }