bool IsVisible() const;
/**
- * @brief exchange either sending or receiving buffered data
+ * @brief sending buffered data
*
- * @param[in] type true for send buffered data, false for receive data to buffer
* @param[in] event information pointer
- * @return The buffer pointer for send or receive data
*/
- char* ExcuteBuffered(bool type, void* event);
+ void ExcuteSend(void* event);
+
+ /**
+ * @brief receiving buffered data
+ *
+ * @param[in] event information pointer
+ * @param[out] data The buffer pointer for receive data
+ * @param[out] length The buffer length for receive data
+ */
+ void ExcuteReceive(void* event, char*& data, int& length);
private:
// Undefined
return false;
}
-char* Clipboard::ExcuteBuffered(bool type, void* event)
+void Clipboard::ExcuteSend(void* event)
+{
+}
+
+void Clipboard::ExcuteReceive(void* event, char*& data, int& length)
{
- return NULL;
}
} // namespace Adaptor
Ecore_Wl2_Input* input = ecore_wl2_input_default_input_get(ecore_wl2_connected_display_get(NULL));
mSerial = ecore_wl2_dnd_selection_set(input, types);
#else
- mSerial = ecore_wl_dnd_selection_set(ecore_wl_input_get(), types);
+ mSerial = ecore_wl_dnd_selection_set(ecore_wl_input_get(), types);
#endif
}
void RequestItem()
{
-#ifdef ECORE_WAYLAND2
- Ecore_Wl2_Input* input = ecore_wl2_input_default_input_get(ecore_wl2_connected_display_get(NULL));
- ecore_wl2_dnd_selection_get(input);
-#else
const char* types[10] = {
0,
};
int i = -1;
types[++i] = "text/plain;charset=utf-8";
+
+#ifdef ECORE_WAYLAND2
+ Ecore_Wl2_Display* display = ecore_wl2_connected_display_get(NULL);
+ Ecore_Wl2_Input* input = ecore_wl2_input_default_input_get(display);
+ Ecore_Wl2_Offer* offer = ecore_wl2_dnd_selection_get(input);
+
+ ecore_wl2_offer_receive(offer, const_cast<char*>(*types));
+ ecore_wl2_display_flush(ecore_wl2_input_display_get(input));
+#else
ecore_wl_dnd_selection_get(ecore_wl_input_get(), *types);
#endif
-
- Dali::ClipboardEventNotifier clipboardEventNotifier(Dali::ClipboardEventNotifier::Get());
- if(clipboardEventNotifier)
- {
- clipboardEventNotifier.SetContent(mSendBuffer);
- clipboardEventNotifier.EmitContentSelectedSignal();
- }
}
- char* ExcuteSend(void* event)
+ void ExcuteSend(void* event)
{
#ifdef ECORE_WAYLAND2
Ecore_Wl2_Event_Data_Source_Send* ev = reinterpret_cast<Ecore_Wl2_Event_Data_Source_Send*>(event);
#else
- Ecore_Wl_Event_Data_Source_Send* ev = reinterpret_cast<Ecore_Wl_Event_Data_Source_Send*>(event);
+ Ecore_Wl_Event_Data_Source_Send* ev = reinterpret_cast<Ecore_Wl_Event_Data_Source_Send*>(event);
#endif
if(ev->serial != mSerial)
{
- return NULL;
+ return;
}
- int len_buf = mSendBuffer.length();
+ int len_buf = mSendBuffer.length() + 1; // we should consider the char* buffer length
int len_remained = len_buf;
int len_written = 0, ret;
- const char* buf = mSendBuffer.c_str();
+ const char* buf = mSendBuffer.c_str(); // last char in the buffer must be \0
while(len_written < len_buf)
{
len_remained -= ret;
}
close(ev->fd);
- return NULL;
}
- char* ExcuteReceive(void* event)
+ void ExcuteReceive(void* event, char*& data, int& length)
{
#ifdef ECORE_WAYLAND2
- Ecore_Wl2_Event_Selection_Data_Ready* ev = reinterpret_cast<Ecore_Wl2_Event_Selection_Data_Ready*>(event);
+ Ecore_Wl2_Event_Offer_Data_Ready* ev = reinterpret_cast<Ecore_Wl2_Event_Offer_Data_Ready*>(event);
#else
Ecore_Wl_Event_Selection_Data_Ready* ev = reinterpret_cast<Ecore_Wl_Event_Selection_Data_Ready*>(event);
#endif
-
- return reinterpret_cast<char*>(ev->data);
+ data = reinterpret_cast<char*>(ev->data);
+ length = ev->len;
}
int GetCount()
return mImpl->IsVisible();
}
-char* Clipboard::ExcuteBuffered(bool type, void* event)
+void Clipboard::ExcuteSend(void* event)
+{
+ mImpl->ExcuteSend(event);
+}
+
+void Clipboard::ExcuteReceive(void* event, char*& data, int& length)
{
- return (type ? mImpl->ExcuteSend(event) : mImpl->ExcuteReceive(event));
+ mImpl->ExcuteReceive(event, data, length);
}
} // namespace Adaptor
return false;
}
-char* Clipboard::ExcuteBuffered(bool type, void* event)
+void Clipboard::ExcuteSend(void* event)
{
- if(!type)
- {
- // Receive
- Ecore_X_Event_Selection_Notify* selectionNotifyEvent = static_cast<Ecore_X_Event_Selection_Notify*>(event);
+}
- Ecore_X_Selection_Data* selectionData = static_cast<Ecore_X_Selection_Data*>(selectionNotifyEvent->data);
- if(selectionData->data)
- {
- if(selectionNotifyEvent->selection == ECORE_X_SELECTION_SECONDARY)
- {
- // Claim the ownership of the SECONDARY selection.
- ecore_x_selection_secondary_set(mImpl->mApplicationWindow, "", 1);
+void Clipboard::ExcuteReceive(void* event, char*& data, int& length)
+{
+ // Receive
+ Ecore_X_Event_Selection_Notify* selectionNotifyEvent = static_cast<Ecore_X_Event_Selection_Notify*>(event);
- return (reinterpret_cast<char*>(selectionData->data));
- }
+ Ecore_X_Selection_Data* selectionData = static_cast<Ecore_X_Selection_Data*>(selectionNotifyEvent->data);
+ if(selectionData->data)
+ {
+ if(selectionNotifyEvent->selection == ECORE_X_SELECTION_SECONDARY)
+ {
+ // Claim the ownership of the SECONDARY selection.
+ ecore_x_selection_secondary_set(mImpl->mApplicationWindow, "", 1);
+ data = reinterpret_cast<char*>(selectionData->data);
+ length = selectionData->length;
}
}
- return NULL;
}
} // namespace Adaptor
if(clipboard)
{
Clipboard& clipBoardImpl(GetImplementation(clipboard));
- clipBoardImpl.ExcuteBuffered(true, event);
+ clipBoardImpl.ExcuteSend(event);
}
}
// We have got the selected content, inform the clipboard event listener (if we have one).
Dali::Clipboard clipboard = Clipboard::Get();
char* selectionData = NULL;
+ size_t dataLength = 0u;
+
if(clipboard)
{
+ int len = 0;
Clipboard& clipBoardImpl(GetImplementation(clipboard));
- selectionData = clipBoardImpl.ExcuteBuffered(false, event);
+ clipBoardImpl.ExcuteReceive(event, selectionData, len);
+ dataLength = static_cast<size_t>(len);
}
if(!mClipboardEventNotifier)
mClipboardEventNotifier = ClipboardEventNotifier::Get();
}
- if(selectionData && mClipboardEventNotifier)
+ if(selectionData && mClipboardEventNotifier && dataLength > 0)
{
ClipboardEventNotifier& clipboardEventNotifier(ClipboardEventNotifier::GetImplementation(mClipboardEventNotifier));
- std::string content(selectionData, strlen(selectionData));
+ std::string content;
+ size_t stringLength = strlen(selectionData);
+
+ if(stringLength < dataLength)
+ {
+ content.append(selectionData, stringLength);
+ }
+ else
+ {
+ content.append(selectionData, dataLength);
+ }
clipboardEventNotifier.SetContent(content);
clipboardEventNotifier.EmitContentSelectedSignal();
- DALI_LOG_INFO(gSelectionEventLogFilter, Debug::General, "EcoreEventSelectionNotify: Content(%d): %s\n", strlen(selectionData), selectionData);
+ DALI_LOG_INFO(gSelectionEventLogFilter, Debug::General, "EcoreEventSelectionNotify: Content(%s) strlen(%d) dataLength(%d)\n", selectionData, strlen(selectionData), dataLength);
}
}
// Register Selection event - clipboard selection
mEcoreEventHandler.PushBack(ecore_event_handler_add(ECORE_WL2_EVENT_DATA_SOURCE_SEND, EcoreEventDataSend, this));
- mEcoreEventHandler.PushBack(ecore_event_handler_add(ECORE_WL2_EVENT_SELECTION_DATA_READY, EcoreEventDataReceive, this));
+ mEcoreEventHandler.PushBack(ecore_event_handler_add(ECORE_WL2_EVENT_OFFER_DATA_READY, EcoreEventDataReceive, this));
// Register Effect Start/End event
mEcoreEventHandler.PushBack(ecore_event_handler_add(ECORE_WL2_EVENT_EFFECT_START, EcoreEventEffectStart, this));