Changed Application.DoEvents to Application.Run() in console applicat…

…ions.
wzfxue · Jan 24, 2018 · 453ab91 · 453ab91
1 parent f70ef24
commit 453ab91
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 18 deletions.
diff --git a/MouseKeyHook/Properties/AssemblyInfo.cs b/MouseKeyHook/Properties/AssemblyInfo.cs
@@ -12,4 +12,4 @@
     )]
 [assembly: AssemblyCopyright("(c) George Mamaladze 2000-2018")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("5.5.0")]
+[assembly: AssemblyVersion("5.6.0")]
diff --git a/examples/ConsoleHook.Rx/Program.cs b/examples/ConsoleHook.Rx/Program.cs
@@ -36,11 +36,9 @@ private static void Main(string[] args)
                     .Select(p => p.Value).FirstOrDefault();
             }
             Console.WriteLine("--------------------------------------------------");
-            action(quit);
 
-            while (!quit.WaitOne(100))
-                Application.DoEvents();
-            ;
+            action(quit);
+            Application.Run(new ApplicationContext());
         }
 
         private static void Exit(AutoResetEvent quit)

diff --git a/examples/ConsoleHook/DetectCombinations.cs b/examples/ConsoleHook/DetectCombinations.cs
@@ -12,7 +12,7 @@ namespace ConsoleHook
 {
     internal class DetectCombinations
     {
-        public static void Do(AutoResetEvent quit)
+        public static void Do(Action quit)
         {
             var map = new Dictionary<Combination, Action>
             {
@@ -23,7 +23,7 @@ public static void Do(AutoResetEvent quit)
                 {Combination.TriggeredBy(Keys.F).With(Keys.E).With(Keys.D), () => Console.WriteLine(":-D")},
                 {Combination.FromString("Alt+A"), () => Console.WriteLine(":-P")},
                 {Combination.FromString("Control+Shift+Z"), () => Console.WriteLine(":-/")},
-                {Combination.FromString("Escape"), () => quit.Set()}
+                {Combination.FromString("Escape"), quit}
             };
 
             Console.WriteLine("Detecting following combinations:");

diff --git a/examples/ConsoleHook/DetectSequences.cs b/examples/ConsoleHook/DetectSequences.cs
@@ -11,13 +11,13 @@ namespace ConsoleHook
 {
     internal class DetectSequences
     {
-        public static void Do(AutoResetEvent quit)
+        public static void Do(Action quit)
         {
             var map = new Dictionary<Sequence, Action>
             {
                 {Sequence.FromString("Control+Z,B"), Console.WriteLine},
                 {Sequence.FromString("Control+Z,Z"), Console.WriteLine},
-                {Sequence.FromString("Escape,Escape,Escape"), () => quit.Set()}
+                {Sequence.FromString("Escape,Escape,Escape"), quit}
             };
 
             Console.WriteLine("Detecting following combinations:");

diff --git a/examples/ConsoleHook/LogKeys.cs b/examples/ConsoleHook/LogKeys.cs
@@ -10,12 +10,13 @@ namespace ConsoleHook
 {
     internal class LogKeys
     {
-        public static void Do(AutoResetEvent quit)
+        public static void Do(Action  quit)
         {
+            Console.WriteLine("Press Q to quit.");
             Hook.GlobalEvents().KeyPress += (sender, e) =>
             {
                 Console.Write(e.KeyChar);
-                if (e.KeyChar == 'q') quit.Set();
+                if (e.KeyChar == 'q') quit();
             };
         }
     }

diff --git a/examples/ConsoleHook/Program.cs b/examples/ConsoleHook/Program.cs
@@ -6,24 +6,23 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
+using System.Windows.Forms;
 
 namespace ConsoleHook
 {
     internal class Program
     {
         private static void Main(string[] args)
         {
-            var quit = new AutoResetEvent(false);
-
-            var selector = new Dictionary<string, Action<AutoResetEvent>>
+            var selector = new Dictionary<string, Action<Action>>
             {
                 {"1. Log keys", LogKeys.Do},
                 {"2. Detect key combinations", DetectCombinations.Do},
                 {"3. Detect key sequences", DetectSequences.Do},
                 {"Q. Quit", Exit}
             };
 
-            Action<AutoResetEvent> action = null;
+            Action<Action> action = null;
 
             while (action == null)
             {
@@ -36,13 +35,16 @@ private static void Main(string[] args)
                     .Select(p => p.Value).FirstOrDefault();
             }
             Console.WriteLine("--------------------------------------------------");
-            action(quit);
+
+            action(Application.Exit);
+
+            Application.Run(new ApplicationContext());
         }
 
 
-        private static void Exit(AutoResetEvent quit)
+        private static void Exit(Action quit)
         {
-            quit.Set();
+            Application.Exit();
         }
     }
 }