WingMan – Diff between revs 10 and 14

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 10 Rev 14
Line 1... Line 1...
1 using System; 1 using System;
2 using System.IO; 2 using System.IO;
3 using System.Threading; 3 using System.Threading;
4 using System.Threading.Tasks; 4 using System.Threading.Tasks;
5 using System.Windows.Forms; -  
6 using MQTTnet; 5 using MQTTnet;
7 using SimWinInput; 6 using SimWinInput;
8 using WingMan.Communication; 7 using WingMan.Communication;
-   8 using WingMan.Utilities;
Line 9... Line 9...
9   9  
10 namespace WingMan.MouseKey 10 namespace WingMan.Bindings
11 { 11 {
12 public class KeySimulator : IDisposable 12 public class KeySimulator : IDisposable
13 { 13 {
Line 70... Line 70...
70 continue; 70 continue;
Line 71... Line 71...
71   71  
72 // Press 72 // Press
73 foreach (var key in localBinding.Keys) 73 foreach (var key in localBinding.Keys)
74 { 74 {
75 if (KeyConversion.StringToKeys.TryGetValue(key, out var pressKey)) -  
76 { -  
77 SimKeyboard.KeyDown(pressKey); 75 if (!KeyConversion.StringToKeys.TryGetValue(key, out var pressKey))
78 continue; -  
Line 79... Line -...
79 } -  
80   76 continue;
81 if (KeyConversion.StringToMouseButtons.TryGetValue(key, out var pressMouse)) -  
82 switch (pressMouse) -  
83 { -  
84 case MouseButtons.Left: -  
85 SimMouse.Act(SimMouse.Action.LeftButtonDown, Cursor.Position.X, Cursor.Position.Y); -  
86 break; -  
87 case MouseButtons.Middle: -  
88 SimMouse.Act(SimMouse.Action.MiddleButtonDown, Cursor.Position.X, Cursor.Position.Y); -  
89 break; -  
90 case MouseButtons.Right: -  
91 SimMouse.Act(SimMouse.Action.RightButtonDown, Cursor.Position.X, Cursor.Position.Y); -  
92 break; 77  
Line 93... Line 78...
93 } 78 SimKeyboard.KeyDown(pressKey);
94 } 79 }
95   80  
96 // Depress 81 // Depress
97 foreach (var key in localBinding.Keys) -  
98 { -  
99 if (KeyConversion.StringToKeys.TryGetValue(key, out var pressKey)) 82 foreach (var key in localBinding.Keys)
100 { -  
Line 101... Line -...
101 SimKeyboard.KeyUp(pressKey); -  
102 continue; 83 {
103 } -  
104   -  
105 if (KeyConversion.StringToMouseButtons.TryGetValue(key, out var pressMouse)) -  
106 switch (pressMouse) -  
107 { -  
108 case MouseButtons.Left: -  
109 SimMouse.Act(SimMouse.Action.LeftButtonUp, Cursor.Position.X, Cursor.Position.Y); -  
110 break; -  
111 case MouseButtons.Middle: -  
112 SimMouse.Act(SimMouse.Action.MiddleButtonUp, Cursor.Position.X, Cursor.Position.Y); -  
113 break; -  
114 case MouseButtons.Right: 84 if (!KeyConversion.StringToKeys.TryGetValue(key, out var pressKey))
115 SimMouse.Act(SimMouse.Action.RightButtonUp, Cursor.Position.X, Cursor.Position.Y); 85 continue;
116 break; 86  
117 } 87 SimKeyboard.KeyUp(pressKey);
118 } 88 }