e8ef87bdad
This change adds logic to WindowCapturerWin to capture overlapping owned/pop-up windows (e.g. menus, dialogs, tooltips). This makes window capture behavior more consistent regardless of whether CroppingWindowCapturerWin is used & its conditions for using crop-from- screen capture are met (in ShouldUseScreenCapturer). (I.e. regardless of OS version, window shape / translucency, occlusion by another potentially top-most window, or whether the capturing app has opted in to using the cropping capturer). Owned/pop-up windows associated with the selected window are enumerated then captured individually, with their contents composited into the final frame. This change also: - Crops out the top window border (which exposed a bit of the background when using the cropping capturer, and resulted in an inconsistent appearance compared to the side & bottom borders being cropped out). Bug: chromium:980864 Change-Id: I81c504848a0c0e6bf122aeff437b400e44944718 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/148302 Commit-Queue: Jamie Walch <jamiewalch@chromium.org> Reviewed-by: Jamie Walch <jamiewalch@chromium.org> Cr-Commit-Position: refs/heads/master@{#28922}
61 lines
2.2 KiB
C++
61 lines
2.2 KiB
C++
/*
|
|
* Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "modules/desktop_capture/win/selected_window_context.h"
|
|
|
|
namespace webrtc {
|
|
|
|
SelectedWindowContext::SelectedWindowContext(
|
|
HWND selected_window,
|
|
DesktopRect selected_window_rect,
|
|
WindowCaptureHelperWin* window_capture_helper)
|
|
: selected_window_(selected_window),
|
|
selected_window_rect_(selected_window_rect),
|
|
window_capture_helper_(window_capture_helper) {
|
|
selected_window_thread_id_ =
|
|
GetWindowThreadProcessId(selected_window, &selected_window_process_id_);
|
|
}
|
|
|
|
bool SelectedWindowContext::IsSelectedWindowValid() const {
|
|
return selected_window_thread_id_ != 0;
|
|
}
|
|
|
|
bool SelectedWindowContext::IsWindowSelected(HWND hwnd) const {
|
|
return hwnd == selected_window_;
|
|
}
|
|
|
|
bool SelectedWindowContext::IsWindowOwned(HWND hwnd) const {
|
|
// This check works for drop-down menus & dialog pop-up windows. It doesn't
|
|
// work for context menus or tooltips, which are handled differently below.
|
|
if (GetAncestor(hwnd, GA_ROOTOWNER) == selected_window_) {
|
|
return true;
|
|
}
|
|
|
|
// Some pop-up windows aren't owned (e.g. context menus, tooltips); treat
|
|
// windows that belong to the same thread as owned.
|
|
DWORD enumerated_window_process_id = 0;
|
|
DWORD enumerated_window_thread_id =
|
|
GetWindowThreadProcessId(hwnd, &enumerated_window_process_id);
|
|
return enumerated_window_thread_id != 0 &&
|
|
enumerated_window_process_id == selected_window_process_id_ &&
|
|
enumerated_window_thread_id == selected_window_thread_id_;
|
|
}
|
|
|
|
bool SelectedWindowContext::IsWindowOverlapping(HWND hwnd) const {
|
|
return window_capture_helper_->IsWindowIntersectWithSelectedWindow(
|
|
hwnd, selected_window_, selected_window_rect_);
|
|
}
|
|
|
|
WindowCaptureHelperWin* SelectedWindowContext::window_capture_helper() const {
|
|
return window_capture_helper_;
|
|
}
|
|
|
|
} // namespace webrtc
|