Merge pull request #2718 from comintern/next

Remove RawInput.

Author: retailcoder

RetailCoder.VBE/Common/RubberduckHooks.cs

@@ -3,42 +3,26 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
-using System.Runtime.InteropServices;
-using System.Windows.Forms;
 using Rubberduck.Common.Hotkeys;
 using Rubberduck.Common.WinAPI;
 using Rubberduck.Settings;
 using Rubberduck.UI.Command;
 using NLog;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+using Rubberduck.VBEditor.WindowsApi;
 
 namespace Rubberduck.Common
 {
-    public class RubberduckHooks : IRubberduckHooks
+    public class RubberduckHooks : SubclassingWindow, IRubberduckHooks
     {
-        private readonly IntPtr _mainWindowHandle;
-        private readonly IntPtr _oldWndProc;
-        // This can't be local - otherwise RawInput can't call it in the subclassing chain.
-        // ReSharper disable once PrivateFieldCanBeConvertedToLocalVariable
-        private readonly User32.WndProc _newWndProc;
-        private RawInput _rawinput;
-        private RawKeyboard _kb;
-        private RawMouse _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(IVBE vbe, IGeneralConfigService config, IEnumerable<CommandBase> commands)
+            : base((IntPtr)vbe.MainWindow.HWnd, (IntPtr)vbe.MainWindow.HWnd)
         {
-            var mainWindow = vbe.MainWindow;
-            {
-                _mainWindowHandle = (IntPtr)mainWindow.HWnd;
-            }
-
-            _newWndProc = WindowProc;
-            _oldWndProc = User32.SetWindowLong(_mainWindowHandle, (int)WindowLongFlags.GWL_WNDPROC, Marshal.GetFunctionPointerForDelegate(_newWndProc));
-
             _commands = commands;
             _config = config;
         }
@@ -56,18 +40,6 @@ public void HookHotkeys()
             var config = _config.LoadConfiguration();
             var settings = config.UserSettings.HotkeySettings;
 
-            _rawinput = new RawInput(_mainWindowHandle);
-
-            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))
             {
                 RubberduckHotkey assigned;
@@ -76,35 +48,12 @@ public void HookHotkeys()
                     var command = Command(assigned);
                     Debug.Assert(command != null);
 
-                    AddHook(new Hotkey(_mainWindowHandle, hotkey.ToString(), command));
+                    AddHook(new Hotkey(Hwnd, hotkey.ToString(), command));
                 }
             }
             Attach();
         }
 
-        private void Mouse_RawMouseInputReceived(object sender, RawMouseEventArgs e)
-        {
-            if (e.UlButtons.HasFlag(UsButtonFlags.RI_MOUSE_LEFT_BUTTON_UP) || e.UlButtons.HasFlag(UsButtonFlags.RI_MOUSE_RIGHT_BUTTON_UP))
-            {
-                OnMessageReceived(this, HookEventArgs.Empty);
-            }
-        }
-
-        // keys that change the current selection.
-        private static readonly HashSet<Keys> NavKeys = new HashSet<Keys>
-        {
-            Keys.Up, Keys.Down, Keys.Left, Keys.Right, Keys.PageDown, Keys.PageUp, Keys.Enter
-        };
-
-        private void Keyboard_RawKeyboardInputReceived(object sender, RawKeyEventArgs e)
-        {
-            // note: handling *all* keys causes annoying RTrim of current line, making editing code a PITA.
-            if (e.Message == WM.KEYUP && NavKeys.Contains((Keys)e.VKey))
-            {
-                OnMessageReceived(this, HookEventArgs.Empty);
-            }
-        }
-
         public IEnumerable<IAttachable> Hooks { get { return _hooks; } }
 
         public void AddHook(IAttachable hook)
@@ -182,60 +131,41 @@ private void hook_MessageReceived(object sender, HookEventArgs e)
             OnMessageReceived(sender, e);
         }
 
-        public void Dispose()
-        {
-            Detach();
-            User32.SetWindowLong(_mainWindowHandle, (int)WindowLongFlags.GWL_WNDPROC, _oldWndProc);
-            _mouse.RawMouseInputReceived -= Mouse_RawMouseInputReceived;
-            _kb.RawKeyInputReceived -= Keyboard_RawKeyboardInputReceived;
-        }
-
-        private IntPtr WindowProc(IntPtr hWnd, uint uMsg, IntPtr wParam, IntPtr lParam)
+        public override int SubClassProc(IntPtr hWnd, IntPtr msg, IntPtr wParam, IntPtr lParam, IntPtr uIdSubclass, IntPtr dwRefData)
         {
-            try
-            {
-                var suppress = false;
-                switch ((WM) uMsg)
-                {
-                    case WM.HOTKEY:
-                        suppress = hWnd == _mainWindowHandle && HandleHotkeyMessage(wParam);
-                        break;
-                    case WM.SETFOCUS:
+            var suppress = false;
+            switch ((WM)msg)
+            {
+                case WM.HOTKEY:
+                    suppress = hWnd == Hwnd && HandleHotkeyMessage(wParam);
+                    break;
+                case WM.SETFOCUS:
+                    Attach();
+                    break;
+                case WM.RUBBERDUCK_CHILD_FOCUS:
+                    if (lParam == IntPtr.Zero)
+                    {
+                        Detach();
+                    }
+                    else
+                    {
                         Attach();
-                        break;
-                    case WM.RUBBERDUCK_CHILD_FOCUS:
-                        if (lParam == IntPtr.Zero)
-                        {
-                            Detach();
-                        }
-                        else
-                        {
-                            Attach();
-                        }
-                        return IntPtr.Zero;
-                    case WM.NCACTIVATE:                   
-                        if (wParam == IntPtr.Zero)
-                        {
-                            Detach();
-                        }
-                        break;
-                    case WM.CLOSE:
-                    case WM.RUBBERDUCK_SINKING:
-                        suppress = true;
+                    }
+                    suppress = true;
+                    break;
+                case WM.NCACTIVATE:
+                    if (wParam == IntPtr.Zero)
+                    {
                         Detach();
-                        break;
-                }
-
-                return suppress 
-                    ? IntPtr.Zero 
-                    : User32.CallWindowProc(_oldWndProc, hWnd, uMsg, wParam, lParam);
-            }
-            catch (Exception exception)
-            {
-                Logger.Error(exception);
-            }
-
-            return IntPtr.Zero;
+                    }
+                    break;
+                case WM.CLOSE:
+                case WM.DESTROY:
+                case WM.RUBBERDUCK_SINKING:
+                    Detach();
+                    break;
+            }
+            return suppress ? 0 : base.SubClassProc(hWnd, msg, wParam, lParam, uIdSubclass, dwRefData);
         }
 
         private bool HandleHotkeyMessage(IntPtr wParam)