openclaw/deskflow
1
0
Fork 0
Code Issues Pull Requests Actions 18 Packages Projects Releases Wiki Activity

SYNERGY-988 - Normalize scrolling direction (#7044)

Browse Source 
* SYNERGY-988 - Normalize scrolling direction on Mac

* SYNERGY-988 - Scroll direction check on Windows

* SYNERGY-988 - Add check for registry key presence

* SYNERGY-988 - Normalize scrolling directino on Linux

* SYNERGY-988 - Detach scroll direction check on Windows

* SYNERGY-988 - Update changelog

* SYNERGY-988 - Resolve code smells

* SYNERGY-988 - Normalize scroll direction for Linux servers

* SYNERGY-988 - Removed unnecessary INFO level logs

Co-authored-by: SerhiiGadzhilov <71632867+SerhiiGadzhilov@users.noreply.github.com>
This commit is contained in:
Igor Sikachyna
2021-06-30 15:25:11 +03:00
committed by GitHub
parent 16d9a3dce0
commit 89363240eb
12 changed files with 185 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/lib/platform/MSWindowsScreen.cpp
View File

@ -46,6 +46,7 @@
#include <Shlobj.h>
#include <comutil.h>
#include <algorithm>
#include <thread>
// suppress warning about GetVersionEx, which is used indirectly in this compilation unit.
#pragma warning(disable: 4996)
@ -344,6 +345,11 @@ MSWindowsScreen::leave()
// tell desk that we're leaving and tell it the keyboard layout
m_desks->leave(m_keyLayout);
// Forcefully update scrolling direction
// Will keep server updated when moving cursor
allowScrollDirectionUpdate();
updateScrollDirection();
if (m_isPrimary) {
// warp to center
@ -829,6 +835,8 @@ MSWindowsScreen::fakeMouseRelativeMove(SInt32 dx, SInt32 dy) const
void
MSWindowsScreen::fakeMouseWheel(SInt32 xDelta, SInt32 yDelta) const
{
xDelta = mapScrollFromSynergy(xDelta);
yDelta = mapScrollFromSynergy(yDelta);
m_desks->fakeMouseWheel(xDelta, yDelta);
}
@ -1473,6 +1481,8 @@ MSWindowsScreen::onMouseWheel(SInt32 xDelta, SInt32 yDelta)
// ignore message if posted prior to last mark change
if (!ignore()) {
LOG((CLOG_DEBUG1 "event: button wheel delta=%+d,%+d", xDelta, yDelta));
xDelta = mapScrollToSynergy(xDelta);
yDelta = mapScrollToSynergy(yDelta);
sendEvent(m_events->forIPrimaryScreen().wheel(), WheelInfo::alloc(xDelta, yDelta));
}
return true;
@ -2022,3 +2032,56 @@ MSWindowsScreen::isModifierRepeat(KeyModifierMask oldState, KeyModifierMask stat
return result;
}
SInt32
MSWindowsScreen::mapScrollToSynergy(SInt32 delta) const
{
// for mouse wheel the delta will be a multiple of WHEEL_DELTA
if (delta % WHEEL_DELTA == 0)
{
return delta * m_scrollDirectionMouse;
}
else
{
return delta * m_scrollDirectionTouchpad;
}
}
SInt32
MSWindowsScreen::mapScrollFromSynergy(SInt32 delta) const
{
// use mouse scrolling direction to invert
if (m_scrollDirectionMouse < 0)
return -delta;
return delta;
}
void
MSWindowsScreen::updateScrollDirection()
{
static const TCHAR* const touchpadScrollDirectionNames[] = {
_T("SOFTWARE"),
_T("Microsoft"),
_T("Windows"),
_T("CurrentVersion"),
_T("PrecisionTouchPad"),
NULL
};
if (m_shouldUpdateScrollDirection)
{
m_shouldUpdateScrollDirection = false;
std::thread scrollDirectionUpdateThread([&] {
HKEY key = ArchMiscWindows::openKey(HKEY_CURRENT_USER, touchpadScrollDirectionNames);
if (key)
{
DWORD scroll = ArchMiscWindows::readValueInt(key, _T("ScrollDirection"));
ArchMiscWindows::closeKey(key);
if (scroll == 0) m_scrollDirectionTouchpad = 1;
else m_scrollDirectionTouchpad = -1;
}
});
scrollDirectionUpdateThread.detach();
}
}