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

refactor shared_icons

Browse Source
This commit is contained in:
Jinhao 2018-12-12 00:39:54 +08:00
parent 43d85b300a
commit a2cda83019
6 changed files with 172 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
source/detail/posix/shared_icons.cpp Normal file
View File

@ -0,0 +1,50 @@
#include "shared_icons.hpp"
namespace nana
{
namespace detail
{
shared_icons::shared_icons():
path_("/usr/share/icons/"),
ifs_("/usr/share/icons/default/index.theme")
{
}
std::string shared_icons::cursor(const std::string& name)
{
auto theme = _m_read("Icon Theme", "Inherits");
return path_ + theme + "/cursors/" + name;
}
std::string shared_icons::_m_read(const std::string& category, const std::string& key)
{
ifs_.seekg(0, std::ios::beg);
bool found_cat = false;
while(ifs_.good())
{
std::string text;
std::getline(ifs_, text);
if(0 == text.find('['))
{
if(found_cat)
break;
if(text.find(category + "]") != text.npos)
{
found_cat = true;
}
}
else if(found_cat && (text.find(key + "=") == 0))
{
return text.substr(key.size() + 1);
}
}
return {};
}
}
}

28
source/detail/posix/shared_icons.hpp Normal file
View File

@ -0,0 +1,28 @@
#ifndef NANA_DETAIL_SHARED_ICONS_INCLUDED
#define NANA_DETAIL_SHARED_ICONS_INCLUDED
#include <string>
#include <fstream>
namespace nana
{
namespace detail
{
class shared_icons
{
public:
shared_icons();
std::string cursor(const std::string& name);
private:
std::string _m_read(const std::string& category, const std::string& key);
private:
std::string path_;
std::ifstream ifs_;
};
}//end namespace detail
}//end namespace nana
#endif

98
source/detail/posix/xdnd_protocol.hpp
View File

@ -18,6 +18,8 @@
#include <nana/filesystem/filesystem.hpp>
#include <vector>
#include <X11/Xcursor/Xcursor.h>
#include <iostream> //debug
@ -25,6 +27,56 @@ namespace nana{
namespace detail
{
class shared_icons
{
public:
shared_icons()
{
path_ = "/usr/share/icons/";
ifs_.open(path_ + "default/index.theme");
}
std::string cursor(const std::string& name)
{
auto theme = _m_read("Icon Theme", "Inherits");
return path_ + theme + "/cursors/" + name;
}
private:
std::string _m_read(const std::string& category, const std::string& key)
{
ifs_.seekg(0, std::ios::beg);
bool found_cat = false;
while(ifs_.good())
{
std::string text;
std::getline(ifs_, text);
if(0 == text.find('['))
{
if(found_cat)
break;
if(text.find(category + "]") != text.npos)
{
found_cat = true;
}
}
else if(found_cat && (text.find(key + "=") == 0))
{
return text.substr(key.size() + 1);
}
}
return {};
}
private:
std::string path_;
std::ifstream ifs_;
};
struct xdnd_data
{
std::vector<std::filesystem::path> files;
@ -36,7 +88,8 @@ namespace nana{
enum class xdnd_status_state
{
normal,
position_sent,
position,
drop, //Use the 'accept' flag of XdndStatus when mouse has released(XdndDrop has been sent).
status_ignore
};
@ -44,9 +97,21 @@ namespace nana{
spec_(nana::detail::platform_spec::instance()),
source_(source)
{
auto disp = spec_.open_display();
detail::platform_scope_guard lock;
::XSetSelectionOwner(spec_.open_display(), spec_.atombase().xdnd_selection, source, CurrentTime);
::XSetSelectionOwner(disp, spec_.atombase().xdnd_selection, source, CurrentTime);
std::cout<<"XSetSelectionOwner "<<source<<std::endl;
shared_icons icons;
cursor_.dnd_move = ::XcursorFilenameLoadCursor(disp, icons.cursor("dnd-move").c_str());
cursor_.dnd_none = ::XcursorFilenameLoadCursor(disp, icons.cursor("dnd-none").c_str());
}
~xdnd_protocol()
{
auto disp = spec_.open_display();
::XFreeCursor(disp, cursor_.dnd_move);
::XFreeCursor(disp, cursor_.dnd_none);
}
void mouse_move(Window wd, const nana::point& pos)
@ -81,13 +146,13 @@ namespace nana{
{
std::cout<<"Event: XdndStatus"<<std::endl;
if(xdnd_status_state::position_sent != xstate_)
if(xdnd_status_state::position != xstate_ && xdnd_status_state::drop != xstate_)
return false;
Window target_wd = static_cast<Window>(xclient.data.l[0]);
bool is_accepted_by_target = (xclient.data.l[1] & 1);
std::cout<<"XdndStatus: Accepted="<<is_accepted_by_target<<std::endl;
std::cout<<"XdndStatus: Accepted="<<is_accepted_by_target<<", target="<<is_accepted_by_target<<std::endl;
if(xclient.data.l[1] & 0x2)
{
@ -106,13 +171,17 @@ namespace nana{
}
std::cout<<std::endl;
xstate_ = xdnd_status_state::normal;
_m_cursor(is_accepted_by_target);
if(!is_accepted_by_target)
if((!is_accepted_by_target) && (xdnd_status_state::drop == xstate_))
{
_m_xdnd_leave();
return true;
}
xstate_ = xdnd_status_state::normal;
}
else if(atombase.xdnd_finished == xclient.message_type)
return true;
@ -211,7 +280,7 @@ namespace nana{
std::cout<<"Send: XdndPosition"<<std::endl;
xstate_ = xdnd_status_state::position_sent;
xstate_ = xdnd_status_state::position;
//Send XdndPosition
long position = (pos.x << 16 | pos.y);
_m_client_msg(spec_.atombase().xdnd_position, 0, position, CurrentTime, spec_.atombase().xdnd_action_copy);
@ -219,6 +288,8 @@ namespace nana{
void _m_xdnd_leave()
{
::XUndefineCursor(spec_.open_display(), source_);
if(target_)
{
std::cout<<"Send: XdndLeave"<<std::endl;
@ -229,6 +300,8 @@ namespace nana{
void _m_xdnd_drop()
{
::XUndefineCursor(spec_.open_display(), source_);
xstate_ = xdnd_status_state::drop;
std::cout<<"Send: XdndDrop"<<std::endl;
_m_client_msg(spec_.atombase().xdnd_drop, 0, CurrentTime, 0);
target_ = 0;
@ -278,6 +351,11 @@ namespace nana{
return version;
}
void _m_cursor(bool accepted)
{
::XDefineCursor(spec_.open_display(), source_, (accepted ? cursor_.dnd_move : cursor_.dnd_none));
}
#if 0 //deprecated
//Check if window has a property
static bool _m_has_property(Window wd, Atom atom, unsigned char** data)
@ -307,6 +385,12 @@ namespace nana{
Window target_{ 0 };
xdnd_status_state xstate_{xdnd_status_state::normal};
std::map<Window, nana::rectangle> mvout_table_;
struct cursor_rep
{
Cursor dnd_move{ 0 };
Cursor dnd_none{ 0 };
}cursor_;
}; //end class xdnd_protocol
}
}

51
source/gui/dragdrop.cpp
View File

@ -659,55 +659,6 @@ namespace nana
bool const simple_mode_;
std::atomic<std::size_t> ref_count_{ 1 };
};
class shared_icons
{
public:
shared_icons()
{
path_ = "/usr/share/icons/";
ifs_.open(path_ + "default/index.theme");
}
std::string cursor(const std::string& name)
{
auto theme = _m_read("Icon Theme", "Inherits");
return path_ + theme + "/cursors/" + name;
}
private:
std::string _m_read(const std::string& category, const std::string& key)
{
ifs_.seekg(0, std::ios::beg);
bool found_cat = false;
while(ifs_.good())
{
std::string text;
std::getline(ifs_, text);
if(0 == text.find('['))
{
if(found_cat)
break;
if(text.find(category + "]") != text.npos)
{
found_cat = true;
}
}
else if(found_cat && (text.find(key + "=") == 0))
{
return text.substr(key.size() + 1);
}
}
return {};
}
private:
std::string path_;
std::ifstream ifs_;
};
#endif
class dragdrop_service
@ -1022,7 +973,7 @@ namespace nana
#ifdef NANA_WINDOWS
#elif defined (NANA_X11)
shared_icons icons_;
nana::detail::shared_icons icons_;
struct hovered_status
{
Window native_wd{0};

1
source/gui/filebox.cpp
View File

@ -35,6 +35,7 @@
# include <nana/gui/place.hpp>
# include <stdexcept>
# include <algorithm>
# include "../detail/posix/shared_icons.hpp"
#endif
namespace fs = std::filesystem;

1
source/gui/widgets/scroll.cpp
View File

@ -197,6 +197,7 @@ namespace nana
clr.from_rgb(0x86, 0xD5, 0xFD); break;
case states::selected:
clr.from_rgb(0x3C, 0x7F, 0xB1); break;
default: break;
}
graph.rectangle(r, false, clr);