Merge pull request #20 from Terence-D/Dev1.0

version 1.1
Terence-D · Jan 25, 2019 · 25e69bd · 25e69bd
2 parents 257c87c + 3161cb7
commit 25e69bd
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 17 deletions.
diff --git a/GameInputCommandSystem/GameInputCommandSystem.csproj b/GameInputCommandSystem/GameInputCommandSystem.csproj
@@ -26,7 +26,7 @@
     <MapFileExtensions>true</MapFileExtensions>
     <AutorunEnabled>true</AutorunEnabled>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <ApplicationVersion>1.1.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>

diff --git a/GameInputCommandSystem/KeyMaster.cs b/GameInputCommandSystem/KeyMaster.cs
@@ -27,22 +27,24 @@ public bool SendCommand(Command command)
             {
                 return false;
             } else {
-                //if any modifiers, send them first
-                foreach (string modifier in command.Modifier)
-                {
-                    AutoItX.Send("{" + modifier + "DOWN}");
+                if (command.activatorType == Command.KEY_DOWN) {
+                    //if any modifiers, send them first
+                    foreach (string modifier in command.Modifier)
+                    {
+                        AutoItX.Send("{" + modifier + "DOWN}");
+                    }
+                    //now send the key itself
+                    AutoItX.Send("{" + command.Key + " down}");
+                    //keep everything pressed for 10ms
                 }
-                //now send the key itself
-                AutoItX.Send("{" + command.Key + " down}");
-                //keep everything pressed for 10ms
-                AutoItX.Sleep(10); 
-                AutoItX.Send("{" + command.Key + " up}"); 
-                //if any modifiers, unset them last
-                foreach (string modifier in command.Modifier)
-                {
-                    AutoItX.Send("{" + modifier + "UP}");
+                else if (command.activatorType == Command.KEY_UP) {
+                    AutoItX.Send("{" + command.Key + " up}"); 
+                    //if any modifiers, unset them last
+                    foreach (string modifier in command.Modifier)
+                    {
+                        AutoItX.Send("{" + modifier + "UP}");
+                    }
                 }
-
             }
             return true;
         }

diff --git a/GameInputCommandSystem/Models/Command.cs b/GameInputCommandSystem/Models/Command.cs
@@ -17,7 +17,11 @@ namespace GameInputCommandSystem.Models
 {
     public class Command
     {
+        public const int KEY_DOWN = 0;
+        public const int KEY_UP = 1;
+
         public string Key { get; set; }
         public string[] Modifier { get; set; }
+        public int activatorType {get;set;}
     }
 }
diff --git a/GameInputCommandSystem/Properties/AssemblyInfo.cs b/GameInputCommandSystem/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]