diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt index 1fd736da2..4d751135d 100644 --- a/src/lib/platform/CMakeLists.txt +++ b/src/lib/platform/CMakeLists.txt @@ -13,7 +13,6 @@ endif() if(WIN32) set(PLATFORM_SOURCES - Win32Hook.h IMSWindowsClipboardFacade.h MSWindowsClipboard.cpp MSWindowsClipboard.h diff --git a/src/lib/platform/MSWindowsDesks.cpp b/src/lib/platform/MSWindowsDesks.cpp index f509028c1..0ba6b690a 100644 --- a/src/lib/platform/MSWindowsDesks.cpp +++ b/src/lib/platform/MSWindowsDesks.cpp @@ -18,8 +18,8 @@ #include "deskflow/win32/AppUtilWindows.h" #include "mt/Lock.h" #include "mt/Thread.h" +#include "platform/MSWindowsHook.h" #include "platform/MSWindowsScreen.h" -#include "platform/Win32Hook.h" #include diff --git a/src/lib/platform/MSWindowsDesks.h b/src/lib/platform/MSWindowsDesks.h index be30c069f..2964eff3a 100644 --- a/src/lib/platform/MSWindowsDesks.h +++ b/src/lib/platform/MSWindowsDesks.h @@ -13,7 +13,6 @@ #include "deskflow/OptionTypes.h" #include "mt/CondVar.h" #include "mt/Mutex.h" -#include "platform/Win32Hook.h" #include diff --git a/src/lib/platform/MSWindowsHook.h b/src/lib/platform/MSWindowsHook.h index 967176827..be75644af 100644 --- a/src/lib/platform/MSWindowsHook.h +++ b/src/lib/platform/MSWindowsHook.h @@ -7,11 +7,41 @@ #pragma once -#include "platform/Win32Hook.h" +#include #define WIN32_LEAN_AND_MEAN #include +#define DESKFLOW_MSG_MARK WM_APP + 0x0011 // mark id; +#define DESKFLOW_MSG_KEY WM_APP + 0x0012 // vk code; key data +#define DESKFLOW_MSG_MOUSE_BUTTON WM_APP + 0x0013 // button msg; +#define DESKFLOW_MSG_MOUSE_WHEEL WM_APP + 0x0014 // delta; +#define DESKFLOW_MSG_MOUSE_MOVE WM_APP + 0x0015 // x; y +#define DESKFLOW_MSG_POST_WARP WM_APP + 0x0016 // ; +#define DESKFLOW_MSG_PRE_WARP WM_APP + 0x0017 // x; y +#define DESKFLOW_MSG_SCREEN_SAVER WM_APP + 0x0018 // activated; +#define DESKFLOW_MSG_DEBUG WM_APP + 0x0019 // data, data +#define DESKFLOW_MSG_INPUT_FIRST DESKFLOW_MSG_KEY +#define DESKFLOW_MSG_INPUT_LAST DESKFLOW_MSG_PRE_WARP +#define DESKFLOW_HOOK_LAST_MSG DESKFLOW_MSG_DEBUG + +#define DESKFLOW_HOOK_FAKE_INPUT_VIRTUAL_KEY VK_CANCEL +#define DESKFLOW_HOOK_FAKE_INPUT_SCANCODE 0 + +enum EHookResult +{ + kHOOK_FAILED, + kHOOK_OKAY, + kHOOK_OKAY_LL +}; + +enum EHookMode +{ + kHOOK_DISABLE, + kHOOK_WATCH_JUMP_ZONE, + kHOOK_RELAY_EVENTS +}; + //! Loads and provides functions for the Windows hook class MSWindowsHook { diff --git a/src/lib/platform/MSWindowsScreen.h b/src/lib/platform/MSWindowsScreen.h index e016e3326..0180c7fee 100644 --- a/src/lib/platform/MSWindowsScreen.h +++ b/src/lib/platform/MSWindowsScreen.h @@ -14,7 +14,6 @@ #include "mt/Mutex.h" #include "platform/MSWindowsHook.h" #include "platform/MSWindowsPowerManager.h" -#include "platform/Win32Hook.h" #include diff --git a/src/lib/platform/Win32Hook.h b/src/lib/platform/Win32Hook.h deleted file mode 100644 index 657066ec5..000000000 --- a/src/lib/platform/Win32Hook.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Deskflow -- mouse and keyboard sharing utility - * SPDX-FileCopyrightText: (C) 2012 - 2016 Symless Ltd. - * SPDX-FileCopyrightText: (C) 2002 Chris Schoeneman - * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception - */ - -#pragma once - -#include "base/EventTypes.h" - -#define WIN32_LEAN_AND_MEAN -#include - -#if defined(dfwhook_EXPORTS) -#define CDESKFLOWHOOK_API __declspec(dllexport) -#else -#define CDESKFLOWHOOK_API __declspec(dllimport) -#endif - -#define DESKFLOW_MSG_MARK WM_APP + 0x0011 // mark id; -#define DESKFLOW_MSG_KEY WM_APP + 0x0012 // vk code; key data -#define DESKFLOW_MSG_MOUSE_BUTTON WM_APP + 0x0013 // button msg; -#define DESKFLOW_MSG_MOUSE_WHEEL WM_APP + 0x0014 // delta; -#define DESKFLOW_MSG_MOUSE_MOVE WM_APP + 0x0015 // x; y -#define DESKFLOW_MSG_POST_WARP WM_APP + 0x0016 // ; -#define DESKFLOW_MSG_PRE_WARP WM_APP + 0x0017 // x; y -#define DESKFLOW_MSG_SCREEN_SAVER WM_APP + 0x0018 // activated; -#define DESKFLOW_MSG_DEBUG WM_APP + 0x0019 // data, data -#define DESKFLOW_MSG_INPUT_FIRST DESKFLOW_MSG_KEY -#define DESKFLOW_MSG_INPUT_LAST DESKFLOW_MSG_PRE_WARP -#define DESKFLOW_HOOK_LAST_MSG DESKFLOW_MSG_DEBUG - -#define DESKFLOW_HOOK_FAKE_INPUT_VIRTUAL_KEY VK_CANCEL -#define DESKFLOW_HOOK_FAKE_INPUT_SCANCODE 0 - -extern "C" -{ - - enum EHookResult - { - kHOOK_FAILED, - kHOOK_OKAY, - kHOOK_OKAY_LL - }; - - enum EHookMode - { - kHOOK_DISABLE, - kHOOK_WATCH_JUMP_ZONE, - kHOOK_RELAY_EVENTS - }; -}