Enlightenment CVS committal
Author : sebastid
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
Ecore_X.h ecore_x_events.c ecore_x_private.h
Log Message:
dnd
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/Ecore_X.h,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -3 -r1.104 -r1.105
--- Ecore_X.h 24 Mar 2005 15:45:28 -0000 1.104
+++ Ecore_X.h 24 Mar 2005 18:14:02 -0000 1.105
@@ -453,11 +453,11 @@
enum {
ECORE_X_SELECTION_NONE,
- ECORE_X_SELECTION_STRING,
+ ECORE_X_SELECTION_TEXT,
ECORE_X_SELECTION_FILES
} content;
- char *string;
+ char *text;
char **files;
int num_files;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/ecore_x_events.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- ecore_x_events.c 24 Mar 2005 15:45:31 -0000 1.46
+++ ecore_x_events.c 24 Mar 2005 18:14:06 -0000 1.47
@@ -164,8 +164,8 @@
free(e->files[i]);
free(e->files);
break;
- case ECORE_X_SELECTION_STRING:
- free(e->string);
+ case ECORE_X_SELECTION_TEXT:
+ free(e->text);
break;
}
free(e->target);
@@ -1142,10 +1142,17 @@
}
free(tmp);
}
+ else if (!strcmp(e->target, "_NETSCAPE_URL"))
+ {
+ e->content = ECORE_X_SELECTION_FILES;
+ e->num_files = 1;
+ e->files = malloc(sizeof(char *));
+ e->files[0] = data;
+ }
else if (!strcmp(e->target, "text/plain"))
{
- e->content = ECORE_X_SELECTION_STRING;
- e->string = data;
+ e->content = ECORE_X_SELECTION_TEXT;
+ e->text = data;
}
}
else if (selection == ECORE_X_ATOM_SELECTION_CLIPBOARD)
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/ecore_x_private.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- ecore_x_private.h 24 Mar 2005 15:45:33 -0000 1.40
+++ ecore_x_private.h 24 Mar 2005 18:14:08 -0000 1.41
@@ -85,12 +85,6 @@
unsigned short width, height;
} rectangle;
- /*
- struct {
- int x, y;
- } pos;
- */
-
Time time;
Ecore_X_Atom action, accepted_action;
@@ -99,15 +93,6 @@
int suppress;
int await_status;
-
- /*
- struct {
- Ecore_Event_Handler *mouse_move;
- Ecore_Event_Handler *mouse_up;
- Ecore_Event_Handler *mouse_in;
- Ecore_Event_Handler *mouse_out;
- } handlers;
- */
} Ecore_X_DND_Source;
typedef struct _Ecore_X_DND_Target
@@ -120,13 +105,6 @@
ECORE_X_DND_TARGET_ENTERED
} state;
- /*
- struct {
- short x, y;
- unsigned short width, height;
- } rectangle;
- */
-
struct {
int x, y;
} pos;
@@ -136,18 +114,6 @@
Ecore_X_Atom action, accepted_action;
int will_accept;
- /*
- int suppress;
-
- int await_status;
-
- struct {
- Ecore_Event_Handler *mouse_move;
- Ecore_Event_Handler *mouse_up;
- Ecore_Event_Handler *mouse_in;
- Ecore_Event_Handler *mouse_out;
- } handlers;
- */
} Ecore_X_DND_Target;
extern Display *_ecore_x_disp;
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
