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

- Allow dragging one file from Windows (server) to Mac (client), --filetransfer-des needs to be specified in client side's command line.

Browse source
This commit is contained in:
jerry 2013-08-23 15:36:23 +00:00
parent 012fe6ddd8
commit 031a84ca84
17 changed files with 95 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/lib/platform/CMSWindowsScreen.cpp
View file

@ -114,7 +114,6 @@ CMSWindowsScreen::CMSWindowsScreen(
m_keyState(NULL),
m_hasMouse(GetSystemMetrics(SM_MOUSEPRESENT) != 0),
m_showingMouse(false),
m_startDragging(false),
m_events(events)
{
assert(s_windowInstance != NULL);
@ -664,7 +663,7 @@ CMSWindowsScreen::getJumpZoneSize() const
}
bool
CMSWindowsScreen::isAnyMouseButtonDown() const
CMSWindowsScreen::isAnyMouseButtonDown(UInt32& buttonID) const
{
static const char* buttonToName[] = {
"<invalid>",
@ -677,6 +676,7 @@ CMSWindowsScreen::isAnyMouseButtonDown() const
for (UInt32 i = 1; i < sizeof(m_buttons) / sizeof(m_buttons[0]); ++i) {
if (m_buttons[i]) {
buttonID = i;
LOG((CLOG_DEBUG "locked by \"%s\"", buttonToName[i]));
return true;
}
@ -1273,11 +1273,15 @@ CMSWindowsScreen::onMouseButton(WPARAM wParam, LPARAM lParam)
if (button >= kButtonLeft && button <= kButtonExtra0 + 1) {
if (pressed) {
m_buttons[button] = true;
if (button == kButtonLeft) {
m_draggingFileDir.clear();
LOG((CLOG_DEBUG "dragging file directory is cleared"));
}
}
else {
m_buttons[button] = false;
if (m_startDragging && button == kButtonLeft) {
m_startDragging = false;
if (m_draggingStarted && button == kButtonLeft) {
m_draggingStarted = false;
}
}
}
@ -1340,13 +1344,14 @@ CMSWindowsScreen::onMouseMove(SInt32 mx, SInt32 my)
m_events->forIPrimaryScreen().motionOnPrimary(),
CMotionInfo::alloc(m_xCursor, m_yCursor));
if (m_buttons[kButtonLeft] == true && m_startDragging == false) {
if (m_buttons[kButtonLeft] == true && m_draggingStarted == false) {
// temporarily log out dragging file directory
char dir[MAX_PATH];
m_hookLibraryLoader.m_getDraggingFileDir(dir);
LOG((CLOG_DEBUG "dragging file: %s", dir));
m_draggingFileDir.append(dir);
LOG((CLOG_DEBUG "dragging file directory: %s", m_draggingFileDir.c_str()));
m_startDragging = true;
m_draggingStarted = true;
}
}
else