mirrors/PersistentWindows
1
0
Fork 0
mirror of https://github.com/kangyu-california/PersistentWindows.git synced 2025-05-11 13:05:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

only capture window moves that are missed by event handler

Browse source
This commit is contained in:
Kang Yu 2020-03-01 18:18:37 -08:00
parent 43781dcb5e
commit bd7baab613
1 changed files with 44 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

59
Ninjacrab.PersistentWindows.Solution/Ninjacrab.PersistentWindows.Common/PersistentWindowProcessor.cs
View file

@ -55,10 +55,26 @@ namespace Ninjacrab.PersistentWindows.Common
private readonly List<IntPtr> winEventHooks = new List<IntPtr>();
private User32.WinEventDelegate winEventsCaptureDelegate;
#if DEBUG
private void DebugInterval()
{
;
}
#endif
public void Start()
{
monitorApplications = new Dictionary<string, Dictionary<string, ApplicationDisplayMetrics>>();
databaseLock = new object();
validDisplayKeyForCapture = GetDisplayKey();
BeginCaptureApplicationsOnCurrentDisplays();
#if DEBUG
var debugTimer = new Timer(state =>
{
DebugInterval();
});
debugTimer.Change(2000, 2000);
#endif
captureTimer = new Timer(state =>
{
@ -66,9 +82,6 @@ namespace Ninjacrab.PersistentWindows.Common
BeginCaptureApplicationsOnCurrentDisplays();
});
validDisplayKeyForCapture = GetDisplayKey();
BeginCaptureApplicationsOnCurrentDisplays();
restoreTimer = new Timer(state =>
{
Log.Trace("Restore timer expired");
@ -183,14 +196,12 @@ namespace Ninjacrab.PersistentWindows.Common
goto case SessionSwitchReason.SessionUnlock;
case SessionSwitchReason.SessionUnlock:
Log.Trace("Session opening: reason {0}", args.Reason);
CancelCaptureTimer();
break;
case SessionSwitchReason.ConsoleConnect:
// session control
remoteSession = false;
Log.Trace("Session opening: reason {0}", args.Reason);
CancelCaptureTimer();
break;
}
};
@ -270,10 +281,9 @@ namespace Ninjacrab.PersistentWindows.Common
}
});
thread.Start();
break;
return;
}
CancelCaptureTimer();
lock (controlLock)
{
if (restoreTimes >= MinRestoreTimes)
@ -291,12 +301,12 @@ namespace Ninjacrab.PersistentWindows.Common
lock (controlLock)
{
// can not tell if this event is caused by user snap operation or OS initiated closing session
pendingCaptureWindows.Add(hwnd);
// wait for other user move events until capture timer expires
if (pendingCaptureWindows.Count < MinOsMoveWindows)
if (pendingCaptureWindows.Count == 0)
{
StartCaptureTimer();
}
pendingCaptureWindows.Add(hwnd);
}
break;
case User32Events.EVENT_SYSTEM_FOREGROUND:
@ -305,15 +315,13 @@ namespace Ninjacrab.PersistentWindows.Common
case User32Events.EVENT_SYSTEM_MOVESIZEEND:
lock (controlLock)
{
// reset capture statistics for next capture
CancelCaptureTimer();
// OS might bring mstsc.exe(rdp) window to foreground when closing session
if (pendingCaptureWindows.Count >= MinOsMoveWindows)
{
// too many windows changed location, this must be caused by OS move due to closing session
// stop capture any window move until restored
break;
}
pendingCaptureWindows.Clear();
}
string displayKey = GetDisplayKey();
@ -327,10 +335,21 @@ namespace Ninjacrab.PersistentWindows.Common
{
try
{
CancelCaptureTimer();
lock (databaseLock)
{
CaptureWindow(window, eventType, now, displayKey);
}
lock (controlLock)
{
pendingCaptureWindows.Remove(hwnd);
if (pendingCaptureWindows.Count > 0)
{
StartCaptureTimer();
}
}
}
catch (Exception ex)
{
@ -474,7 +493,6 @@ namespace Ninjacrab.PersistentWindows.Common
restoreNestLevel = 0;
// reset capture statistics for next capture period
CancelCaptureTimer();
pendingCaptureWindows.Clear();
}
}
@ -486,6 +504,19 @@ namespace Ninjacrab.PersistentWindows.Common
Log.Trace("Capturing windows for display setting {0}", displayKey);
foreach (var window in appWindows)
{
lock (controlLock)
{
if (pendingCaptureWindows.Count > 0)
{
// only capture windows that event handler has missed
if (!pendingCaptureWindows.Contains(window.HWnd))
{
continue;
}
pendingCaptureWindows.Remove(window.HWnd);
}
}
DateTime now = DateTime.Now;
if (CaptureWindow(window, 0, now, displayKey))
{
@ -652,8 +683,6 @@ namespace Ninjacrab.PersistentWindows.Common
return;
}
CancelCaptureTimer();
if (restoreNestLevel > 1)
{
// avoid overloading CPU due to too many restore threads ready to run