Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
etk_xdnd_test.c
Log Message:
- seperate selections and clipboard stuff. for now, we have an etk_clipboard_*
API that handles text copy / paste. Next up is finished selection support for
text, then image/* for clipboard and dnd.
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_xdnd_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_xdnd_test.c 11 Feb 2006 10:27:14 -0000 1.4
+++ etk_xdnd_test.c 12 Feb 2006 13:13:44 -0000 1.5
@@ -54,7 +54,7 @@
etk_box_pack_start(ETK_BOX(vbox), image, ETK_FALSE, ETK_FALSE, 0);
label = etk_label_new("");
- etk_signal_connect("selection_get", ETK_OBJECT(label),
ETK_CALLBACK(_etk_test_xdnd_clipboard_text_request_cb), NULL);
+ etk_signal_connect("clipboard_received", ETK_OBJECT(label),
ETK_CALLBACK(_etk_test_xdnd_clipboard_text_request_cb), NULL);
button = etk_button_new_with_label(_("Press me to paste text"));
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_xdnd_button_paste_cb), label);
@@ -120,7 +120,7 @@
/* Called when a some text is pasted */
static void _etk_test_xdnd_clipboard_text_request_cb(Etk_Object *object, void
*event, void *data)
{
- Etk_Event_Selection_Get *ev;
+ Etk_Event_Selection_Request *ev;
ev = event;
etk_label_set(ETK_LABEL(object), (char *)ev->data);
@@ -129,11 +129,15 @@
/* Called when the "paste" button is clicked */
static void _etk_test_xdnd_button_paste_cb(Etk_Object *object, void *data)
{
- etk_selection_text_request(ETK_WIDGET(data));
+ etk_clipboard_text_request(ETK_WIDGET(data));
}
/* Called when the "copy" button is clicked */
static void _etk_test_xdnd_button_copy_cb(Etk_Object *object, void *data)
{
- etk_selection_text_set(ETK_WIDGET(data),
etk_entry_text_get(ETK_ENTRY(data)));
+ const char *text = NULL;
+
+ text = etk_entry_text_get(ETK_ENTRY(data));
+ if(text)
+ etk_clipboard_text_set(ETK_WIDGET(data), text, strlen(text) + 1);
}
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
