diff --git a/plugins/mousepad/windowsremoteinput.cpp b/plugins/mousepad/windowsremoteinput.cpp --- a/plugins/mousepad/windowsremoteinput.cpp +++ b/plugins/mousepad/windowsremoteinput.cpp @@ -21,9 +21,51 @@ #include "windowsremoteinput.h" #include +#include #include +//Translation table to keep in sync within all the implementations +int SpecialKeysMap[] = { + 0, // Invalid + VK_BACK, // 1 + VK_TAB, // 2 + VK_RETURN, // 3 + VK_LEFT, // 4 + VK_UP, // 5 + VK_RIGHT, // 6 + VK_DOWN, // 7 + VK_PRIOR, // 8 + VK_NEXT, // 9 + VK_HOME, // 10 + VK_END, // 11 + VK_RETURN, // 12 + VK_DELETE, // 13 + VK_ESCAPE, // 14 + VK_SNAPSHOT, // 15 + VK_SCROLL, // 16 + 0, // 17 + 0, // 18 + 0, // 19 + 0, // 20 + VK_F1, // 21 + VK_F2, // 22 + VK_F3, // 23 + VK_F4, // 24 + VK_F5, // 25 + VK_F6, // 26 + VK_F7, // 27 + VK_F8, // 28 + VK_F9, // 29 + VK_F10, // 30 + VK_F11, // 31 + VK_F12, // 32 +}; + +template +size_t arraySize(T(&arr)[N]) { (void)arr; return N; } + + WindowsRemoteInput::WindowsRemoteInput(QObject* parent) : AbstractRemoteInput(parent) { @@ -84,52 +126,117 @@ input.mi.dwFlags = MOUSEEVENTF_WHEEL; input.mi.mouseData = dy; ::SendInput(1,&input,sizeof(INPUT)); -//TODO: Keyboard input support -/* - } else if (!key.isEmpty() || specialKey) { + + } else if (!key.isEmpty() || specialKey) { + input.type = INPUT_KEYBOARD; + + input.ki.time = 0; + input.ki.dwExtraInfo = 0; + input.ki.wScan = 0; + input.ki.dwFlags = 0; bool ctrl = np.get(QStringLiteral("ctrl"), false); bool alt = np.get(QStringLiteral("alt"), false); bool shift = np.get(QStringLiteral("shift"), false); - if (ctrl) XTestFakeKeyEvent (display, XKeysymToKeycode(display, XK_Control_L), True, 0); - if (alt) XTestFakeKeyEvent (display, XKeysymToKeycode(display, XK_Alt_L), True, 0); - if (shift) XTestFakeKeyEvent (display, XKeysymToKeycode(display, XK_Shift_L), True, 0); + if (ctrl) { + input.ki.wVk = VK_LCONTROL; + ::SendInput(1,&input,sizeof(INPUT)); + } + if (alt) { + input.ki.wVk = VK_LMENU; + ::SendInput(1,&input,sizeof(INPUT)); + } + if (shift) { + input.ki.wVk = VK_LSHIFT; + ::SendInput(1,&input,sizeof(INPUT)); + } if (specialKey) { if (specialKey >= (int)arraySize(SpecialKeysMap)) { qWarning() << "Unsupported special key identifier"; return false; } - int keycode = XKeysymToKeycode(display, SpecialKeysMap[specialKey]); + input.ki.wVk = SpecialKeysMap[specialKey]; + ::SendInput(1,&input,sizeof(INPUT)); - XTestFakeKeyEvent (display, keycode, True, 0); - XTestFakeKeyEvent (display, keycode, False, 0); + input.ki.dwFlags = KEYEVENTF_KEYUP; + ::SendInput(1,&input,sizeof(INPUT)); } else { - if (!m_fakekey) { - m_fakekey = fakekey_init(display); - if (!m_fakekey) { - qWarning() << "Failed to initialize libfakekey"; - return false; + for (int i=0;i