WingMan – Diff between revs 14 and 21

Subversion Repositories:

?pathlinks?

Rev 14 – Rev 22 – Go to most recent revision – Details – Blame – Last modification – View Log

         public KeyInterceptor KeyInterceptor { get; set; }
         public KeySimulator KeySimulator { get; set; }
         public KeySimulator KeySimulator { get; set; }
         /// <inheritdoc />
         /// <summary>
         ///     Clean up any resources being used.
                     continue;
                 replaceMouseBindings.Add(remoteBinding);
             }
             RemoteKeyBindings.Bindings.Clear();
-            RemoteKeyBindings.Bindings = replaceMouseBindings;
+            foreach (var binding in replaceMouseBindings) RemoteKeyBindings.Bindings.Add(binding);
             RemoteBindingsListBox.Items.Clear();
                 Nick.Enabled = true;
                 Password.Enabled = true;
                 return;
+            }
-            if (!ValidateAddressPort(out var ipAddress, out var port, out var nick, out var password))
+            if (!ValidateConnectionParameters(out var ipAddress, out var port, out var nick, out var password))
                 return;
             // Start the MQTT server.
             Port.Enabled = false;
             Nick.Enabled = false;
             Password.Enabled = false;
+        }
+        private bool ValidateConnectionParameters(
+            out IPAddress address,
+            out int port,
+            out string nick,
-        private bool ValidateAddressPort(out IPAddress address, out int port, out string nick, out string password)
+            out string password)
+        {
             address = IPAddress.Any;
             port = 0;
             nick = string.Empty;
                 Password.BackColor = Color.LightPink;
                 return false;
+            }
+            if (!IPAddress.TryParse(Address.Text, out address))
-            if (!IPAddress.TryParse(Address.Text, out address))
+                try
+                {
+                    address = Dns.GetHostAddresses(Address.Text).FirstOrDefault();
+                }
+                catch (Exception ex)
+                {
+                    ActivityTextBox.AppendText(
+                        $"{Strings.Could_not_resolve_hostname} : {ex.Message}{Environment.NewLine}");
-            {
-                Address.BackColor = Color.LightPink;
+                    Address.BackColor = Color.LightPink;
-                return false;
+                    return false;
+                }
             if (!uint.TryParse(Port.Text, out var uPort))
+            {
                 Password.Enabled = true;
                 HostButton.Enabled = true;
                 return;
+            }
-            if (!ValidateAddressPort(out var ipAddress, out var port, out var nick, out var password))
+            if (!ValidateConnectionParameters(out var ipAddress, out var port, out var nick, out var password))
                 return;
             if (!await MqttCommunication
             ShowOverlayPanel();
             MouseKeyCombo = new List<string>();
             MouseKeyApplicationHook = Hook.GlobalEvents();
-            MouseKeyApplicationHook.KeyUp += RemoteMouseKeyHookOnKeyUp;
+            MouseKeyApplicationHook.KeyUp += RemoteKeyHookOnKeyUp;
-            MouseKeyApplicationHook.KeyDown += RemoteMouseKeyHookOnKeyDown;
+            MouseKeyApplicationHook.KeyDown += RemoteKeyHookOnKeyDown;
+        }
             RemoteKeyBindings.Bindings.Remove(remoteKeyBinding);
             RemoteBindingsBindToBox.Text = string.Empty;
         }
-        private void RemoteMouseKeyHookOnKeyDown(object sender, KeyEventArgs e)
+        private void RemoteKeyHookOnKeyDown(object sender, KeyEventArgs e)
         {
+            e.SuppressKeyPress = true;
             e.SuppressKeyPress = true;
             if (!KeyConversion.KeysToString.TryGetValue((byte) e.KeyCode, out var key))
-            KeyConversion.KeysToString.TryGetValue((byte) e.KeyCode, out var key);
+                return;
             MouseKeyCombo.Add(key);
+        }
-        private async void RemoteMouseKeyHookOnKeyUp(object sender, KeyEventArgs e)
+        private async void RemoteKeyHookOnKeyUp(object sender, KeyEventArgs e)
+        {
             RemoteKeyBindings.Bindings.Add(new RemoteKeyBinding(RemoteBindingsComboBox.Text,
                 (string) RemoteBindingsListBox.SelectedItem, MouseKeyCombo));
                         memoryStream.Position = 0L;
                         var loadedBindings =
                             (LocalKeyBindings) LocalKeyBindings.XmlSerializer.Deserialize(memoryStream);
                         foreach (var binding in loadedBindings.Bindings)
-                        foreach (var binding in loadedBindings.Bindings) LocalKeyBindings.Bindings.Add(binding);
+                            LocalKeyBindings.Bindings.Add(binding);
                         LocalListBoxBindingSource.ResetBindings(false);
                         memoryStream.Position = 0L;
                         var loadedBindings =
                             (RemoteKeyBindings) RemoteKeyBindings.XmlSerializer.Deserialize(memoryStream);
                         foreach (var binding in loadedBindings.Bindings)
-                        foreach (var binding in loadedBindings.Bindings) RemoteKeyBindings.Bindings.Add(binding);
+                            RemoteKeyBindings.Bindings.Add(binding);
+                    }
+                }
+            }