Skip to content

refactor: improve list_windows #184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 11, 2025
Merged

refactor: improve list_windows #184

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 14 additions & 22 deletions src/utils/window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,37 +235,29 @@ pub fn list_windows(
owner_hwnds.push(get_owner_window(hwnd))
}
for (hwnd, title) in valid_hwnds.into_iter() {
let mut rs_module_path = "".to_string();
if let Some(module_path) = get_module_path(get_window_pid(hwnd)) {
rs_module_path = module_path;
let mut module_path = "".to_string();
if let Some(v) = get_module_path(get_window_pid(hwnd)) {
module_path = v;
}
if !rs_module_path.is_empty()
&& rs_module_path != "C:\\Windows\\System32\\ApplicationFrameHost.exe"
{
result
.entry(rs_module_path)
.or_default()
.push((hwnd, title));
continue;
}
if let Some((i, _)) = owner_hwnds.iter().enumerate().find(|(_, v)| **v == hwnd) {
if let Some(module_path) = get_module_path(get_window_pid(hwnds[i])) {
rs_module_path = module_path;
if !is_valid_module_path(&module_path) {
if let Some((i, _)) = owner_hwnds.iter().enumerate().find(|(_, v)| **v == hwnd) {
if let Some(v) = get_module_path(get_window_pid(hwnds[i])) {
module_path = v;
}
}
}
if !rs_module_path.is_empty()
&& rs_module_path != "C:\\Windows\\System32\\ApplicationFrameHost.exe"
{
result
.entry(rs_module_path)
.or_default()
.push((hwnd, title));
if is_valid_module_path(&module_path) {
result.entry(module_path).or_default().push((hwnd, title));
}
}
debug!("list windows {:?}", result);
Ok(result)
}

fn is_valid_module_path(module_path: &str) -> bool {
!module_path.is_empty() && module_path != "C:\\Windows\\System32\\ApplicationFrameHost.exe"
}

extern "system" fn enum_window(hwnd: HWND, lparam: LPARAM) -> BOOL {
let windows: &mut Vec<HWND> = unsafe { &mut *(lparam.0 as *mut Vec<HWND>) };
windows.push(hwnd);
Expand Down