mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

new parameter of dataexch

Browse Source
This commit is contained in:
Jinhao 2016-12-06 02:21:12 +08:00
parent c0c3cfebe8
commit c1cfd283e2
5 changed files with 5723 additions and 5727 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/nana/system/dataexch.hpp
View File

@ -12,7 +12,7 @@
#ifndef NANA_SYSTEM_DATAEXCH_HPP
#define NANA_SYSTEM_DATAEXCH_HPP
#include <nana/basic_types.hpp>
#include <nana/gui/basis.hpp>
namespace nana{
@ -31,15 +31,15 @@ namespace system{
text, pixmap
};
void set(const std::string & text_utf8);
void set(const std::wstring& text);
void set(const std::string & text_utf8, native_window_type owner = nullptr);
void set(const std::wstring& text, native_window_type owner = nullptr);
bool set(const nana::paint::graphics& g);
bool set(const nana::paint::graphics& g, native_window_type owner = nullptr);
void get(std::string& text_utf8);
void get(std::wstring& text);
private:
bool _m_set(format, const void* buf, std::size_t size);
bool _m_set(format, const void* buf, std::size_t size, native_window_type);
void* _m_get(format, size_t& size);
};

1
source/detail/platform_spec_posix.cpp
View File

@ -1131,6 +1131,7 @@ namespace detail
void platform_spec::write_selection(native_window_type owner, Atom type, const void * buf, size_t bufsize)
{
platform_scope_guard psg;
::XSetSelectionOwner(display_, XA_PRIMARY, reinterpret_cast<Window>(owner), CurrentTime);
::XSetSelectionOwner(display_, atombase_.clipboard, reinterpret_cast<Window>(owner), CurrentTime);
::XFlush(display_);
if(XA_STRING == type || atombase_.utf8_string == type)

11384
source/gui/widgets/listbox.cpp
View File

File diff suppressed because it is too large Load Diff

2
source/gui/widgets/skeletons/text_editor.cpp
View File

@ -2333,7 +2333,7 @@ namespace nana{ namespace widgets
{
auto text = _m_make_select_string();
if (!text.empty())
nana::system::dataexch().set(text);
nana::system::dataexch().set(text, API::root(this->window_));
}
void text_editor::cut()

53
source/system/dataexch.cpp
View File

@ -29,28 +29,28 @@
namespace nana{ namespace system{
//class dataexch
void dataexch::set(const std::string& text)
void dataexch::set(const std::string& text, native_window_type owner)
{
#ifdef NANA_WINDOWS
std::wstring wstr = ::nana::charset(text, nana::unicode::utf8);
_m_set(format::text, wstr.c_str(), (wstr.length() + 1) * sizeof(wchar_t));
_m_set(format::text, wstr.c_str(), (wstr.length() + 1) * sizeof(wchar_t), owner);
#elif defined(NANA_X11)
_m_set(format::text, text.c_str(), text.length() + 1);
_m_set(format::text, text.c_str(), text.length() + 1, owner);
#endif
}
void dataexch::set(const std::wstring& text)
void dataexch::set(const std::wstring& text, native_window_type owner)
{
#ifdef NANA_WINDOWS
_m_set(format::text, text.c_str(), (text.length() + 1) * sizeof(wchar_t));
_m_set(format::text, text.c_str(), (text.length() + 1) * sizeof(wchar_t), owner);
#else
std::string str = to_utf8(text);
_m_set(format::text, str.c_str(), str.size() + 1);
_m_set(format::text, str.c_str(), str.size() + 1, owner);
#endif
}
bool dataexch::set(const nana::paint::graphics& g)
bool dataexch::set(const nana::paint::graphics& g, native_window_type owner)
{
#if defined(NANA_WINDOWS)
size sz = g.size();
@ -100,11 +100,14 @@ namespace nana{ namespace system{
}
if (::GlobalUnlock(h_gmem) || GetLastError() == NO_ERROR)
if (::OpenClipboard(::GetFocus()))
if (::OpenClipboard(reinterpret_cast<HWND>(owner)))
{
if (::EmptyClipboard())
if (::SetClipboardData(CF_DIB, h_gmem))
if (::CloseClipboard())
return true;
::CloseClipboard();
}
}
assert(false);
::GlobalFree(h_gmem);
@ -180,12 +183,12 @@ namespace nana{ namespace system{
}
}
//private:
bool dataexch::_m_set(format fmt, const void* buf, std::size_t size)
bool dataexch::_m_set(format fmt, const void* buf, std::size_t size, native_window_type owner)
{
bool res = false;
#if defined(NANA_WINDOWS)
if(::OpenClipboard(::GetFocus()))
if(::OpenClipboard(reinterpret_cast<HWND>(owner)))
{
if(::EmptyClipboard())
{
@ -195,7 +198,7 @@ namespace nana{ namespace system{
memcpy(addr, buf, size);
::GlobalUnlock(g);
unsigned data_format = 0;
unsigned data_format;
switch(fmt)
{
case format::text: data_format = CF_UNICODETEXT; break;
@ -208,26 +211,18 @@ namespace nana{ namespace system{
}
#elif defined(NANA_X11)
auto & spec = ::nana::detail::platform_spec::instance();
native_window_type owner = nullptr;
Atom atom_type;
switch(fmt)
{
internal_scope_guard lock;
auto wd = detail::bedrock::instance().focus();
if(wd) owner = wd->root;
case format::text: atom_type = spec.atombase().utf8_string; break;
default:
return false;
}
if(owner)
{
Atom atom_type;
switch(fmt)
{
case format::text: atom_type = spec.atombase().utf8_string; break;
default:
return false;
}
spec.write_selection(owner, atom_type, buf, size);
return true;
}
spec.write_selection(owner, atom_type, buf, size);
return true;
#endif
return res;
}
@ -239,7 +234,7 @@ namespace nana{ namespace system{
#if defined(NANA_WINDOWS)
if(::OpenClipboard(::GetFocus()))
{
unsigned data_format = 0;
unsigned data_format;
switch(fmt)
{
case format::text: data_format = CF_UNICODETEXT; break;