rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed sending file twice when drag a file from Mac server to Windows client

This commit is contained in:
jerry 2013-09-25 15:57:10 +00:00
parent 6e50945bf9
commit 952be51c8c
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lib/server/CServer.cpp
View File

@ -76,7 +76,8 @@ CServer::CServer(CConfig& config, CPrimaryClient* primaryClient, CScreen* screen
m_lockedToScreen(false), m_lockedToScreen(false),
m_screen(screen), m_screen(screen),
m_sendFileThread(NULL), m_sendFileThread(NULL),
m_writeToDropDirThread(NULL) m_writeToDropDirThread(NULL),
m_ignoreFileTransfer(false)
{ {
// must have a primary client and it must have a canonical name // must have a primary client and it must have a canonical name
assert(m_primaryClient != NULL); assert(m_primaryClient != NULL);
@ -1660,6 +1661,11 @@ CServer::onMouseUp(ButtonID id)
// relay // relay
m_active->mouseUp(id); m_active->mouseUp(id);
if (m_ignoreFileTransfer) {
m_ignoreFileTransfer = false;
return;
}
if (!m_screen->isOnScreen()) { if (!m_screen->isOnScreen()) {
CString& dir = m_screen->getDraggingFileDir(); CString& dir = m_screen->getDraggingFileDir();
if (!dir.empty()) { if (!dir.empty()) {
@ -1754,6 +1760,15 @@ CServer::onMouseMovePrimary(SInt32 x, SInt32 y)
m_screen->keyUp(kKeyEscape, 8192, 1); m_screen->keyUp(kKeyEscape, 8192, 1);
m_screen->mouseUp(kButtonLeft); m_screen->mouseUp(kButtonLeft);
#if defined(__APPLE__)
// on mac it seems that after faking a LMB up, system would signal back
// to synergy a mouse up event, which doesn't happen on windows. as a
// result, synergy would send dragging file to client twice. This variable
// is used to ignore the first file sending.
m_ignoreFileTransfer = true;
#endif
LOG((CLOG_DEBUG2 "sending drag information to client")); LOG((CLOG_DEBUG2 "sending drag information to client"));
LOG((CLOG_DEBUG3 "dragging file list: %s", fileList)); LOG((CLOG_DEBUG3 "dragging file list: %s", fileList));
LOG((CLOG_DEBUG3 "dragging file list string size: %i", size)); LOG((CLOG_DEBUG3 "dragging file list string size: %i", size));

1
src/lib/server/CServer.h
View File

@ -471,6 +471,7 @@ private:
CThread* m_sendFileThread; CThread* m_sendFileThread;
CThread* m_writeToDropDirThread; CThread* m_writeToDropDirThread;
CString m_dragFileExt; CString m_dragFileExt;
bool m_ignoreFileTransfer;
}; };
#endif #endif