From: Hyoyoung Chang <hyoyoung@gmail.com>

Subject: [E-devel] [patch] elm_cnp_helper - bugfix mixing with ecore selection set apis
Date: Tue, 20 Dec 2011 18:57:25 +0900

Dear all

When ecore selection set apis(such as ecore_x_selection_clipboard_set)
used in elementary,
Some data is not pasted to elementary widgets.
It's due to mix ecore selection with elementary selection apis.

Data which by ecore doesn't have TARGETS information,
so elementary make it up with TARGETS Information for copying & pasting.

Thank you.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@66407 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/elm_cnp_helper.c b/src/lib/elm_cnp_helper.c
index 03254d2..62256e7 100644 (file)
--- a/src/lib/elm_cnp_helper.c
+++ b/src/lib/elm_cnp_helper.c
@@ -594,7 +594,8 @@ _get_selection_type(void *data, int size)
      {
         Cnp_Selection *sel;
         sel = selections + *((int *)data);
-        if (sel->active)
+        if (sel->active &&
+            (sel->format >= ELM_SEL_TARGETS) && (sel->format < ELM_SEL_FORMAT_MAX))
           return sel->format;
      }
    return ELM_SEL_FORMAT_NONE;
@@ -606,32 +607,30 @@ targets_converter(char *target __UNUSED__, void *data, int size, void **data_ret
    int i,count;
    Ecore_X_Atom *aret;
    Cnp_Selection *sel;
+   Elm_Sel_Format seltype;
 
    if (!data_ret) return EINA_FALSE;
 
    if (_get_selection_type(data, size) == ELM_SEL_FORMAT_NONE)
      {
-        if (data_ret)
-          {
-             *data_ret = malloc(size * sizeof(char) + 1);
-             memcpy(*data_ret, data, size);
-             ((char**)(data_ret))[0][size] = 0;
-          }
-        if (size_ret) *size_ret = size;
-        return EINA_TRUE;
+        /* TODO : fallback into precise type */
+        seltype = ELM_SEL_FORMAT_TEXT;
+     }
+   else
+     {
+        sel = selections + *((int *)data);
+        seltype = sel->format;
      }
-
-   sel = selections + *((int *)data);
 
    for (i = 0, count = 0; i < CNP_N_ATOMS ; i++)
      {
-        if (sel->format & atoms[i].formats) count++;
+        if (seltype & 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 (seltype & atoms[i].formats) aret[count ++] = atoms[i].atom;
      }
 
    *data_ret = aret;

diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h
index 79886ae..a0de55b 100644 (file)
--- a/src/lib/elm_widget.h
+++ b/src/lib/elm_widget.h
@@ -741,6 +741,8 @@ typedef enum _Elm_Sel_Format
    ELM_SEL_FORMAT_VCARD  = 0x08,
    /** Raw HTMLish things for widgets that want that stuff (hello webkit!) */
    ELM_SEL_FORMAT_HTML   = 0x10,
+
+   ELM_SEL_FORMAT_MAX
 } Elm_Sel_Format;
 
 struct _Elm_Selection_Data