[52286] Elm DND/Sel: Update typenames to be more consistent.
authorjh0506.yun <jh0506.yun@samsung.com>
Fri, 17 Sep 2010 02:57:11 +0000 (11:57 +0900)
committerjh0506.yun <jh0506.yun@samsung.com>
Fri, 17 Sep 2010 02:57:11 +0000 (11:57 +0900)
src/lib/elm_cnp_helper.c
src/lib/elm_entry.c
src/lib/elm_priv.h

index c68b779..cbaf3ca 100644 (file)
@@ -1,4 +1,10 @@
+/*
+ * todo
+ *  - move to stringshare for stuff when I can
+ */
+
 #include <stdbool.h>
+#include <sys/mman.h>
 
 #include <stdio.h> // debug
 
 #endif
 
 
+#define PROVIDER_SET "__elm_cnp_provider_set"
+
 enum {
      CNP_ATOM_TARGETS = 0,
      CNP_ATOM_text_uri,
+     CNP_ATOM_text_urilist,
      CNP_ATOM_image_png,
+     CNP_ATOM_image_jpeg,
      CNP_ATOM_XELM,
      CNP_ATOM_text_html_utf8,
      CNP_ATOM_text_html,
@@ -50,7 +60,7 @@ struct _elm_cnp_selection {
    const char *debug;
    Evas_Object *widget;
 
-   enum _elm_sel_format format;
+   Elm_Sel_Format format;
    char *selbuf;
 
    unsigned int active : 1;
@@ -58,7 +68,7 @@ struct _elm_cnp_selection {
    Ecore_X_Selection ecore_sel;
 
    Evas_Object *requestwidget;
-   enum _elm_sel_format requestformat;
+   Elm_Sel_Format requestformat;
 
    int (*set)(Ecore_X_Window, const void *data, int size);
    int (*clear)(void);
@@ -90,6 +100,8 @@ static char *remove_tags(const char *p, int *len);
 static char *mark_up(const char *start, 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);
 
 
 typedef int (*converter_fn)(char *target, void *data, int size, void **data_ret, int *size_ret, Ecore_X_Atom *ttype, int *typesize);
@@ -118,10 +130,13 @@ static int notify_handler_png(struct _elm_cnp_selection *sel,
 static int notify_handler_uri(struct _elm_cnp_selection *sel,
       Ecore_X_Event_Selection_Notify *notify);
 
+static struct pasteimage *pasteimage_alloc(const char *file);
+static bool pasteimage_append(struct pasteimage *pi, Evas_Object *entry);
+static void pasteimage_free(struct pasteimage *pi);
 
 static struct {
    const char *name;
-   enum _elm_sel_format formats;
+   Elm_Sel_Format formats;
    /* Called by ecore to do conversion */
    converter_fn converter;
    response_handler response;
@@ -131,7 +146,7 @@ static struct {
 } atoms[CNP_N_ATOMS] = {
    [CNP_ATOM_TARGETS] = {
        "TARGETS",
-       (enum _elm_sel_format)-1,
+       (Elm_Sel_Format)-1, // everything
        targets_converter,
        response_handler_targets,
        notify_handler_targets,
@@ -139,7 +154,7 @@ static struct {
    },
    [CNP_ATOM_XELM] =  {
        "application/x-elementary-markup",
-       ELM_SEL_MARKUP,
+       ELM_SEL_FORMAT_MARKUP,
        edje_converter,
        NULL,
        NULL,
@@ -147,23 +162,39 @@ static struct {
    },
    [CNP_ATOM_text_uri] = {
        "text/uri",
-       ELM_SEL_MARKUP | ELM_SEL_IMAGE, /* Either images or entries */
+       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_image_png] = {
        "image/png",
-       ELM_SEL_IMAGE | ELM_SEL_IMAGE,
+       ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_IMAGE,
        png_converter,
        NULL,
        notify_handler_png,
        0
    },
+   [CNP_ATOM_image_jpeg] = {
+       "image/jpeg",
+       ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_IMAGE,
+       png_converter,
+       NULL,
+       notify_handler_png,/* Raw image data is the same */
+       0
+   },
    [CNP_ATOM_text_html_utf8] = {
        "text/html;charset=utf-8",
-       ELM_SEL_MARKUP,
+       ELM_SEL_FORMAT_MARKUP,
        html_converter,
        NULL,
        NULL,
@@ -171,7 +202,7 @@ static struct {
    },
    [CNP_ATOM_text_html] = {
        "text/html",
-       ELM_SEL_MARKUP,
+       ELM_SEL_FORMAT_MARKUP,
        html_converter,
        NULL,
        NULL,
@@ -179,8 +210,7 @@ static struct {
    },
    [CNP_ATOM_UTF8STRING] = {
        "UTF8_STRING",
-//     ELM_SEL_MARKUP,
-       ELM_SEL_MARKUP | ELM_SEL_IMAGE,
+       ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP,
        text_converter,
        NULL,
        notify_handler_text,
@@ -188,7 +218,7 @@ static struct {
    },
    [CNP_ATOM_STRING] = {
        "STRING",
-       ELM_SEL_MARKUP | ELM_SEL_IMAGE,
+       ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP,
        text_converter,
        NULL,
        notify_handler_text,
@@ -196,7 +226,7 @@ static struct {
    },
    [CNP_ATOM_TEXT] = {
        "TEXT",
-       ELM_SEL_MARKUP | ELM_SEL_IMAGE,
+       ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP,
        text_converter,
        NULL,
        NULL,
@@ -204,7 +234,7 @@ static struct {
    },
    [CNP_ATOM_text_plain_utf8] = {
        "text/plain;charset=ut-8",
-       ELM_SEL_MARKUP,
+       ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP,
        text_converter,
        NULL,
        NULL,
@@ -212,7 +242,7 @@ static struct {
    },
    [CNP_ATOM_text_plain] = {
        "text/plain",
-       ELM_SEL_MARKUP,
+       ELM_SEL_FORMAT_TEXT | ELM_SEL_FORMAT_MARKUP,
        text_converter,
        NULL,
        NULL,
@@ -241,27 +271,48 @@ static struct _elm_cnp_selection selections[ELM_SEL_MAX] = {
        .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 */
+/* FIXME: BEtter name */
+struct {
+   int ntypes;
+   const char **types;
+   unsigned int textreq: 1;
+   struct pasteimage *pi;
+   int x,y;
+} savedtypes =  { 0, NULL, 0, NULL, 0, 0 };
+
+static void (*dragdonecb)(void *,Evas_Object*);
+static void *dragdonedata;
+
 static int _elm_cnp_init_count = 0;
   /* Gah... who left this out of XAtoms.h */
 static Ecore_X_Atom clipboard_atom;
 
 Eina_List *pastedimages;
+Eina_List *providedobjs;
 #endif
 
+/* Stringshared, so I can just compare pointers later */
+static const char *text_uri;
 
 Eina_Bool
-elm_selection_set(enum _elm_sel_type selection, Evas_Object *widget,
-                       enum _elm_sel_format format, const char *selbuf)
+elm_selection_set(Elm_Sel_Type selection, Evas_Object *widget,
+                       Elm_Sel_Format format, const char *selbuf)
 {
 #ifdef HAVE_ELEMENTARY_X
    struct _elm_cnp_selection *sel;
 
    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_IMAGE)
+   if (!selbuf && format != ELM_SEL_FORMAT_IMAGE)
      return elm_selection_clear(selection, widget);
 
    sel = selections + selection;
@@ -269,7 +320,7 @@ elm_selection_set(enum _elm_sel_type selection, Evas_Object *widget,
    sel->active = 1;
    sel->widget = widget;
 
-   sel->set(elm_win_xwindow_get(widget),&selection,sizeof(enum _elm_sel_type));
+   sel->set(elm_win_xwindow_get(widget),&selection,sizeof(Elm_Sel_Type));
    sel->format = format;
    sel->selbuf = selbuf ? strdup(selbuf) : NULL;
 
@@ -280,7 +331,7 @@ elm_selection_set(enum _elm_sel_type selection, Evas_Object *widget,
 }
 
 Eina_Bool
-elm_selection_clear(enum _elm_sel_type selection, Evas_Object *widget)
+elm_selection_clear(Elm_Sel_Type selection, Evas_Object *widget)
 {
 #ifdef HAVE_ELEMENTARY_X
    struct _elm_cnp_selection *sel;
@@ -304,7 +355,7 @@ elm_selection_clear(enum _elm_sel_type selection, Evas_Object *widget)
 }
 
 Eina_Bool
-elm_selection_get(enum _elm_sel_type selection, enum _elm_sel_format format,
+elm_selection_get(Elm_Sel_Type selection, Elm_Sel_Format format,
                        Evas_Object *widget)
 {
 #ifdef HAVE_ELEMENTARY_X
@@ -320,7 +371,7 @@ elm_selection_get(enum _elm_sel_type selection, enum _elm_sel_format format,
 
    sel->requestformat = format;
    sel->requestwidget = widget;
-   sel->request(elm_win_xwindow_get(top), ECORE_X_SELECTION_TARGET_UTF8_STRING);
+   sel->request(elm_win_xwindow_get(top), ECORE_X_SELECTION_TARGET_TARGETS);
 
    return EINA_TRUE;
 #else
@@ -346,7 +397,9 @@ _elm_cnp_init(void){
 
    ecore_event_handler_add(ECORE_X_EVENT_SELECTION_CLEAR, selection_clear,NULL);
    ecore_event_handler_add(ECORE_X_EVENT_SELECTION_NOTIFY,selection_notify,NULL);
-    return EINA_TRUE;
+
+   text_uri = eina_stringshare_add("text/uri-list");
+   return EINA_TRUE;
 }
 
 static Eina_Bool
@@ -359,6 +412,7 @@ selection_clear(void *udata __UNUSED__, int type __UNUSED__, void *event){
      {
        if (selections[i].ecore_sel == ev->selection) break;
      }
+cnp_debug("selection %d clear\n",i);
    /* Not me... Don't care */
    if (i == ELM_SEL_MAX) return ECORE_CALLBACK_PASS_ON;
 
@@ -420,7 +474,6 @@ static Eina_Bool
 selection_notify(void *udata __UNUSED__, int type __UNUSED__, void *event){
    Ecore_X_Event_Selection_Notify *ev = event;
    struct _elm_cnp_selection *sel;
-   struct _elm_cnp_selection *bufsel;
    int i;
 
    cnp_debug("selection notify callback: %d\n",ev->selection);
@@ -428,13 +481,15 @@ selection_notify(void *udata __UNUSED__, int type __UNUSED__, void *event){
       case ECORE_X_SELECTION_CLIPBOARD:
         sel = selections + ELM_SEL_CLIPBOARD;
         break;
-
       case ECORE_X_SELECTION_PRIMARY:
         sel = selections + ELM_SEL_PRIMARY;
         break;
       case ECORE_X_SELECTION_SECONDARY:
         sel = selections + ELM_SEL_SECONDARY;
         break;
+      case ECORE_X_SELECTION_XDND:
+         sel = selections + ELM_SEL_XDND;
+         break;
       default:
         return ECORE_CALLBACK_PASS_ON;
    }
@@ -446,9 +501,6 @@ selection_notify(void *udata __UNUSED__, int type __UNUSED__, void *event){
          {
             if (atoms[i].notify){
                  cnp_debug("Found something: %s\n", atoms[i].name);
-                 bufsel = selections;
-                 /* FIXME : it's maybe a bug. more overhaul it!!! */
-                 sel->selbuf = bufsel->selbuf;
                  atoms[i].notify(sel, ev);
             } else {
                  printf("Ignored: No handler!\n");
@@ -491,11 +543,12 @@ targets_converter(char *target __UNUSED__, void *data, int size __UNUSED__,
 }
 
 static int
-png_converter(char *target __UNUSED__, void *data __UNUSED__, int size __UNUSED__,
+png_converter(char *target __UNUSED__, void *data, int size,
               void **data_ret __UNUSED__, int *size_ret __UNUSED__,
               Ecore_X_Atom *ttype __UNUSED__, int *typesize __UNUSED__)
 {
-     return 1;
+   cnp_debug("Png converter called\n");
+   return 1;
 }
 
 /*
@@ -586,13 +639,10 @@ notify_handler_text(struct _elm_cnp_selection *sel,
    Ecore_X_Selection_Data *data;
    char *str;
 
-   fprintf(stderr, "## notify_handler_text selbuf - %s\n", sel->selbuf);
-
-//   data = notify->data;
-//   str = mark_up((char*)data->data, NULL);
-   str = mark_up(sel->selbuf, NULL);
-   fprintf(stderr, "## notify_handler_text str - %s\n", str);
-
+   data = notify->data;
+   cnp_debug("Notify handler text %d %d %p\n",data->format,data->length,data->data);
+   str = mark_up((char*)data->data, NULL);
+   cnp_debug("String is %s (from %s)\n",str,data->data);
    elm_entry_entry_insert(sel->requestwidget, str);
    free(str);
 
@@ -608,30 +658,62 @@ notify_handler_uri(struct _elm_cnp_selection *sel,
         Ecore_X_Event_Selection_Notify *notify)
 {
    Ecore_X_Selection_Data *data;
+   Ecore_X_Selection_Data_Files *files;
    struct pasteimage *pi;
-   char entrytag[100];
    char *p;
 
    data = notify->data;
-   p = (char *)data->data;
+   printf("data->format is %d %p %p\n",data->format,notify,data);
+   if (data->content == ECORE_X_SELECTION_CONTENT_FILES)
+     {
+        cnp_debug("got a files list\n");
+        files = notify->data;
+        if (files->num_files > 1)
+          {
+             /* Don't handle many items */
+             cnp_debug("more then one file: Bailing\n");
+             return 0;
+          }
+        p = files->files[0];
+     }
+   else
+      p = (char *)data->data;
+   if (!p)
+     {
+        cnp_debug("Couldn't find a file\n");
+        return 0;
+      }
    cnp_debug("Got %s\n",p);
-   if (strncmp(p,"file://",7) != 0){
-       cnp_debug("Doesn't start with ;file;  %s\n",p);
-       return 0;
-   }
+   if (strncmp(p,"file://",7) != 0)
+     {
+        /* Try and continue if it looks sane */
+        if (*p != '/') return 0;
+     }
+   else
+      p += strlen("file://");
 
-   p += strlen("file://");
+   if (!strstr(p,".png") && !strstr(p,".jpg"))
+     {
+        /* FIXME: Better test: Load it in evasw & see is probably best */
+        cnp_debug("No png, ignoring\n");
+        if (savedtypes.textreq) savedtypes.textreq = 0;
+        return 0;
+     }
 
-   pi = calloc(1,sizeof(struct pasteimage));
-   snprintf(entrytag, sizeof(entrytag), "pasteimage-%p",pi);
-   pi->tag = strdup(entrytag);
-   pi->file = strndup(p,data->length - strlen("file://"));
+   if (savedtypes.pi) pasteimage_free(savedtypes.pi);
 
-   elm_entry_item_provider_append(sel->requestwidget, image_provider, pi);
-   pastedimages = eina_list_append(pastedimages, pi);
+   pi = pasteimage_alloc(p);
 
-   snprintf(entrytag, sizeof(entrytag), "<item absize=240x180 href=%s>",pi->tag);
-   elm_entry_entry_insert(sel->requestwidget, entrytag);
+   if (savedtypes.textreq)
+     {
+        savedtypes.textreq = 0;
+        savedtypes.pi = pi;
+     }
+   else
+     {
+        pasteimage_append(pi, sel->requestwidget);
+        savedtypes.pi = NULL;
+     }
 
    return 0;
 }
@@ -640,7 +722,64 @@ static int
 notify_handler_png(struct _elm_cnp_selection *sel __UNUSED__,
                    Ecore_X_Event_Selection_Notify *notify __UNUSED__)
 {
-   cnp_debug("got a png!\n");
+   Ecore_X_Selection_Data *data;
+   char *fname,*tmppath;
+   struct pasteimage *pi;
+   int fd,len;
+   void *map;
+
+   cnp_debug("got a png (or a jpeg)!\n");
+   data = notify->data;
+
+   cnp_debug("Size if %d\n",data->length);
+
+   /* generate tmp name */
+   tmppath = getenv("TMP");
+   if (!tmppath) tmppath = P_tmpdir;
+   if (!tmppath) tmppath = "/tmp";
+   len = snprintf(NULL,0,"%s/%sXXXXXX",tmppath, "elmcnpimage-");
+   if (len < 0) return 1;
+   len ++;
+   fname = malloc(len);
+   if (!fname) return 1;
+   len = snprintf(fname,len,"%s/%sXXXXXX",tmppath, "elmcnpimage-");
+
+   fd = mkstemp(fname);
+   if (fd < 0)
+     {
+        free(fname);
+        return 1;
+     }
+
+   if (ftruncate(fd, data->length))
+     {
+        perror("ftruncate");
+        unlink(fname);
+        free(fname);
+        close(fd);
+     }
+
+   map = mmap(NULL,data->length, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
+   if (map == MAP_FAILED)
+     {
+        perror("mmap");
+        unlink(fname);
+        free(fname);
+        close(fd);
+     }
+   memcpy(map, data->data, data->length);
+   munmap(map,data->length);
+   close(fd);
+
+   /* FIXME: add clean up function */
+   // on_exit: file name + pid
+   //    need pid, as forked children inheret list :-(
+
+   /* FIXME: Add to paste image data to clean up */
+
+   pi = pasteimage_alloc(fname);
+   pasteimage_append(pi, sel->requestwidget);
+
    return 0;
 }
 
@@ -652,16 +791,13 @@ text_converter(char *target __UNUSED__, void *data, int size __UNUSED__,
 {
    struct _elm_cnp_selection *sel;
 
+   cnp_debug("text converter\n");
    sel = selections + *(int *)data;
-   if (!sel->active)
-     {
-       return 1;
-     }
+   if (!sel->active) return 1;
 
-   if (sel->format == ELM_SEL_MARKUP){
+   if (sel->format == ELM_SEL_FORMAT_MARKUP){
        *data_ret = remove_tags(sel->selbuf, size_ret);
-       fprintf(stderr, "## text_convert - %s\n", *data_ret);
-   } else if (sel->format == ELM_SEL_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);
@@ -673,8 +809,8 @@ text_converter(char *target __UNUSED__, void *data, int size __UNUSED__,
 }
 
 static int
-edje_converter(char *target __UNUSED__, void *data, int size __UNUSED__, 
-               void **data_ret, int *size_ret, Ecore_X_Atom *ttype __UNUSED__, 
+edje_converter(char *target __UNUSED__, void *data, int size __UNUSED__,
+               void **data_ret, int *size_ret, Ecore_X_Atom *ttype __UNUSED__,
                int *typesize __UNUSED__)
 {
    struct _elm_cnp_selection *sel;
@@ -688,8 +824,8 @@ edje_converter(char *target __UNUSED__, void *data, int size __UNUSED__,
 
 
 static int
-html_converter(char *target __UNUSED__, void *data, int size __UNUSED__, 
-               void **data_ret, int *size_ret, Ecore_X_Atom *ttype __UNUSED__, 
+html_converter(char *target __UNUSED__, void *data, int size __UNUSED__,
+               void **data_ret, int *size_ret, Ecore_X_Atom *ttype __UNUSED__,
                int *typesize __UNUSED__)
 {
    struct _elm_cnp_selection *sel;
@@ -702,8 +838,8 @@ html_converter(char *target __UNUSED__, void *data, int size __UNUSED__,
 }
 
 static int
-uri_converter(char *target __UNUSED__, void *data, int size __UNUSED__, 
-              void **data_ret, int *size_ret, Ecore_X_Atom *ttype __UNUSED__, 
+uri_converter(char *target __UNUSED__, void *data, int size __UNUSED__,
+              void **data_ret, int *size_ret, Ecore_X_Atom *ttype __UNUSED__,
               int *typesize __UNUSED__)
 {
     struct _elm_cnp_selection *sel;
@@ -745,6 +881,85 @@ image_provider(void *images __UNUSED__, Evas_Object *entry, const char *item)
    return NULL;
 }
 
+
+static struct pasteimage *
+pasteimage_alloc(const char *file)
+{
+   struct pasteimage *pi;
+   int len;
+   char *buf;
+
+   pi = calloc(1,sizeof(struct pasteimage));
+   if (!pi) return NULL;
+
+   len = snprintf(NULL, 0, "pasteimage-%p",pi);
+   len ++;
+   buf = malloc(len);
+   if (!buf)
+     {
+        free(pi);
+        return NULL;
+     }
+   snprintf(buf, len, "pasteimage-%p",pi);
+   pi->tag = buf;
+
+   if (file)
+     {
+        if (strstr(file,"file://")) file += strlen("file://");
+        pi->file = strdup(file);
+     }
+
+   return pi;
+}
+
+static void
+pasteimage_free(struct pasteimage *pi)
+{
+   if (!pi) return;
+   if (pi->file) free((void*)pi->file);
+   if (pi->tag) free((void*)pi->tag);
+   free(pi);
+}
+
+static bool
+pasteimage_provider_set(Evas_Object *entry)
+{
+   void *v;
+   const char *type;
+   if (!entry) return false;
+   type = elm_widget_type_get(entry);
+   printf("type is %s\n",type);
+   if (!type || strcmp(type,"entry") != 0) return false;
+
+   v = evas_object_data_get(entry, PROVIDER_SET);
+   if (!v)
+     {
+        evas_object_data_set(entry, PROVIDER_SET, pasteimage_provider_set);
+        elm_entry_item_provider_append(entry, image_provider, NULL);
+        evas_object_event_callback_add(entry, EVAS_CALLBACK_FREE,
+                                       entry_deleted, NULL);
+     }
+   return true;
+}
+
+
+static bool
+pasteimage_append(struct pasteimage *pi, Evas_Object *entry)
+{
+   char entrytag[100];
+
+   if (!pi) return false;
+   if (!entry) return false;
+
+   pasteimage_provider_set(entry);
+
+   pastedimages = eina_list_append(pastedimages, pi);
+   snprintf(entrytag, sizeof(entrytag),"<item absize=240x180 href=%s>",pi->tag);
+   elm_entry_entry_insert(entry, entrytag);
+
+   return true;
+}
+
 static void
 entry_deleted(void *images __UNUSED__, Evas *e __UNUSED__, Evas_Object *entry, void *unused __UNUSED__)
 {
@@ -847,4 +1062,455 @@ mark_up(const char *start, int *lenp){
 }
 
 
+/**
+ * Drag & Drop functions
+ */
+struct dropable {
+     Evas_Object *obj;
+     /* FIXME: Cache window */
+     Elm_Sel_Format types;
+     Elm_Drop_Cb dropcb;
+     void *cbdata;
+};
+/* FIXME: Way too many globals */
+Eina_List *drops = NULL;
+Evas_Object *dragwin;
+int _dragx, _dragy;
+Ecore_Event_Handler *handler_pos, *handler_drop, *handler_enter,
+                    *handler_status;
+
+struct dropable *cur;
+
+static Eina_Bool
+_dnd_enter(void *data, int etype, void *ev)
+{
+   Ecore_X_Event_Xdnd_Enter *enter = ev;
+   int i;
+
+   /* Skip it */
+   if (enter->num_types == 0 || enter->types == NULL) return true;
+
+   cnp_debug("Types\n");
+   savedtypes.ntypes = enter->num_types;
+   if (savedtypes.types) free(savedtypes.types);
+   savedtypes.types = malloc(sizeof(char *) * enter->num_types);
+   for (i = 0 ; i < enter->num_types ; i ++)
+     {
+        savedtypes.types[i] = eina_stringshare_add(enter->types[i]);
+        cnp_debug("Type is %s %p %p\n",enter->types[i],
+                  savedtypes.types[i],text_uri);
+        if (savedtypes.types[i] == text_uri)
+          {
+             /* Request it, so we know what it is */
+             cnp_debug("Sending uri request\n");
+             savedtypes.textreq = 1;
+             savedtypes.pi = NULL; /* FIXME: Free? */
+             ecore_x_selection_xdnd_request(enter->win, text_uri);
+          }
+     }
+
+   /* FIXME: Find an object and make it current */
+
+   return true;
+}
+
+static Eina_Bool
+_dnd_drop(void *data, int etype, void *ev)
+{
+   struct _Ecore_X_Event_Xdnd_Drop *drop;
+   struct dropable *dropable;
+   Eina_List *l;
+   Ecore_Evas *ee;
+   Ecore_X_Window xwin;
+   Elm_Drop_Data ddata;
+   int x,y,w,h;
+
+   int i,j;
+
+   drop = ev;
+
+   // check we still have something to drop
+   if (!drops) return true;
+
+   /* Find any widget in our window; then work out geometry rel to our window */
+   for (l = drops ; l ; l = l->next)
+     {
+        dropable = l->data;
+        xwin = (Ecore_X_Window)ecore_evas_window_get(ecore_evas_ecore_evas_get(
+                                             evas_object_evas_get(
+                                                dropable->obj)));
+        if (xwin == drop->win)
+           break;
+     }
+   /* didn't find a window */
+   if (l == NULL)
+      return true;
+
+
+   /* Calculate real (widget relative) position */
+      // - window position
+      // - widget position
+   ee = ecore_evas_ecore_evas_get(evas_object_evas_get(dropable->obj));
+   ecore_evas_geometry_get(ee, &x, &y, NULL, NULL);
+   savedtypes.x = drop->position.x - x;
+   savedtypes.y = drop->position.y - y;
+
+   printf("Drop position is %d,%d\n",savedtypes.x,savedtypes.y);
+
+   for ( ; l ; l = l->next)
+     {
+        dropable = l->data;
+        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! */
+     }
+
+   if (!l) /* didn't find one */
+      return true;
+
+   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 ++)
+          {
+             if (strcmp(savedtypes.types[j], atoms[i].name) == 0)
+               {
+                  goto found;
+               }
+          }
+     }
+
+   cnp_debug("Didn't find a target\n");
+   return true;
+
+found:
+   printf("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 ");
+        if (savedtypes.pi)
+          {
+             char entrytag[100];
+
+             ddata.x = savedtypes.x;
+             ddata.y = savedtypes.y;
+
+             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);
+                  savedtypes.pi = NULL;
+
+                  return true;
+               }
+             else if (dropable->types & ELM_SEL_FORMAT_MARKUP)
+               {
+                  ddata.format = ELM_SEL_FORMAT_MARKUP;
+                  pasteimage_provider_set(dropable->obj);
+
+                  pastedimages = eina_list_append(pastedimages, savedtypes.pi);
+                  snprintf(entrytag, sizeof(entrytag),
+                           "<item absize=240x180 href=%s>",savedtypes.pi->tag);
+                  ddata.data = entrytag;
+                  cnp_debug("Insert %s\n",(char *)ddata.data);
+                  dropable->dropcb(dropable->cbdata, dropable->obj, &ddata);
+                  ecore_x_dnd_send_finished();
+                  return true;
+               }
+          }
+        else if (savedtypes.textreq)
+          {
+             /* Already asked: Pretend we asked now, and paste immediately when
+              * it comes in */
+             savedtypes.textreq = 0;
+             ecore_x_dnd_send_finished();
+             return true;
+          }
+     }
+
+   cnp_debug("doing a request then\n");
+   selections[ELM_SEL_XDND].requestwidget = dropable->obj;
+   selections[ELM_SEL_XDND].requestformat = ELM_SEL_FORMAT_MARKUP;
+   selections[ELM_SEL_XDND].active = true;
+
+   ecore_x_selection_xdnd_request(xwin, atoms[i].name);
+
+   return true;
+}
+static Eina_Bool
+_dnd_position(void *data, int etype, 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 */
+   rect.x = pos->position.x - 5;
+   rect.y = pos->position.y - 5;
+   rect.width = 10;
+   rect.height = 10;
+   ecore_x_dnd_send_status(true, false, rect, pos->action);
+
+   return true;
+}
+
+/**
+ * When dragging this is callback response from the destination.
+ * The important thing we care about: Can we drop; thus update cursor
+ * appropriately.
+ */
+static Eina_Bool
+_dnd_status(void *data, int etype, void *ev)
+{
+   struct _Ecore_X_Event_Xdnd_Status *status = ev;
+
+   if (!status) return true;
+
+   /* Only thing we care about: will accept */
+   if (status->will_accept)
+     {
+         printf("Will accept\n");
+     }
+   else
+     { /* Won't accept */
+         printf("Won't accept accept\n");
+     }
+   return true;
+}
+
+/**
+ * Add a widget as drop target.
+ */
+Eina_Bool
+elm_drop_target_add(Evas_Object *obj, Elm_Sel_Type format,
+                    Elm_Drop_Cb dropcb, void *cbdata)
+{
+   struct dropable *drop;
+   Ecore_X_Window xwin;
+   int first;
+
+   if (!obj) return false;
+   if (!_elm_cnp_init_count) _elm_cnp_init();
+
+   /* Is this the first? */
+   first = (drops == NULL) ? 1 : 0;
+
+   drop = calloc(1,sizeof(struct dropable));
+   if (!drop) return 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 false;
+     }
+
+   drop->obj = obj;
+   /* Something for now */
+   drop->types = format;
+
+   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 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, true);
+
+   printf("Adding drop target calls\n");
+   handler_enter = ecore_event_handler_add(ECORE_X_EVENT_XDND_ENTER,
+                                           _dnd_enter, NULL);
+   handler_pos = ecore_event_handler_add(ECORE_X_EVENT_XDND_POSITION,
+                                         _dnd_position, NULL);
+   handler_drop = ecore_event_handler_add(ECORE_X_EVENT_XDND_DROP,
+                                          _dnd_drop, NULL);
+
+   return true;
+}
+
+Eina_Bool
+elm_drop_target_del(Evas_Object *obj)
+{
+   struct dropable *drop,*del;
+   Eina_List *item;
+   Ecore_X_Window xwin;
+
+   del = NULL;
+   EINA_LIST_FOREACH(drops, item, drop)
+     {
+        if (drop->obj == obj)
+          {
+             drops = eina_list_remove_list(drops, item);
+             del = drop;
+             break;
+          }
+     }
+   if (!del) return 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 != NULL) return 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, 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 true;
+}
+
+
+static void
+_drag_mouse_up(void *un, Evas *e, Evas_Object *obj, void *data)
+{
+   evas_object_event_callback_del(obj, EVAS_CALLBACK_MOUSE_UP, _drag_mouse_up);
+   ecore_x_dnd_drop();
+   if (dragdonecb)
+     {
+        dragdonecb(dragdonecb,selections[ELM_SEL_XDND].widget);
+        dragdonecb = NULL;
+     }
+   if (dragwin)
+     {
+        evas_object_del(dragwin);
+        dragwin = NULL;
+     }
+
+}
+
+static void
+_drag_move(void *data __UNUSED__, Ecore_X_Xdnd_Position *pos){
+   evas_object_move(dragwin, pos->position.x - _dragx,
+                    pos->position.y - _dragy);
+}
+
+
+Eina_Bool
+elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data,
+               void (*dragdone)(void *data, Evas_Object *),void *donecbdata)
+{
+   Ecore_X_Window xwin;
+   struct _elm_cnp_selection *sel;
+   Elm_Sel_Type xdnd = ELM_SEL_XDND;
+   Ecore_Evas *ee;
+   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");
+
+   ecore_x_dnd_type_set(xwin, "text/uri-list", 1);
+      /* FIXME: just call elm_selection_set */
+   sel = selections + ELM_SEL_XDND;
+   sel->active = 1;
+   sel->widget = obj;
+   sel->format = format;
+   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!? */
+   elm_win_resize_object_add(dragwin,icon);
+   evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND,EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
+
+   /* Position subwindow appropriately */
+   ee = ecore_evas_ecore_evas_get(evas_object_evas_get(obj));
+   ecore_evas_geometry_get(ee, &x, &y, NULL, NULL);
+   evas_object_geometry_get(obj, &x2, &y2, &w, &h);
+   x += x2;
+   y += y2;
+   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);
+
+   evas_pointer_canvas_xy_get(evas_object_evas_get(obj), &x3, &y3);
+   _dragx = x3 - x2;
+   _dragy = y3 - y2;
+
+   return true;
+}
+
+
+
+
+#else
+/* Stubs for windows */
+Eina_Bool
+elm_drag_start(Evas_Object *o, Elm_Sel_Format f, const char *d,
+               void (*donecb)(void *, Evas_Object *),void *cbdata)
+{
+   return false;
+}
+Eina_Bool
+elm_drop_target_add(Evas_Object *obj, Elm_Sel_Type format,
+                    Elm_Drop_Cb dropcb, void *cbdata){
+   return false;
+}
+
+Eina_Bool
+elm_drop_target_del(Evas_Object *o)
+{
+   return true;
+}
 #endif
+
+/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/
index 3ed9bb8..5c5b64a 100644 (file)
@@ -532,20 +532,20 @@ _paste(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
      {
 #ifdef HAVE_ELEMENTARY_X
         wd->selection_asked = EINA_TRUE;
-       elm_selection_get(ELM_SEL_CLIPBOARD, ELM_SEL_MARKUP, data);
+       elm_selection_get(ELM_SEL_CLIPBOARD, ELM_SEL_FORMAT_MARKUP, data);
 #endif
      }
 }
 
 static void
-_store_selection(enum _elm_sel_type seltype, Evas_Object *obj)
+_store_selection(Elm_Sel_Type seltype, Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    const char *sel;
 
    if (!wd) return;
    sel = edje_object_part_text_selection_get(wd->ent, "elm.text");
-   elm_selection_set(seltype, obj, ELM_SEL_MARKUP, sel);
+   elm_selection_set(seltype, obj, ELM_SEL_FORMAT_MARKUP, sel);
    if (seltype == ELM_SEL_CLIPBOARD)
           eina_stringshare_replace(&wd->cut_sel, sel);
 }
@@ -1066,7 +1066,7 @@ _signal_selection_start(void *data, Evas_Object *obj __UNUSED__, const char *emi
 
        top = elm_widget_top_get(data);
        if ((top) && (elm_win_xwindow_get(top)))
-            elm_selection_set(ELM_SEL_PRIMARY, data, ELM_SEL_MARKUP, txt);
+            elm_selection_set(ELM_SEL_PRIMARY, data, ELM_SEL_FORMAT_MARKUP, txt);
      }
 #endif
 }
@@ -1078,7 +1078,7 @@ _signal_selection_changed(void *data, Evas_Object *obj __UNUSED__, const char *e
    if (!wd) return;
    wd->have_selection = EINA_TRUE;
    evas_object_smart_callback_call(data, SIG_SELECTION_CHANGED, NULL);
-   elm_selection_set(ELM_SEL_PRIMARY, obj, ELM_SEL_MARKUP,
+   elm_selection_set(ELM_SEL_PRIMARY, obj, ELM_SEL_FORMAT_MARKUP,
                   elm_entry_selection_get(data));
 }
 
@@ -1099,7 +1099,7 @@ _signal_selection_cleared(void *data, Evas_Object *obj __UNUSED__, const char *e
 
             top = elm_widget_top_get(data);
             if ((top) && (elm_win_xwindow_get(top)))
-                elm_selection_set(ELM_SEL_PRIMARY, data, ELM_SEL_MARKUP,
+                elm_selection_set(ELM_SEL_PRIMARY, data, ELM_SEL_FORMAT_MARKUP,
                                       wd->cut_sel);
 #endif
             eina_stringshare_del(wd->cut_sel);
@@ -1133,7 +1133,7 @@ _signal_entry_paste_request(void *data, Evas_Object *obj __UNUSED__, const char
        if ((top) && (elm_win_xwindow_get(top)))
          {
              wd->selection_asked = EINA_TRUE;
-             elm_selection_get(ELM_SEL_CLIPBOARD, ELM_SEL_MARKUP, data);
+             elm_selection_get(ELM_SEL_CLIPBOARD, ELM_SEL_FORMAT_MARKUP, data);
          }
 #endif
      }
@@ -1145,7 +1145,7 @@ _signal_entry_copy_notify(void *data, Evas_Object *obj __UNUSED__, const char *e
    Widget_Data *wd = elm_widget_data_get(data);
    if (!wd) return;
    evas_object_smart_callback_call(data, SIG_SELECTION_COPY, NULL);
-   elm_selection_set(ELM_SEL_CLIPBOARD, obj, ELM_SEL_MARKUP,
+   elm_selection_set(ELM_SEL_CLIPBOARD, obj, ELM_SEL_FORMAT_MARKUP,
                        elm_entry_selection_get(data));
 }
 
@@ -1155,7 +1155,7 @@ _signal_entry_cut_notify(void *data, Evas_Object *obj __UNUSED__, const char *em
    Widget_Data *wd = elm_widget_data_get(data);
    if (!wd) return;
    evas_object_smart_callback_call(data, SIG_SELECTION_CUT, NULL);
-   elm_selection_set(ELM_SEL_CLIPBOARD, obj, ELM_SEL_MARKUP,
+   elm_selection_set(ELM_SEL_CLIPBOARD, obj, ELM_SEL_FORMAT_MARKUP,
                        elm_entry_selection_get(data));
    edje_object_part_text_insert(wd->ent, "elm.text", "");
    wd->changed = EINA_TRUE;
index 02fa57f..9062490 100644 (file)
 // Why EAPI in a private header ?
 // EAPI is temporaty - that widget api will change, but makign it EAPI right now to indicate its bound for externalness
 
+typedef struct _Elm_Config    Elm_Config;
+typedef struct _Elm_Module    Elm_Module;
+typedef struct _Elm_Drop_Data Elm_Drop_Data;
+
+typedef Eina_Bool (*Elm_Drop_Cb) (void *d, Evas_Object *o, Elm_Drop_Data *data);
+
 struct _Elm_Theme
 {
    Eina_List *overlay;
@@ -40,19 +46,45 @@ struct _Elm_Theme
 typedef enum _Elm_Engine
 {
    ELM_SOFTWARE_X11,
-     ELM_SOFTWARE_FB,
-     ELM_SOFTWARE_DIRECTFB,
-     ELM_SOFTWARE_16_X11,
-     ELM_XRENDER_X11,
-     ELM_OPENGL_X11,
-     ELM_SOFTWARE_WIN32,
-     ELM_SOFTWARE_16_WINCE,
-     ELM_SOFTWARE_SDL,
-     ELM_SOFTWARE_16_SDL,
-     ELM_OPENGL_SDL
+   ELM_SOFTWARE_FB,
+   ELM_SOFTWARE_DIRECTFB,
+   ELM_SOFTWARE_16_X11,
+   ELM_XRENDER_X11,
+   ELM_OPENGL_X11,
+   ELM_SOFTWARE_WIN32,
+   ELM_SOFTWARE_16_WINCE,
+   ELM_SOFTWARE_SDL,
+   ELM_SOFTWARE_16_SDL,
+   ELM_OPENGL_SDL
 } Elm_Engine;
 
-typedef struct _Elm_Config Elm_Config;
+typedef enum _Elm_Sel_Type
+{
+   ELM_SEL_PRIMARY,
+   ELM_SEL_SECONDARY,
+   ELM_SEL_CLIPBOARD,
+   ELM_SEL_XDND,
+   
+   ELM_SEL_MAX,
+} Elm_Sel_Type;
+
+typedef enum _Elm_Sel_Format
+{
+   /** Plain unformated text: Used for things that don't want rich markup */
+   ELM_SEL_FORMAT_TEXT   = 0x01,
+   /** Edje textblock markup, including inline images */
+   ELM_SEL_FORMAT_MARKUP = 0x02,
+   /** Images */
+   ELM_SEL_FORMAT_IMAGE  = 0x04,
+} Elm_Sel_Format;
+
+struct _Elm_Drop_Data
+{
+   int                   x, y;
+   Elm_Sel_Format        format;
+   void                 *data;
+   int                   len;
+};
 
 struct _Elm_Config
 {
@@ -82,8 +114,6 @@ struct _Elm_Config
    int autoperiod;   
 };
 
-typedef struct _Elm_Module Elm_Module;
-
 struct _Elm_Module
 {
    int version;
@@ -100,21 +130,6 @@ struct _Elm_Module
    int references;
 };
 
-enum _elm_sel_type {
-   ELM_SEL_PRIMARY,
-   ELM_SEL_SECONDARY,
-   ELM_SEL_CLIPBOARD,
-
-   ELM_SEL_MAX,
-};
-
-enum _elm_sel_format {
-   ELM_SEL_MARKUP      = 0x01,
-   ELM_SEL_IMAGE       = 0x02,
-};
-
-
-
 #define ELM_NEW(t) calloc(1, sizeof(t))
 
 void _elm_win_shutdown(void);
@@ -213,9 +228,12 @@ void              _elm_config_init(void);
 void              _elm_config_sub_init(void);
 void              _elm_config_shutdown(void);
 
-Eina_Bool        elm_selection_set(enum _elm_sel_type selection, Evas_Object *widget, enum _elm_sel_format format, const char *selbuf);
-Eina_Bool        elm_selection_clear(enum _elm_sel_type selection, Evas_Object *widget);
-Eina_Bool        elm_selection_get(enum _elm_sel_type selection, enum _elm_sel_format format, Evas_Object *widget);
+Eina_Bool            elm_selection_set(Elm_Sel_Type selection, Evas_Object *widget, Elm_Sel_Format format, const char *buf);
+Eina_Bool            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);
+Eina_Bool            elm_drop_target_add(Evas_Object *widget, Elm_Sel_Type, Elm_Drop_Cb, void *);
+Eina_Bool            elm_drop_target_del(Evas_Object *widget);
+Eina_Bool            elm_drag_start(Evas_Object *, Elm_Sel_Format, const char *, void (*)(void *,Evas_Object*),void*);
 
 Eina_Bool         _elm_dangerous_call_check(const char *call);