optimize foreground change performance

TransposonY · Apr 5, 2015 · c302bf7 · c302bf7
1 parent 68cf3c1
commit c302bf7
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/GestureSign.Common/Applications/ApplicationBase.cs b/GestureSign.Common/Applications/ApplicationBase.cs
@@ -64,14 +64,14 @@ public bool IsSystemWindowMatch(SystemWindow Window)
 
                         break;
                     case MatchUsing.ExecutableFilename:
-                        windowMatchString = Window.Process.MainModule.ModuleName;//System.IO.Path.GetFileName(.FileName;
+                        windowMatchString = Window.ProcessName;//.MainModule.ModuleName;//System.IO.Path.GetFileName(.FileName;
 
                         break;
                     case MatchUsing.All:
                         return true;
                 }
 
-                return IsRegEx ? Regex.IsMatch(windowMatchString, compareMatchString, RegexOptions.Singleline | RegexOptions.IgnoreCase) : windowMatchString.Trim().ToLower() == compareMatchString.Trim().ToLower();
+                return IsRegEx ? Regex.IsMatch(windowMatchString, compareMatchString, RegexOptions.Singleline | RegexOptions.IgnoreCase) : String.Equals(windowMatchString.Trim(), compareMatchString.Trim(), StringComparison.CurrentCultureIgnoreCase);
             }
             catch
             {

diff --git a/GestureSignDaemon/Input/InitializationRatio.cs b/GestureSignDaemon/Input/InitializationRatio.cs
@@ -78,7 +78,7 @@ public void MessageWindow_PointsIntercepted(object sender, GestureSign.Common.In
                 MessageProcessor.OnGotTouchPoint -= MessageProcessor_OnGotTouchPoint;
                 messageWindow.PointsIntercepted -= MessageWindow_PointsIntercepted;
                 messageWindow.PointerIntercepted -= MessageWindow_PointerIntercepted;
-
+                messageWindow.Unregister();
             }
         }
     }

diff --git a/GestureSignDaemon/Input/MessageWindow.cs b/GestureSignDaemon/Input/MessageWindow.cs
@@ -87,7 +87,7 @@ const int
         public bool IsRegistered
         {
             get { return isRegistered; }
-            set
+            private set
             {
                 if (value)
                 {
@@ -220,7 +220,11 @@ private void WinEventProc(IntPtr hWinEventHook, uint eventType, IntPtr hwnd, int
         {
             if (OnForegroundChange != null) OnForegroundChange(this, hwnd);
         }
-
+        public void Unregister()
+        {
+            if (IsRegistered)
+                Invoke(new Action(() => IsRegistered = false));
+        }
         public void ToggleRegister(object sender, bool e)
         {
             if (e && !AppConfig.InterceptTouchInput) return;

diff --git a/GestureSignDaemon/Input/TouchCapture.cs b/GestureSignDaemon/Input/TouchCapture.cs
@@ -147,7 +147,7 @@ protected TouchCapture()
 
         void messageWindow_OnForegroundChange(object sender, IntPtr e)
         {
-            if (e.Equals(IntPtr.Zero) || Application.OpenForms.Count != 0 && e.Equals(Application.OpenForms[0].Handle))
+            if (State != CaptureState.Ready || e.Equals(IntPtr.Zero) || Application.OpenForms.Count != 0 && e.Equals(Application.OpenForms[0].Handle))
                 return;
 
             bool flag =

diff --git a/ManagedWinapi/SystemWindow.cs b/ManagedWinapi/SystemWindow.cs
@@ -816,19 +816,29 @@ public bool IsDescendantOf(SystemWindow ancestor)
             return IsChild(ancestor._hwnd, _hwnd);
         }
 
+        private Process _process;
         /// <summary>
         /// The process which created this window.
         /// </summary>
         public Process Process
         {
             get
             {
+                if (_process != null) return _process;
                 int pid;
                 GetWindowThreadProcessId(HWnd, out pid);
-                return Process.GetProcessById(pid);
+                _process = Process.GetProcessById(pid);
+                return _process;
             }
         }
 
+        private string _processName;
+
+        public string ProcessName
+        {
+            get { return _processName ?? (_processName = Process.ProcessName + ".exe"); }
+        }
+
         /// <summary>
         ///  The Thread which created this window.
         /// </summary>