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

fix missing opportunity to inherit window by adding create event processing

Browse source
This commit is contained in:
Kang Yu 2025-01-30 19:04:03 -08:00
parent 362df4c720
commit 52231e20ab
2 changed files with 42 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -565,36 +565,6 @@ namespace PersistentWindows.Common
} }
} }
if (freezeCapture || !monitorApplications.ContainsKey(curDisplayKey))
return;
if (!windowProcessName.ContainsKey(hwnd))
return;
string proc_name = windowProcessName[hwnd];
if (!fullScreenGamingProcesses.Contains(proc_name))
{
var appWindows = CaptureWindowsOfInterest();
DateTime now = DateTime.Now;
foreach (var h in appWindows)
{
//restore windows of the same process name
if (!windowProcessName.ContainsKey(h))
continue;
if (proc_name != windowProcessName[h])
continue;
ApplicationDisplayMetrics curDisplayMetrics;
ApplicationDisplayMetrics prevDisplayMetrics;
//try to inherit from killed window database
bool isMoved = IsWindowMoved(curDisplayKey, h, 0, now, out curDisplayMetrics, out prevDisplayMetrics);
}
if (normalSessions.Contains(curDisplayKey))
{
process.PriorityClass = ProcessPriorityClass.High;
StartCaptureTimer(UserMoveLatency / 4);
}
}
} }
public bool Start(bool auto_restore_from_db, bool auto_restore_last_capture_at_startup) public bool Start(bool auto_restore_from_db, bool auto_restore_last_capture_at_startup)
@ -855,9 +825,9 @@ namespace PersistentWindows.Common
0, 0,
(uint)User32Events.WINEVENT_OUTOFCONTEXT)); (uint)User32Events.WINEVENT_OUTOFCONTEXT));
// capture window close // capture window create/close
this.winEventHooks.Add(User32.SetWinEventHook( this.winEventHooks.Add(User32.SetWinEventHook(
User32Events.EVENT_OBJECT_DESTROY, User32Events.EVENT_OBJECT_CREATE,
User32Events.EVENT_OBJECT_DESTROY, User32Events.EVENT_OBJECT_DESTROY,
IntPtr.Zero, IntPtr.Zero,
winEventsCaptureDelegate, winEventsCaptureDelegate,
@ -1831,19 +1801,10 @@ namespace PersistentWindows.Common
{ {
switch (eventType) switch (eventType)
{ {
case User32Events.EVENT_SYSTEM_MENUSTART:
case User32Events.EVENT_SYSTEM_MENUEND:
if (idObject == 0 || idObject == -1)
{
//TODO:
//context sensitive menu
}
break;
case User32Events.EVENT_SYSTEM_MINIMIZEEND: case User32Events.EVENT_SYSTEM_MINIMIZEEND:
case User32Events.EVENT_SYSTEM_MINIMIZESTART: case User32Events.EVENT_SYSTEM_MINIMIZESTART:
case User32Events.EVENT_SYSTEM_MOVESIZEEND: case User32Events.EVENT_SYSTEM_MOVESIZEEND:
// only care about child windows that are moved by user // child windows are not captured by default unless moved by user
//normalSessions.Add(curDisplayKey);
allUserMoveWindows.Add(hwnd); allUserMoveWindows.Add(hwnd);
break; break;
@ -1853,7 +1814,6 @@ namespace PersistentWindows.Common
default: default:
break; break;
//return;
} }
} }
@ -2033,6 +1993,44 @@ namespace PersistentWindows.Common
{ {
switch (eventType) switch (eventType)
{ {
case User32Events.EVENT_OBJECT_CREATE:
{
if (idObject != 0)
// ignore non-window object (caret etc)
return;
if (freezeCapture || !monitorApplications.ContainsKey(curDisplayKey))
return;
if (!windowProcessName.ContainsKey(hwnd))
return;
string proc_name = windowProcessName[hwnd];
if (fullScreenGamingProcesses.Contains(proc_name))
return;
var appWindows = CaptureWindowsOfInterest();
foreach (var h in appWindows)
{
//restore windows of the same process name
if (!windowProcessName.ContainsKey(h))
continue;
if (proc_name != windowProcessName[h])
continue;
if (monitorApplications[curDisplayKey].ContainsKey(h))
return;
DateTime now = DateTime.Now;
//restore windows of the same process name
ApplicationDisplayMetrics curDisplayMetrics;
ApplicationDisplayMetrics prevDisplayMetrics;
//try to inherit from killed window database
bool isMoved = IsWindowMoved(curDisplayKey, h, 0, now, out curDisplayMetrics, out prevDisplayMetrics);
}
}
break;
case User32Events.EVENT_SYSTEM_FOREGROUND: case User32Events.EVENT_SYSTEM_FOREGROUND:
{ {
var cur_vdi = VirtualDesktop.GetWindowDesktopId(hwnd); var cur_vdi = VirtualDesktop.GetWindowDesktopId(hwnd);

1
Ninjacrab.PersistentWindows.Solution/Common/WinApiBridge/User32.cs
View file

@ -41,6 +41,7 @@ namespace PersistentWindows.Common.WinApiBridge
EVENT_SYSTEM_IME_KEY_NOTIFICATION = 0x0029, EVENT_SYSTEM_IME_KEY_NOTIFICATION = 0x0029,
EVENT_SYSTEM_END = 0x00FF, EVENT_SYSTEM_END = 0x00FF,
EVENT_OBJECT_CREATE = 0x8000,
EVENT_OBJECT_DESTROY = 0x8001, EVENT_OBJECT_DESTROY = 0x8001,
EVENT_OBJECT_REORDER = 0x8004, EVENT_OBJECT_REORDER = 0x8004,
EVENT_OBJECT_LOCATIONCHANGE = 0x800B, EVENT_OBJECT_LOCATIONCHANGE = 0x800B,