WingMan – Diff between revs 18 and 19

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 18 Rev 19
Line 1... Line 1...
1 using System; 1 using System;
-   2 using System.Collections.Generic;
2 using System.IO; 3 using System.IO;
3 using System.Threading; 4 using System.Threading;
4 using System.Threading.Tasks; 5 using System.Threading.Tasks;
-   6 using WindowsInput;
-   7 using WindowsInput.Native;
5 using MQTTnet; 8 using MQTTnet;
6 using SimWinInput; 9 using SimWinInput;
7 using WingMan.Communication; 10 using WingMan.Communication;
8 using WingMan.Utilities; 11 using WingMan.Utilities;
Line 20... Line 23...
20 MqttCommunication = mqttCommunication; 23 MqttCommunication = mqttCommunication;
21 TaskScheduler = formTaskScheduler; 24 TaskScheduler = formTaskScheduler;
22 CancellationToken = cancellationToken; 25 CancellationToken = cancellationToken;
Line 23... Line 26...
23   26  
-   27 MqttCommunication.OnMessageReceived += OnMqttMessageReceived;
-   28  
-   29 InputSimulator = new InputSimulator();
-   30 /*var values = Enum.GetValues(typeof(InputSimulator));
-   31 foreach (var i in values)
-   32 {
-   33 VirtualKeyCodeMapper.Add((int)i, values.GetValue());
24 MqttCommunication.OnMessageReceived += OnMqttMessageReceived; 34 }*/
Line -... Line 35...
-   35 }
-   36  
25 } 37 private InputSimulator InputSimulator { get; set; }
26   38  
27 private MqttCommunication MqttCommunication { get; } 39 private MqttCommunication MqttCommunication { get; }
28 private TaskScheduler TaskScheduler { get; } 40 private TaskScheduler TaskScheduler { get; }
Line 67... Line 79...
67 foreach (var localBinding in LocalLocalKeyBindings.Bindings) 79 foreach (var localBinding in LocalLocalKeyBindings.Bindings)
68 { 80 {
69 if (!string.Equals(localBinding.Name, executeBinding.Name, StringComparison.Ordinal)) 81 if (!string.Equals(localBinding.Name, executeBinding.Name, StringComparison.Ordinal))
70 continue; 82 continue;
Line 71... Line -...
71   -  
72 // Press 83  
73 foreach (var key in localBinding.Keys) 84 foreach (var key in localBinding.Keys)
74 { 85 {
75 if (!KeyConversion.StringToKeys.TryGetValue(key, out var pressKey)) 86 if (!KeyConversion.StringToKeys.TryGetValue(key, out var pressKey))
Line -... Line 87...
-   87 continue;
-   88  
-   89 InputSimulator.Keyboard.KeyPress((VirtualKeyCode) pressKey);
-   90 }
-   91 // Press
-   92 /*foreach (var key in localBinding.Keys)
-   93 {
-   94 if (!KeyConversion.StringToKeys.TryGetValue(key, out var pressKey))
76 continue; 95 continue;
-   96  
77   97 SimKeyboard.KeyDown(pressKey);
Line 78... Line 98...
78 SimKeyboard.KeyDown(pressKey); 98  
Line 79... Line 99...
79 } 99 }
Line 85... Line 105...
85 { 105 {
86 if (!KeyConversion.StringToKeys.TryGetValue(key, out var pressKey)) 106 if (!KeyConversion.StringToKeys.TryGetValue(key, out var pressKey))
87 continue; 107 continue;
Line 88... Line 108...
88   108  
89 SimKeyboard.KeyUp(pressKey); 109 SimKeyboard.KeyUp(pressKey);
90 } 110 }*/
91 } 111 }
92 } 112 }
93 } 113 }