smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP printscreen fixes for Windows

Browse source 
# Conflicts:
#	src/lib/platform/MSWindowsDesks.cpp
#	src/lib/platform/MSWindowsDesks.h
This commit is contained in:
Jamie Newbon 2020-01-11 01:07:39 +00:00
parent 642c1ce46e
commit 9015f6a328
3 changed files with 108 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
src/lib/platform/MSWindowsDesks.cpp
View file

@ -88,6 +88,34 @@
// enable; <unused> // enable; <unused>
#define SYNERGY_MSG_FAKE_INPUT SYNERGY_HOOK_LAST_MSG + 12 #define SYNERGY_MSG_FAKE_INPUT SYNERGY_HOOK_LAST_MSG + 12
static void
send_keyboard_input(WORD wVk, WORD wScan, DWORD dwFlags)
{
INPUT inp;
inp.type = INPUT_KEYBOARD;
inp.ki.wVk = (dwFlags & KEYEVENTF_UNICODE) ? 0 : wVk; // 1..254 inclusive otherwise
inp.ki.wScan = wScan;
inp.ki.dwFlags = dwFlags & 0xF;
inp.ki.time = 0;
inp.ki.dwExtraInfo = 0;
SendInput(1, &inp, sizeof(inp));
}
static void
send_mouse_input(DWORD dwFlags, DWORD dx, DWORD dy, DWORD dwData)
{
INPUT inp;
inp.type = INPUT_MOUSE;
inp.mi.dwFlags = dwFlags;
inp.mi.dx = dx;
inp.mi.dy = dy;
inp.mi.mouseData = dwData;
inp.mi.time = 0;
inp.mi.dwExtraInfo = 0;
SendInput(1, &inp, sizeof(inp));
}
// //
// MSWindowsDesks // MSWindowsDesks
// //
@ -245,10 +273,9 @@ MSWindowsDesks::getCursorPos(SInt32& x, SInt32& y) const
} }
void void
MSWindowsDesks::fakeKeyEvent( MSWindowsDesks::fakeKeyEvent(WORD virtualKey, WORD scanCode, DWORD flags, bool /*isAutoRepeat*/) const
KeyButton button, UINT virtualKey,
bool press, bool /*isAutoRepeat*/) const
{ {
#if 0
// synthesize event // synthesize event
DWORD flags = 0; DWORD flags = 0;
if (((button & 0x100u) != 0)) { if (((button & 0x100u) != 0)) {
@ -257,9 +284,8 @@ MSWindowsDesks::fakeKeyEvent(
if (!press) { if (!press) {
flags |= KEYEVENTF_KEYUP; flags |= KEYEVENTF_KEYUP;
} }
sendMessage(SYNERGY_MSG_FAKE_KEY, flags, #endif
MAKEWORD(static_cast<BYTE>(button & 0xffu), sendMessage(SYNERGY_MSG_FAKE_KEY, flags, MAKELPARAM(scanCode, virtualKey));
static_cast<BYTE>(virtualKey & 0xffu)));
} }
void void
@ -468,10 +494,10 @@ MSWindowsDesks::deskMouseMove(SInt32 x, SInt32 y) const
// the primary screen. // the primary screen.
SInt32 w = GetSystemMetrics(SM_CXSCREEN); SInt32 w = GetSystemMetrics(SM_CXSCREEN);
SInt32 h = GetSystemMetrics(SM_CYSCREEN); SInt32 h = GetSystemMetrics(SM_CYSCREEN);
mouse_event(MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE, send_mouse_input(MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE,
(DWORD)((65535.0f * x) / (w - 1) + 0.5f), (DWORD)((65535.0f * x) / (w - 1) + 0.5f),
(DWORD)((65535.0f * y) / (h - 1) + 0.5f), (DWORD)((65535.0f * y) / (h - 1) + 0.5f),
0, 0); 0);
} }
void void
@ -501,7 +527,7 @@ MSWindowsDesks::deskMouseRelativeMove(SInt32 dx, SInt32 dy) const
} }
// move relative to mouse position // move relative to mouse position
mouse_event(MOUSEEVENTF_MOVE, dx, dy, 0, 0); send_mouse_input(MOUSEEVENTF_MOVE, dx, dy, 0);
// restore mouse speed & acceleration // restore mouse speed & acceleration
if (accelChanged) { if (accelChanged) {
@ -699,12 +725,16 @@ MSWindowsDesks::deskThread(void* vdesk)
break; break;
case SYNERGY_MSG_FAKE_KEY: case SYNERGY_MSG_FAKE_KEY:
keybd_event(HIBYTE(msg.lParam), LOBYTE(msg.lParam), (DWORD)msg.wParam, 0); // Note, this is intended to be HI/LOWORD and not HI/LOBYTE
send_keyboard_input(
HIWORD(msg.lParam),
LOWORD(msg.lParam),
(DWORD)msg.wParam);
break; break;
case SYNERGY_MSG_FAKE_BUTTON: case SYNERGY_MSG_FAKE_BUTTON:
if (msg.wParam != 0) { if (msg.wParam != 0) {
mouse_event((DWORD)msg.wParam, 0, 0, (DWORD)msg.lParam, 0); send_mouse_input((DWORD)msg.wParam, 0, 0, (DWORD)msg.lParam);
} }
break; break;
@ -721,7 +751,7 @@ MSWindowsDesks::deskThread(void* vdesk)
case SYNERGY_MSG_FAKE_WHEEL: case SYNERGY_MSG_FAKE_WHEEL:
// XXX -- add support for x-axis scrolling // XXX -- add support for x-axis scrolling
if (msg.lParam != 0) { if (msg.lParam != 0) {
mouse_event(MOUSEEVENTF_WHEEL, 0, 0, (DWORD)msg.lParam, 0); send_mouse_input(MOUSEEVENTF_WHEEL, 0, 0, (DWORD)msg.lParam);
} }
break; break;
@ -750,9 +780,10 @@ MSWindowsDesks::deskThread(void* vdesk)
break; break;
case SYNERGY_MSG_FAKE_INPUT: case SYNERGY_MSG_FAKE_INPUT:
keybd_event(SYNERGY_HOOK_FAKE_INPUT_VIRTUAL_KEY, send_keyboard_input(
SYNERGY_HOOK_FAKE_INPUT_SCANCODE, SYNERGY_HOOK_FAKE_INPUT_VIRTUAL_KEY,
msg.wParam ? 0 : KEYEVENTF_KEYUP, 0); SYNERGY_HOOK_FAKE_INPUT_SCANCODE,
msg.wParam ? 0 : KEYEVENTF_KEYUP);
break; break;
} }

4
src/lib/platform/MSWindowsDesks.h
View file

@ -162,8 +162,8 @@ public:
/*! /*!
Synthesize a press or release of key \c button. Synthesize a press or release of key \c button.
*/ */
void fakeKeyEvent(KeyButton button, UINT virtualKey, void fakeKeyEvent(WORD virtualKey, WORD scanCode,
bool press, bool isAutoRepeat) const; DWORD flags, bool isAutoRepeat) const;
//! Fake mouse press/release //! Fake mouse press/release
/*! /*!

43
src/lib/platform/MSWindowsKeyState.cpp
View file

@ -1075,6 +1075,13 @@ MSWindowsKeyState::getKeyMap(synergy::KeyMap& keyMap)
} }
} }
// add the extended printscreen (alt+printscreen)
// or maybe it's the non-extended printscreen?
// scancodes and keyboard inputs are complicated
if (m_buttonToVK[0x54u] == 0) {
m_buttonToVK[0x54u] = VK_SNAPSHOT;
}
// set virtual key to button table // set virtual key to button table
if (activeLayout == m_groups[g]) { if (activeLayout == m_groups[g]) {
for (KeyButton i = 0; i < 512; ++i) { for (KeyButton i = 0; i < 512; ++i) {
@ -1209,7 +1216,7 @@ MSWindowsKeyState::getKeyMap(synergy::KeyMap& keyMap)
item.m_required |= KeyModifierControl; item.m_required |= KeyModifierControl;
item.m_sensitive |= KeyModifierControl; item.m_sensitive |= KeyModifierControl;
break; break;
#if 0
case VK_SNAPSHOT: case VK_SNAPSHOT:
item.m_sensitive |= KeyModifierAlt; item.m_sensitive |= KeyModifierAlt;
if ((i & 0x100u) == 0) { if ((i & 0x100u) == 0) {
@ -1218,6 +1225,7 @@ MSWindowsKeyState::getKeyMap(synergy::KeyMap& keyMap)
} }
break; break;
} }
#endif
addKeyEntry(keyMap, item); addKeyEntry(keyMap, item);
} }
} }
@ -1234,7 +1242,7 @@ MSWindowsKeyState::fakeKey(const Keystroke& keystroke)
switch (keystroke.m_type) { switch (keystroke.m_type) {
case Keystroke::kButton: { case Keystroke::kButton: {
LOG((CLOG_DEBUG1 " %03x (%08x) %s", keystroke.m_data.m_button.m_button, keystroke.m_data.m_button.m_client, keystroke.m_data.m_button.m_press ? "down" : "up")); LOG((CLOG_DEBUG1 " %03x (%08x) %s", keystroke.m_data.m_button.m_button, keystroke.m_data.m_button.m_client, keystroke.m_data.m_button.m_press ? "down" : "up"));
KeyButton button = keystroke.m_data.m_button.m_button; KeyButton scanCode = keystroke.m_data.m_button.m_button;
// windows doesn't send key ups for key repeats // windows doesn't send key ups for key repeats
if (keystroke.m_data.m_button.m_repeat && if (keystroke.m_data.m_button.m_repeat &&
@ -1244,24 +1252,27 @@ MSWindowsKeyState::fakeKey(const Keystroke& keystroke)
} }
// get the virtual key for the button // get the virtual key for the button
UINT vk = keystroke.m_data.m_button.m_client; WORD vk = (WORD)keystroke.m_data.m_button.m_client;
DWORD flags = 0;
if (keystroke.m_data.m_button.m_press = false)
flags |= KEYEVENTF_KEYUP;
// special handling of VK_SNAPSHOT // special handling of VK_SNAPSHOT
if (vk == VK_SNAPSHOT) { if (vk == VK_SNAPSHOT)
if ((getActiveModifiers() & KeyModifierAlt) != 0) { scanCode = (getActiveModifiers() & KeyModifierAlt) ? 0x54 : 0x137;
// snapshot active window
button = 1; if (scanCode & 0x100)
} flags |= KEYEVENTF_EXTENDEDKEY;
else {
// snapshot full screen //vk,sc,flags,keystroke.m_data.m_button.m_repeat
button = 0;
} m_desks->fakeKeyEvent(vk, scanCode, flags, keystroke.m_data.m_button.m_repeat);
}
// synthesize event // synthesize event
m_desks->fakeKeyEvent(button, vk, //m_desks->fakeKeyEvent(button, vk,
keystroke.m_data.m_button.m_press, // keystroke.m_data.m_button.m_press,
keystroke.m_data.m_button.m_repeat); // keystroke.m_data.m_button.m_repeat);
break; break;
} }