merge with master builds

9 files changed, 227 insertions, 37 deletions

diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs
index e125310..5f05798 100644
--- a/grapher/Models/AccelGUI.cs
+++ b/grapher/Models/AccelGUI.cs
@@ -1,4 +1,5 @@
 using grapher.Models.Calculations;
+using grapher.Models.Devices;
 using grapher.Models.Mouse;
 using grapher.Models.Options;
 using grapher.Models.Serialized;
@@ -23,7 +24,8 @@ namespace grapher
             Button writeButton,
             ButtonBase toggleButton,
             MouseWatcher mouseWatcher,
-            ToolStripMenuItem scaleMenuItem)
+            ToolStripMenuItem scaleMenuItem,
+            DeviceIDManager deviceIDManager)
         {
             AccelForm = accelForm;
             AccelCalculator = accelCalculator;
@@ -36,6 +38,7 @@ namespace grapher
             DefaultButtonFont = WriteButton.Font;
             SmallButtonFont = new Font(WriteButton.Font.Name, WriteButton.Font.Size * Constants.SmallButtonSizeFactor);
             MouseWatcher = mouseWatcher;
+            DeviceIDManager = deviceIDManager;
 
             ScaleMenuItem.Click += new System.EventHandler(OnScaleMenuItemClick);
             WriteButton.Click += new System.EventHandler(OnWriteButtonClick);
@@ -95,6 +98,10 @@ namespace grapher
 
         public ToolStripMenuItem ScaleMenuItem { get; }
 
+        public DeviceIDManager DeviceIDManager { get; }
+
+        public Action UpdateInputManagers { get; private set; }
+
         private Timer ChartRefresh { get; }
 
         private Font SmallButtonFont { get; }
@@ -144,6 +151,7 @@ namespace grapher
                 directionalMultipliers = driverSettings.directionalMultipliers,
                 domainArgs = ApplyOptions.Directionality.GetDomainArgs(),
                 rangeXY = ApplyOptions.Directionality.GetRangeXY(),
+                deviceID = DeviceIDManager.ID,
             };
 
             ButtonDelay(WriteButton);
@@ -156,7 +164,7 @@ namespace grapher
             }
             else
             {
-                throw new Exception($"Bad arguments:\n\n{errors}");
+                new MessageDialog(errors.ToString(), "bad input").ShowDialog();
             }
         }
 
@@ -164,6 +172,14 @@ namespace grapher
         {
             UpdateShownActiveValues(args);
             UpdateGraph(args);
+
+            UpdateInputManagers = () =>
+            {
+                MouseWatcher.UpdateHandles(args.deviceID);
+                DeviceIDManager.Update(args.deviceID);
+            };
+
+            UpdateInputManagers();
         }
 
         public void UpdateGraph(DriverSettings args)
diff --git a/grapher/Models/AccelGUIFactory.cs b/grapher/Models/AccelGUIFactory.cs
index 802ce4b..9ca1578 100644
--- a/grapher/Models/AccelGUIFactory.cs
+++ b/grapher/Models/AccelGUIFactory.cs
@@ -1,4 +1,5 @@
 using grapher.Models.Calculations;
+using grapher.Models.Devices;
 using grapher.Models.Mouse;
 using grapher.Models.Options;
 using grapher.Models.Options.Directionality;
@@ -33,6 +34,7 @@ namespace grapher.Models
             ToolStripMenuItem gainOffsetToolStripMenuItem,
             ToolStripMenuItem legacyOffsetToolStripMenuItem,
             ToolStripMenuItem autoWriteMenuItem,
+            ToolStripMenuItem useSpecificDeviceMenuItem,
             ToolStripMenuItem scaleMenuItem,
             ToolStripTextBox dpiTextBox,
             ToolStripTextBox pollRateTextBox,
@@ -391,16 +393,20 @@ namespace grapher.Models
                 lockXYLabel,
                 accelCharts);
 
+            var deviceIdManager = new DeviceIDManager(useSpecificDeviceMenuItem);
+
             var settings = new SettingsManager(
                 activeAccel,
                 accelCalculator.DPI,
                 accelCalculator.PollRate,
                 autoWriteMenuItem,
                 showLastMouseMoveMenuItem,
-                showVelocityGainToolStripMenuItem);
+                showVelocityGainToolStripMenuItem,
+                deviceIdManager);
 
             var mouseWatcher = new MouseWatcher(form, mouseLabel, accelCharts, settings);
 
+
             return new AccelGUI(
                 form,
                 accelCalculator,
@@ -410,7 +416,8 @@ namespace grapher.Models
                 writeButton,
                 toggleButton,
                 mouseWatcher,
-                scaleMenuItem);
+                scaleMenuItem,
+                deviceIdManager);
         }
 
         #endregion Methods
diff --git a/grapher/Models/Devices/DeviceIDItem.cs b/grapher/Models/Devices/DeviceIDItem.cs
new file mode 100644
index 0000000..63c2761
--- /dev/null
+++ b/grapher/Models/Devices/DeviceIDItem.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace grapher.Models.Devices
+{
+    public class DeviceIDItem
+    {
+        public DeviceIDItem(string name, string id, DeviceIDManager manager)
+        {
+            Name = name;
+            ID = id;
+            Manager = manager;
+            DeviceIDMenuItem = new ToolStripMenuItem();
+            DeviceIDMenuItem.Checked = false;
+            DeviceIDMenuItem.Text = MenuItemText();
+            DeviceIDMenuItem.Click += OnClicked;
+            manager.DeviceIDsMenuItem.DropDownItems.Add(DeviceIDMenuItem);
+        }
+
+        private ToolStripMenuItem DeviceIDMenuItem { get; }
+
+        public string Name { get; }
+
+        public string ID { get; }
+
+        private DeviceIDManager Manager { get; }
+
+        public void SetActivated()
+        {
+            DeviceIDMenuItem.Checked = true;
+        }
+
+        public void SetDeactivated()
+        {
+            DeviceIDMenuItem.Checked = false;
+        }
+
+        private string MenuItemText() => string.IsNullOrEmpty(ID) ? $"{Name}" : $"{Name}: {ID}";
+
+        private string DisconnectedText() => $"Disconnected: {ID}";
+
+        public void SetDisconnected()
+        {
+            DeviceIDMenuItem.ForeColor = Color.DarkGray;
+            DeviceIDMenuItem.Text = DisconnectedText();
+        }
+
+        public void OnClicked(object sender, EventArgs e)
+        {
+            Manager.SetActive(this);
+        }
+
+        public override bool Equals(object obj)
+        {
+            return obj is DeviceIDItem item &&
+                   Name == item.Name &&
+                   ID == item.ID;
+        }
+
+        public override int GetHashCode()
+        {
+            int hashCode = -1692744877;
+            hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(Name);
+            hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(ID);
+            return hashCode;
+        }
+    }
+}
diff --git a/grapher/Models/Devices/DeviceIDManager.cs b/grapher/Models/Devices/DeviceIDManager.cs
new file mode 100644
index 0000000..c50cda8
--- /dev/null
+++ b/grapher/Models/Devices/DeviceIDManager.cs
@@ -0,0 +1,86 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Management;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace grapher.Models.Devices
+{
+    public class DeviceIDManager
+    {
+        public DeviceIDManager(ToolStripMenuItem deviceIDs)
+        {
+            DeviceIDsMenuItem = deviceIDs;
+            DeviceIDsMenuItem.Checked = false;
+        }
+
+        public ToolStripMenuItem DeviceIDsMenuItem { get; }
+
+        public string ID { get => SelectedDeviceID.ID; }
+
+        public DeviceIDItem SelectedDeviceID { get; private set; }
+
+        public Dictionary<string, DeviceIDItem> DeviceIDs { get; private set; }
+
+        public static IEnumerable<(string, string)> GetDeviceIDs(string PNPClass = "Mouse")
+        {
+            ManagementObjectSearcher searcher = new ManagementObjectSearcher(new SelectQuery("Win32_PnPEntity"));
+
+            foreach (ManagementObject obj in searcher.Get())
+            {
+                if (obj["PNPClass"] != null && obj["PNPClass"].ToString().Equals(PNPClass) && obj["DeviceID"] != null)
+                {
+                    string name = obj["Name"].ToString();
+
+                    string devInstanceID = obj["DeviceID"].ToString();
+                    string devID = devInstanceID.Remove(devInstanceID.LastIndexOf('\\'));
+                    
+                    yield return (name, devID);
+                }
+            }
+        }
+
+        public void SetActive(DeviceIDItem deviceIDItem)
+        {
+            if (SelectedDeviceID != null)
+            {
+                SelectedDeviceID.SetDeactivated();
+            }
+
+            SelectedDeviceID = deviceIDItem;
+            SelectedDeviceID.SetActivated();
+        }
+
+        public void Update(string devID)
+        {
+            DeviceIDsMenuItem.DropDownItems.Clear();
+
+            bool found = string.IsNullOrEmpty(devID);
+
+            var anyDevice = new DeviceIDItem("Any", string.Empty, this);
+
+            if (found) SetActive(anyDevice);
+
+            foreach (var device in GetDeviceIDs().Distinct())
+            {
+                var deviceItem = new DeviceIDItem(device.Item1, device.Item2, this);
+                if (!found && deviceItem.ID.Equals(devID))
+                {
+                    SetActive(deviceItem);
+                    found = true;
+                }
+            }
+
+            if (!found)
+            {
+                var deviceItem = new DeviceIDItem(string.Empty, devID, this);
+                deviceItem.SetDisconnected();
+                SetActive(deviceItem);
+            }
+        }
+
+    }
+}
diff --git a/grapher/Models/Mouse/MouseData.cs b/grapher/Models/Mouse/MouseData.cs
index e59a969..5944fe4 100644
--- a/grapher/Models/Mouse/MouseData.cs
+++ b/grapher/Models/Mouse/MouseData.cs
@@ -8,7 +8,6 @@ namespace grapher.Models.Mouse
 
         public MouseData()
         {
-            Lock = new Object();
             X = 0;
             Y = 0;
         }
@@ -17,18 +16,13 @@ namespace grapher.Models.Mouse
 
         #region Properties
 
-        public Object Lock { get; }
-
         private int X { get; set; }
         private int Y { get; set; }
 
         public void Set(int x, int y)
         {
-            lock (Lock)
-            {
-                X = x;
-                Y = y;
-            }
+            X = x;
+            Y = y;
         }
 
         #endregion Properties
@@ -37,11 +31,8 @@ namespace grapher.Models.Mouse
 
         public void Get(out int x, out int y)
         {
-            lock (Lock)
-            {
-                x = X;
-                y = Y;
-            }
+            x = X;
+            y = Y;
         }
 
         #endregion Methods
diff --git a/grapher/Models/Mouse/MouseWatcher.cs b/grapher/Models/Mouse/MouseWatcher.cs
index 3cc8bd0..163829f 100644
--- a/grapher/Models/Mouse/MouseWatcher.cs
+++ b/grapher/Models/Mouse/MouseWatcher.cs
@@ -1,5 +1,6 @@
 using grapher.Models.Serialized;
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
@@ -398,7 +399,11 @@ namespace grapher.Models.Mouse
             /// <summary>If set, the application-defined keyboard device hotkeys are not handled. However, the system hotkeys; for example, ALT+TAB and CTRL+ALT+DEL, are still handled. By default, all keyboard hotkeys are handled. NoHotKeys can be specified even if NoLegacy is not specified and WindowHandle is NULL.</summary>
             NoHotKeys = 0x00000200,
             /// <summary>If set, application keys are handled.  NoLegacy must be specified.  Keyboard only.</summary>
-            AppKeys = 0x00000400
+            AppKeys = 0x00000400,
+            /// <summary>If set, this enables the caller to receive input in the background only if the foreground application does not process it. In other words, if the foreground application is not registered for raw input, then the background application that is registered will receive the input.</summary>
+            ExInputSink = 0x00001000,
+            /// <summary>If set, this enables the caller to receive WM_INPUT_DEVICE_CHANGE notifications for device arrival and device removal.</summary>
+            DevNotify = 0x00002000
         }
 
         /// <summary>Value type for raw input devices.</summary>
@@ -686,12 +691,13 @@ namespace grapher.Models.Mouse
             AccelCharts = accelCharts;
             SettingsManager = setMngr;
             MouseData = new MouseData();
+            DeviceHandles = new List<IntPtr>();
 
             RAWINPUTDEVICE device = new RAWINPUTDEVICE();
             device.WindowHandle = ContainingForm.Handle;
             device.UsagePage = HIDUsagePage.Generic;
             device.Usage = HIDUsage.Mouse;
-            device.Flags = RawInputDeviceFlags.InputSink;
+            device.Flags = RawInputDeviceFlags.InputSink | RawInputDeviceFlags.DevNotify;
 
             RAWINPUTDEVICE[] devices = new RAWINPUTDEVICE[1];
             devices[0] = device;
@@ -716,6 +722,10 @@ namespace grapher.Models.Mouse
 
         private Stopwatch Stopwatch { get; }
 
+        private List<IntPtr> DeviceHandles { get; }
+
+        private bool AnyDevice { get; set; }
+
         private double PollTime
         {
             get => 1000 / SettingsManager.PollRateField.Data;
@@ -725,6 +735,16 @@ namespace grapher.Models.Mouse
 
         #region Methods
 
+        public void UpdateHandles(string devID)
+        {
+            DeviceHandles.Clear();
+            AnyDevice = string.IsNullOrEmpty(devID);
+            if (!AnyDevice)
+            {
+                RawInputInterop.AddHandlesFromID(devID, DeviceHandles);
+            }
+        }
+
         public void UpdateLastMove()
         {
             MouseData.Get(out var x, out var y);
@@ -733,15 +753,14 @@ namespace grapher.Models.Mouse
 
         public void ReadMouseMove(Message message)
         {
-            RawInput rawInput = new RawInput();
-            int outSize = 0;
+            RawInput rawInput;
             int size = Marshal.SizeOf(typeof(RawInput));
-
-            outSize = GetRawInputData((IntPtr)message.LParam, RawInputCommand.Input, out rawInput, ref size, Marshal.SizeOf(typeof(RAWINPUTHEADER)));
+            _ = GetRawInputData(message.LParam, RawInputCommand.Input, out rawInput, ref size, Marshal.SizeOf(typeof(RAWINPUTHEADER)));
 
             bool relative = !rawInput.Data.Mouse.Flags.HasFlag(RawMouseFlags.MoveAbsolute);
+            bool deviceMatch = AnyDevice || DeviceHandles.Contains(rawInput.Header.Device);
 
-            if (relative && (rawInput.Data.Mouse.LastX != 0 || rawInput.Data.Mouse.LastY != 0))
+            if (relative && deviceMatch && (rawInput.Data.Mouse.LastX != 0 || rawInput.Data.Mouse.LastY != 0))
             {
                 var time = Stopwatch.Elapsed.TotalMilliseconds;
                 Stopwatch.Restart();
diff --git a/grapher/Models/Mouse/PointData.cs b/grapher/Models/Mouse/PointData.cs
index e3f44ea..87bfc62 100644
--- a/grapher/Models/Mouse/PointData.cs
+++ b/grapher/Models/Mouse/PointData.cs
@@ -8,7 +8,6 @@ namespace grapher.Models.Mouse
 
         public PointData()
         {
-            Lock = new Object();
             X = new double[] { 0.01 };
             Y = new double[] { 0.01 };
         }
@@ -17,18 +16,13 @@ namespace grapher.Models.Mouse
 
         #region Properties
 
-        public Object Lock { get; }
-
         private double[] X { get; set; }
         private double[] Y { get; set; }
 
         public void Set(double x, double y)
         {
-            lock(Lock)
-            {
-                X[0] = x;
-                Y[0] = y;
-            }
+            X[0] = x;
+            Y[0] = y;
         }
 
         #endregion Properties
@@ -37,11 +31,8 @@ namespace grapher.Models.Mouse
 
         public void Get(out double[] x, out double[] y)
         {
-            lock(Lock)
-            {
                 x = X;
                 y = Y;
-            }
         }
 
         #endregion Methods
diff --git a/grapher/Models/Serialized/RawAccelSettings.cs b/grapher/Models/Serialized/RawAccelSettings.cs
index dcaf864..f4fb1e2 100644
--- a/grapher/Models/Serialized/RawAccelSettings.cs
+++ b/grapher/Models/Serialized/RawAccelSettings.cs
@@ -125,7 +125,8 @@ namespace grapher.Models.Serialized
             bool wholeOrNoY = accelSettings.combineMagnitudes ||
                 accelSettings.modes.y == AccelMode.noaccel;
 
-            return accelSettings.sensitivity.x == 1 &&
+            return string.IsNullOrEmpty(accelSettings.deviceID) &&
+                accelSettings.sensitivity.x == 1 &&
                 accelSettings.sensitivity.y == 1 &&
                 accelSettings.directionalMultipliers.x <= 0 &&
                 accelSettings.directionalMultipliers.y <= 0 &&
diff --git a/grapher/Models/Serialized/SettingsManager.cs b/grapher/Models/Serialized/SettingsManager.cs
index 41ebcb5..40652dd 100644
--- a/grapher/Models/Serialized/SettingsManager.cs
+++ b/grapher/Models/Serialized/SettingsManager.cs
@@ -3,6 +3,8 @@ using System;
 using System.Windows.Forms;
 using System.Threading;
 using System.Text;
+using System.Drawing;
+using grapher.Models.Devices;
 
 namespace grapher.Models.Serialized
 {
@@ -16,7 +18,8 @@ namespace grapher.Models.Serialized
             Field pollRateField,
             ToolStripMenuItem autoWrite,
             ToolStripMenuItem showLastMouseMove,
-            ToolStripMenuItem showVelocityAndGain)
+            ToolStripMenuItem showVelocityAndGain,
+            DeviceIDManager deviceIDManager)
         {
             ActiveAccel = activeAccel;
             DpiField = dpiField;
@@ -24,6 +27,7 @@ namespace grapher.Models.Serialized
             AutoWriteMenuItem = autoWrite;
             ShowLastMouseMoveMenuItem = showLastMouseMove;
             ShowVelocityAndGainMoveMenuItem = showVelocityAndGain;
+            DeviceIDManager = deviceIDManager;
         }
 
         #endregion Constructors
@@ -38,6 +42,8 @@ namespace grapher.Models.Serialized
 
         public Field PollRateField { get; private set; }
 
+        public DeviceIDManager DeviceIDManager { get; }
+
         private ToolStripMenuItem AutoWriteMenuItem { get; set; }
 
         private ToolStripMenuItem ShowLastMouseMoveMenuItem { get; set; }