Merge pull request #1305 from retailcoder/next

Adding mouse hook

Author: retailcoder

RetailCoder.VBE/App.cs

@@ -5,7 +5,6 @@
 using System.Linq;
 using System.Runtime.InteropServices.ComTypes;
 using System.Windows.Forms;
-using System.Windows.Input;
 using Microsoft.Vbe.Interop;
 using NLog;
 using Rubberduck.Common;
@@ -61,6 +60,7 @@ public App(VBE vbe, IMessageBox messageBox,
             _hooks = hooks;
             _logger = LogManager.GetCurrentClassLogger();
 
+            _hooks.MessageReceived += _hooks_MessageReceived;
             _configService.SettingsChanged += _configService_SettingsChanged;
             _configService.LanguageChanged += ConfigServiceLanguageChanged;
             _parser.State.StateChanged += Parser_StateChanged;
@@ -81,6 +81,15 @@ public App(VBE vbe, IMessageBox messageBox,
             UiDispatcher.Initialize();
         }
 
+        private void _hooks_MessageReceived(object sender, HookEventArgs e)
+        {
+            if (sender is MouseHookWrapper)
+            {
+                // right-click detected
+                _appMenus.EvaluateCanExecute(_parser.State);
+            }
+        }
+
         private void _configService_SettingsChanged(object sender, EventArgs e)
         {
             // also updates the ShortcutKey text
@@ -252,6 +261,15 @@ private void _stateBar_Refresh(object sender, EventArgs e)
 
         private void Parser_StateChanged(object sender, EventArgs e)
         {
+            if (_parser.State.Status != ParserState.Ready)
+            {
+                _hooks.Detach();
+            }
+            else
+            {
+                _hooks.Attach();
+            }
+
             Debug.WriteLine("App handles StateChanged ({0}), evaluating menu states...", _parser.State.Status);
             _appMenus.EvaluateCanExecute(_parser.State);
         }

RetailCoder.VBE/Common/MouseHookWrapper.cs

@@ -0,0 +1,44 @@
+using System;
+using EventHook;
+using EventHook.Hooks;
+
+namespace Rubberduck.Common
+{
+    public class MouseHookWrapper : IAttachable
+    {
+        public MouseHookWrapper()
+        {
+            MouseWatcher.OnMouseInput += MouseWatcher_OnMouseInput;
+        }
+
+        private void MouseWatcher_OnMouseInput(object sender, MouseEventArgs e)
+        {
+            // only handle right-clicks
+            if (e.Message != MouseMessages.WM_RBUTTONDOWN)
+            {
+                return;
+            }
+
+            var handler = MessageReceived;
+            if (handler != null)
+            {
+                handler.Invoke(this, HookEventArgs.Empty);
+            }
+        }
+
+        public bool IsAttached { get; private set; }
+        public event EventHandler<HookEventArgs> MessageReceived;
+
+        public void Attach()
+        {
+            MouseWatcher.Start();
+            IsAttached = true;
+        }
+
+        public void Detach()
+        {
+            MouseWatcher.Stop();
+            IsAttached = false;
+        }
+    }
+}

RetailCoder.VBE/Common/RubberduckHooks.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices;
 using Microsoft.Vbe.Interop;
@@ -31,16 +32,19 @@ public RubberduckHooks(VBE vbe, IAttachable timerHook, IGeneralConfigService con
             _oldWndPointer = User32.SetWindowLong(_mainWindowHandle, (int)WindowLongFlags.GWL_WNDPROC, _newWndProc);
             _oldWndProc = (User32.WndProc)Marshal.GetDelegateForFunctionPointer(_oldWndPointer, typeof(User32.WndProc));
 
-            _timerHook = timerHook;
             _config = config;
+            _timerHook = timerHook;
             _timerHook.MessageReceived += timerHook_MessageReceived;
         }
 
+
         public void HookHotkeys()
         {
             Detach();
             _hooks.Clear();
 
+            AddHook(new MouseHookWrapper());
+
             var config = _config.LoadConfiguration();
             var settings = config.UserSettings.GeneralSettings.HotkeySettings;
             foreach (var hotkey in settings.Where(hotkey => hotkey.IsEnabled))
@@ -89,12 +93,19 @@ public void Attach()
 
         private void hook_MessageReceived(object sender, HookEventArgs e)
         {
-            if (sender is ILowLevelKeyboardHook)
+            if (sender is LowLevelKeyboardHook)
             {
                 // todo: handle 2-step hotkeys?
                 return;
             }
 
+            if (sender is MouseHookWrapper)
+            {
+                Debug.WriteLine("MouseHookWrapper message received");
+                OnMessageReceived(sender, HookEventArgs.Empty);
+                return;
+            }
+
             var hotkey = sender as IHotkey;
             if (hotkey != null)
             {

RetailCoder.VBE/Refactorings/ImplementInterface/ImplementInterfaceRefactoring.cs

@@ -187,7 +187,7 @@ private List<Parameter> GetParameters(Declaration member)
                            })
                            .ToList();
 
-            if (member.DeclarationType == DeclarationType.PropertyGet)
+            if (member.DeclarationType == DeclarationType.PropertyGet && parameters.Any())
             {
                 parameters.Remove(parameters.Last());
             }

RetailCoder.VBE/Rubberduck.csproj

@@ -229,6 +229,10 @@
     <Reference Include="Castle.Core">
       <HintPath>..\packages\Castle.Core.3.2.0\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
+    <Reference Include="EventHook, Version=1.4.26.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\EventHook.1.4.26\lib\net45\EventHook.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="extensibility, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
@@ -244,6 +248,18 @@
     <Reference Include="Ninject.Extensions.NamedScope">
       <HintPath>..\packages\Ninject.Extensions.NamedScope.3.2.0.0\lib\net45-full\Ninject.Extensions.NamedScope.dll</HintPath>
     </Reference>
+    <Reference Include="Nito.AsyncEx, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Nito.AsyncEx.Concurrent, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.Concurrent.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Nito.AsyncEx.Enlightenment, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.Enlightenment.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="PresentationFramework.Aero" />
@@ -299,6 +315,7 @@
     <Compile Include="Common\ILowLevelKeyboardHook.cs" />
     <Compile Include="Common\IRubberduckHooks.cs" />
     <Compile Include="Common\ModuleExporter.cs" />
+    <Compile Include="Common\MouseHookWrapper.cs" />
     <Compile Include="Common\RubberduckHooks.cs" />
     <Compile Include="Common\TimerHook.cs" />
     <Compile Include="Common\WinAPI\KBDLLHOOKSTRUCT.cs" />

RetailCoder.VBE/UI/Command/MenuItems/CommandMenuItemBase.cs

@@ -36,7 +36,7 @@ public Func<string> Caption
         /// <remarks>Returns <c>true</c> if not overridden.</remarks>
         public virtual bool EvaluateCanExecute(RubberduckParserState state)
         {
-            return true;
+            return _command.CanExecute(state);
         }
 
         public virtual bool BeginGroup { get { return false; } }

RetailCoder.VBE/UI/Command/MenuItems/ProjectExplorerRefactorRenameCommandMenuItem.cs

@@ -1,5 +1,4 @@
 using System.Windows.Input;
-using Rubberduck.Parsing.VBA;
 using Rubberduck.UI.Command.MenuItems.ParentMenus;
 
 namespace Rubberduck.UI.Command.MenuItems
@@ -13,10 +12,5 @@ public ProjectExplorerRefactorRenameCommandMenuItem(ICommand command)
 
         public override string Key { get { return "RefactorMenu_Rename"; } }
         public override int DisplayOrder { get { return (int)RefactoringsMenuItemDisplayOrder.RenameIdentifier; } }
-
-        public override bool EvaluateCanExecute(RubberduckParserState state)
-        {
-            return state.Status == ParserState.Ready;
-        }
     }
 }

RetailCoder.VBE/UI/Command/MenuItems/RefactorEncapsulateFieldCommandMenuItem.cs

@@ -1,7 +1,5 @@
-using System.Drawing;
 using System.Windows.Input;
 using Rubberduck.Parsing.VBA;
-using Rubberduck.Properties;
 using Rubberduck.UI.Command.MenuItems.ParentMenus;
 
 namespace Rubberduck.UI.Command.MenuItems
@@ -20,7 +18,7 @@ public RefactorEncapsulateFieldCommandMenuItem(ICommand command)
 
         public override bool EvaluateCanExecute(RubberduckParserState state)
         {
-            return state.Status == ParserState.Ready;
+            return Command.CanExecute(null);
         }
     }
 }

RetailCoder.VBE/UI/Command/MenuItems/RefactorExtractInterfaceCommandMenuItem.cs

@@ -20,7 +20,7 @@ public RefactorExtractInterfaceCommandMenuItem(ICommand command)
 
         public override bool EvaluateCanExecute(RubberduckParserState state)
         {
-            return state.Status == ParserState.Ready;
+            return Command.CanExecute(null);
         }
     }
 }

RetailCoder.VBE/UI/Command/MenuItems/RefactorExtractMethodCommandMenuItem.cs

@@ -26,7 +26,7 @@ public override bool BeginGroup
 
         public override bool EvaluateCanExecute(RubberduckParserState state)
         {
-            return state.Status == ParserState.Ready;
+            return Command.CanExecute(null);
         }
     }
 }