Merge pull request #2060 from Hosch250/hotkeys

Hotkeys

Author: Hosch250

RetailCoder.VBE/Common/RubberduckHooks.cs

@@ -16,22 +16,25 @@ namespace Rubberduck.Common
 {
     public class RubberduckHooks : IRubberduckHooks
     {
-        private readonly VBE _vbe;
         private readonly IntPtr _mainWindowHandle;
+        private readonly IntPtr _oldWndPointer;
         private readonly User32.WndProc _oldWndProc;
+        private User32.WndProc _newWndProc;
         private RawInput _rawinput;
+        private IRawDevice _kb;
+        private IRawDevice _mouse;
         private readonly IGeneralConfigService _config;
         private readonly IEnumerable<CommandBase> _commands;
         private readonly IList<IAttachable> _hooks = new List<IAttachable>();
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
         public RubberduckHooks(VBE vbe, IGeneralConfigService config, IEnumerable<CommandBase> commands)
         {
-            _vbe = vbe;
             _mainWindowHandle = (IntPtr)vbe.MainWindow.HWnd;
             _oldWndProc = WindowProc;
-            var oldWndPointer = User32.SetWindowLong(_mainWindowHandle, (int)WindowLongFlags.GWL_WNDPROC, WindowProc);
-            _oldWndProc = (User32.WndProc)Marshal.GetDelegateForFunctionPointer(oldWndPointer, typeof(User32.WndProc));
+            _newWndProc = WindowProc;
+            _oldWndPointer = User32.SetWindowLong(_mainWindowHandle, (int)WindowLongFlags.GWL_WNDPROC, _newWndProc);
+            _oldWndProc = (User32.WndProc)Marshal.GetDelegateForFunctionPointer(_oldWndPointer, typeof(User32.WndProc));
 
             _commands = commands;
             _config = config;
@@ -55,10 +58,12 @@ public void HookHotkeys()
             var kb = (RawKeyboard)_rawinput.CreateKeyboard();
             _rawinput.AddDevice(kb);
             kb.RawKeyInputReceived += Keyboard_RawKeyboardInputReceived;
+            _kb = kb;
 
             var mouse = (RawMouse)_rawinput.CreateMouse();
             _rawinput.AddDevice(mouse);
             mouse.RawMouseInputReceived += Mouse_RawMouseInputReceived;
+            _mouse = mouse;
 
             foreach (var hotkey in settings.Settings.Where(hotkey => hotkey.IsEnabled))
             {