3pp-mirror/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2025-06-17 02:01:41 +02:00
Code Issues Projects Releases Packages Wiki Activity

Feature to drag a file from Windows to Mac:

Browse source 
- On Mac client main thread is used for cocoa application in order to simulate drag.
- Send dragging file dir from Windows server to Mac client while dragging after switching screen.
- Dragging information sending is immature now (need to support multi files dragging in the future).
- Used Cocoa function to monitor dragg pasteboard.
- Changed Mac client to use another thread for event queue instead of the main thread.
- Change fileRecieveComplete to fileRecieveCompleted.
This commit is contained in:
jerry 2013-08-30 14:38:43 +00:00
parent 031a84ca84
commit ce1b62db14
52 changed files with 875 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/lib/server/CServer.cpp
View file

@ -37,6 +37,7 @@
#include "CThread.h"
#include "TMethodJob.h"
#include "CFileChunker.h"
#include "CDragInformation.h"
#include <cstring>
#include <cstdlib>
#include <sstream>
@ -167,10 +168,10 @@ CServer::CServer(CConfig& config, CPrimaryClient* primaryClient, CScreen* screen
this,
new TMethodEventJob<CServer>(this,
&CServer::handleFileChunkSendingEvent));
m_events->adoptHandler(m_events->forIScreen().fileRecieveComplete(),
m_events->adoptHandler(m_events->forIScreen().fileRecieveCompleted(),
this,
new TMethodEventJob<CServer>(this,
&CServer::handleFileRecieveCompleteEvent));
&CServer::handleFileRecieveCompletedEvent));
// add connection
addClient(m_primaryClient);
@ -1472,9 +1473,9 @@ CServer::handleFileChunkSendingEvent(const CEvent& event, void*)
}
void
CServer::handleFileRecieveCompleteEvent(const CEvent& event, void*)
CServer::handleFileRecieveCompletedEvent(const CEvent& event, void*)
{
onFileRecieveComplete();
onFileRecieveCompleted();
}
void
@ -1737,8 +1738,24 @@ CServer::onMouseMovePrimary(SInt32 x, SInt32 y)
// should we switch or not?
if (isSwitchOkay(newScreen, dir, x, y, xc, yc)) {
if (m_screen->getDraggingStarted() && m_active != newScreen) {
CString& dragFileList = m_screen->getDraggingFileDir();
size_t size = dragFileList.size() + 1;
char* fileList = new char[size];
memcpy(fileList, dragFileList.c_str(), size);
fileList[size - 1] = '\0';
UInt32 fileCount = 1;
LOG((CLOG_DEBUG2 "sending drag information to client"));
LOG((CLOG_DEBUG3 "dragging file list: %s", fileList));
LOG((CLOG_DEBUG3 "dragging file list string size: %i", size));
newScreen->draggingInfoSending(fileCount, fileList, size);
m_screen->setDraggingStarted(false);
}
// switch screen
switchScreen(newScreen, x, y, false);
return true;
}
else {
@ -1930,7 +1947,7 @@ CServer::onFileChunkSending(const void* data)
}
void
CServer::onFileRecieveComplete()
CServer::onFileRecieveCompleted()
{
if (isReceivedFileSizeValid()) {
if (!m_fileTransferDes.empty()) {