WingMan – Diff between revs 33 and 36

Subversion Repositories:

?pathlinks?

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

 namespace WingMan
+{
     public partial class WingManForm : Form
     {
-        private const int tabControlDetachPixelOffset = 20;
+        private const int TabControlDetachPixelOffset = 20;
         public WingManForm()
             AutoCompletion.OnLoadFailed += AutoCompletionOnLoadFailed;
             Task.Run(() => AutoCompletion.Load(Address.Name, Address.AutoCompleteCustomSource));
             Task.Run(() => AutoCompletion.Load(Port.Name, Address.AutoCompleteCustomSource));
+            Task.Run(() => AutoCompletion.Load(Nick.Name, Nick.AutoCompleteCustomSource));
-            Task.Run(() => AutoCompletion.Load(Nick.Name, Nick.AutoCompleteCustomSource));
+            Task.Run(() => AutoCompletion.Load(LocalNameTextBox.Name, LocalNameTextBox.AutoCompleteCustomSource));
             MqttCommunication = new MqttCommunication(FormTaskScheduler, FormCancellationTokenSource.Token);
             MqttCommunication.OnClientAuthenticationFailed += OnMqttClientAuthenticationFailed;
             LocalCheckedListBoxBindingSource = new BindingSource
+            {
                 DataSource = LocalKeyBindings.Bindings
             };
             LocalCheckedListBoxBindingSource.ListChanged += LocalCheckedListBoxBindingSourceOnListChanged;
             LocalBindingsCheckedListBox.DisplayMember = "DisplayName";
             LocalBindingsCheckedListBox.ValueMember = "Keys";
             LocalBindingsCheckedListBox.DataSource = LocalCheckedListBoxBindingSource;
             RemoteBindingsComboBoxSource = new BindingSource
+            {
                 DataSource = KeyBindingsExchange.ExchangeBindings
+            };
+            RemoteBindingsComboBoxSource.ListChanged += RemoteBindingsComboBoxSourceOnListChanged;
             };
             RemoteBindingsComboBox.DisplayMember = "Nick";
             RemoteBindingsComboBox.ValueMember = "KeyBindings";
+            RemoteBindingsComboBox.DataSource = RemoteBindingsComboBoxSource;
             RemoteBindingsComboBox.DataSource = RemoteBindingsComboBoxSource;
             // Start lobby message synchronizer.
             LobbyMessageSynchronizer = new LobbyMessageSynchronizer(MqttCommunication, FormTaskScheduler,
         private static IKeyboardMouseEvents MouseKeyApplicationHook { get; set; }
         private List<string> MouseKeyCombo { get; set; }
         public KeyInterceptor KeyInterceptor { get; set; }
         public KeySimulator KeySimulator { get; set; }
+        private static Point TabControlClickStartPosition { get; set; }
+        private static TabControl DetachedTabControl { get; set; }
+        private static Form DetachedForm { get; set; }
+        private void RemoteBindingsComboBoxSourceOnListChanged(object sender, ListChangedEventArgs e)
         private static Point tabControlClickStartPosition { get; set; }
-        private static TabControl DetachedTabControl { get; set; }
+            UpdateRemoteBindingsListBox();
         private static Form DetachedForm { get; set; }
         public void OnDiscoveryPortMapFailed(object sender, DiscoveryFailedEventArgs args)
+        {
             switch (args.Type)
+            {
-                case DiscoveryType.UPnP:
+                case DiscoveryType.Upnp:
                     ActivityTextBox.AppendText(
                         $"{Strings.Failed_to_create_UPnP_port_mapping}{Environment.NewLine}");
                     break;
-                case DiscoveryType.PMP:
+                case DiscoveryType.Pmp:
                     ActivityTextBox.AppendText(
             // If the nick does not exist then add it.
             if (exchangeBindings == null)
+            {
                 KeyBindingsExchange.ExchangeBindings.Add(e.Bindings);
                 RemoteBindingsComboBoxSource.ResetBindings(false);
-                UpdateRemoteItems();
                 return;
+            }
             // If the bindings for the nick have not changed then do not update.
+            if (e.Bindings.KeyBindings.Count == exchangeBindings.KeyBindings.Count &&
-            if (exchangeBindings.KeyBindings.SequenceEqual(e.Bindings.KeyBindings))
+                e.Bindings.KeyBindings.All(exchangeBindings.KeyBindings.Contains))
+            {
-                RemoteBindingsComboBoxSource.ResetBindings(false);
-                UpdateRemoteItems();
+                RemoteBindingsComboBoxSource.ResetBindings(false);
                 return;
+            }
+            // Update the bindings.
+            exchangeBindings.KeyBindings.RemoveAll(binding => !e.Bindings.KeyBindings.Contains(binding));
-            // Update the bindings.
+            exchangeBindings.KeyBindings.AddRange(
-            exchangeBindings.KeyBindings = e.Bindings.KeyBindings;
-            RemoteBindingsComboBoxSource.ResetBindings(false);
+                e.Bindings.KeyBindings.Where(binding => !exchangeBindings.KeyBindings.Contains(binding)));
-            UpdateRemoteItems();
+            RemoteBindingsComboBoxSource.ResetBindings(false);
+        }
-        private void UpdateRemoteItems()
+        private void UpdateRemoteBindingsListBox()
+        {
-            var exchangeBindings = (List<KeyBinding>) RemoteBindingsComboBox.SelectedValue;
-            if (exchangeBindings == null)
-                return;
-            var replaceMouseBindings = new ObservableCollection<RemoteKeyBinding>();
-            foreach (var remoteBinding in RemoteKeyBindings.Bindings)
-            {
-                if (!exchangeBindings.Any(binding =>
-                    string.Equals(binding.Name, remoteBinding.Name, StringComparison.Ordinal)))
-                    continue;
-                replaceMouseBindings.Add(remoteBinding);
-            }
             var keyBindingExchange = (KeyBindingExchange) RemoteBindingsComboBox.SelectedItem;
-            RemoteKeyBindings.Bindings.Clear();
+            if (keyBindingExchange == null)
-            foreach (var binding in replaceMouseBindings) RemoteKeyBindings.Bindings.Add(binding);
+                return;
+            RemoteBindingsListBox.Items.Clear();
+            var bindings = KeyBindingsExchange.ExchangeBindings
-            RemoteBindingsListBox.Items.Clear();
+                .Where(binding => binding.Nick == keyBindingExchange.Nick)
-            RemoteBindingsListBox.DisplayMember = "Name";
+                .SelectMany(binding => binding.KeyBindings.Select(keyBinding => keyBinding))
-            RemoteBindingsListBox.ValueMember = "Name";
+                .Select(binding => (object) binding).ToArray();
             var bindings = exchangeBindings.Select(binding => (object) binding.Name).ToArray();
             if (bindings.Length == 0)
                 return;
             RemoteBindingsListBox.Items.AddRange(bindings);
         }
         private void OnLobbyMessageReceived(object sender, LobbyMessageReceivedEventArgs e)
+        {
         private async void HostButtonClickAsync(object sender, EventArgs e)
+        {
             // Stop the MQTT server if it is running.
             if (MqttCommunication.Running)
+            {
+                // Remote UPnP and Pmp mappings.
+                await Task.Delay(0, FormCancellationTokenSource.Token).ContinueWith(async _ =>
+                    {
+                        await Discovery.DeleteMapping(DiscoveryType.Upnp, MqttCommunication.Port);
+                        await Discovery.DeleteMapping(DiscoveryType.Pmp, MqttCommunication.Port);
+                    },
+                    FormCancellationTokenSource.Token, TaskContinuationOptions.LongRunning, FormTaskScheduler);
                 await MqttCommunication.Stop();
                 HostButton.BackColor = Color.Empty;
                 // Enable controls.
                 ConnectButton.Enabled = true;
                 return;
             StoreConnectionAutocomplete();
+            // Try to reserve port: try UPnP followed by PMP.
+            await Task.Delay(0, FormCancellationTokenSource.Token).ContinueWith(async _ =>
-            // Try to reserve port: try UPnP followed by PMP.
+                {
-            if (!await Discovery.CreateMapping(DiscoveryType.UPnP, port) &&
+                    if (!await Discovery.CreateMapping(DiscoveryType.Upnp, port) &&
-                !await Discovery.CreateMapping(DiscoveryType.PMP, port))
+                        !await Discovery.CreateMapping(DiscoveryType.Pmp, port))
+                        ActivityTextBox.AppendText(
+                            $"{Strings.Failed_creating_automatic_port_mapping_please_make_sure_the_port_is_routed_properly}{Environment.NewLine}");
-                ActivityTextBox.AppendText(
+                },
-                    $"{Strings.Failed_creating_automatic_port_mapping_please_make_sure_the_port_is_routed_properly}{Environment.NewLine}");
+                FormCancellationTokenSource.Token, TaskContinuationOptions.LongRunning, FormTaskScheduler);
             // Start the MQTT server.
+            {
                 Password.BackColor = Color.LightPink;
                 return false;
+            }
-            password = AES.ExpandKey(Password.Text);
+            password = Aes.ExpandKey(Password.Text);
             Address.BackColor = Color.Empty;
             Port.BackColor = Color.Empty;
             await LobbyMessageSynchronizer.Broadcast(LobbySayTextBox.Text);
             LobbySayTextBox.Text = string.Empty;
         }
-        private void LocalAddBindingButtonClick(object sender, EventArgs e)
+        private async void LocalAddBindingButtonClick(object sender, EventArgs e)
+        {
             if (string.IsNullOrEmpty(LocalNameTextBox.Text))
+            {
+            }
             LocalNameTextBox.BackColor = Color.Empty;
+            LocalBindingsCheckedListBox.BackColor = Color.Empty;
+            LocalNameTextBox.AutoCompleteCustomSource.Add(LocalNameTextBox.Text);
-            LocalBindingsCheckedListBox.BackColor = Color.Empty;
+            await AutoCompletion.Save(LocalNameTextBox.Name, LocalNameTextBox.AutoCompleteCustomSource);
             ShowOverlayPanel();
             LocalNameTextBox.BackColor = Color.Empty;
+        }
         private async void LocalBindingsRemoveButtonClick(object sender, EventArgs e)
         {
-            var helmBinding = (KeyBinding) LocalBindingsCheckedListBox.SelectedItem;
+            var localBinding = (KeyBinding) LocalBindingsCheckedListBox.SelectedItem;
-            if (helmBinding == null)
+            if (localBinding == null)
                 return;
-            LocalKeyBindings.Bindings.Remove(helmBinding);
+            LocalKeyBindings.Bindings.Remove(localBinding);
             LocalCheckedListBoxBindingSource.ResetBindings(false);
             LobbySayTextBox.Text = string.Empty;
+        }
         private void RemoteBindingsComboBoxSelectionChangeCompleted(object sender, EventArgs e)
         {
-            UpdateRemoteItems();
+            UpdateRemoteBindingsListBox();
+        }
         private async void WingManFormOnLoad(object sender, EventArgs e)
         private void WingManTabControlMouseDown(object sender, MouseEventArgs e)
+        {
             if (e.Button != MouseButtons.Left) return;
-            tabControlClickStartPosition = e.Location;
+            TabControlClickStartPosition = e.Location;
+        }
         private void WingManTabControlMouseMove(object sender, MouseEventArgs e)
         {
             if (e.Button == MouseButtons.Left)
             {
-                var mouseOffsetX = tabControlClickStartPosition.X - e.X;
+                var mouseOffsetX = TabControlClickStartPosition.X - e.X;
-                var mouseOffsetY = tabControlClickStartPosition.Y - e.Y;
+                var mouseOffsetY = TabControlClickStartPosition.Y - e.Y;
-                if (mouseOffsetX <= tabControlDetachPixelOffset && mouseOffsetY <= tabControlDetachPixelOffset)
+                if (mouseOffsetX <= TabControlDetachPixelOffset && mouseOffsetY <= TabControlDetachPixelOffset)
                     return;
                 tabControl1.DoDragDrop(tabControl1.SelectedTab, DragDropEffects.Move);
-                tabControlClickStartPosition = new Point();
+                TabControlClickStartPosition = new Point();
                 return;
                         tabControl1.Padding.Y),
                     StartPosition = FormStartPosition.Manual,
                     Location = MousePosition,
                     MaximizeBox = false,
                     SizeGripStyle = SizeGripStyle.Hide,
-                    FormBorderStyle = FormBorderStyle.FixedSingle
+                    FormBorderStyle = FormBorderStyle.FixedSingle,
+                    Name = Name,
+                    Text = Text,
+                    Icon = Icon
                 };
                 DetachedTabControl = new TabControl
+                {