90394a4db3
This is a reland of 89653d5db46419d2a80898635cb27fed64898db2 Original change's description: > [desktopCapture] Unify the position info in DIP coordinates on Mac. > > On OSX, the logical(DIP) and physical coordinates are used mixingly. > For example, the captured image has its size in physical pixels(2x) and > location in logical(DIP) pixels. Same to the cursor position. This > causes trouble when we check the relative position of image and cursor > when there are multiple monitors with different DIP setting connected. > > This cl proposed a solution to use DIP pixel for any location info, > i.e. top-left of a frame and cursor position. Also propose a method to > get the current scale factor of a window across multiple monitors. And > save the current scale factor in DPI of the capture frame. > Then we can check relative position of cursor and frame correctly > in DIP pixel and compose them in physical pixel. > > Bug: webrtc:9178 > Change-Id: I3c076aeac2d6f2c1f63d000d7fff03500aa375ac > Reviewed-on: https://webrtc-review.googlesource.com/71621 > Reviewed-by: Jamie Walch <jamiewalch@chromium.org> > Reviewed-by: Zijie He <zijiehe@chromium.org> > Commit-Queue: Brave Yao <braveyao@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#23263} Bug: webrtc:9178 Change-Id: I97d9150f7b9a4ed6671733b75613ea9c315d5c1d Reviewed-on: https://webrtc-review.googlesource.com/77481 Reviewed-by: Zijie He <zijiehe@chromium.org> Commit-Queue: Brave Yao <braveyao@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23289}
52 lines
1.6 KiB
Plaintext
52 lines
1.6 KiB
Plaintext
/*
|
|
* Copyright (c) 2017 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/window_finder_mac.h"
|
|
|
|
#include <CoreFoundation/CoreFoundation.h>
|
|
|
|
#include <utility>
|
|
|
|
#include "modules/desktop_capture/mac/window_list_utils.h"
|
|
#include "modules/desktop_capture/mac/desktop_configuration.h"
|
|
#include "modules/desktop_capture/mac/desktop_configuration_monitor.h"
|
|
#include "rtc_base/ptr_util.h"
|
|
|
|
namespace webrtc {
|
|
|
|
WindowFinderMac::WindowFinderMac(
|
|
rtc::scoped_refptr<DesktopConfigurationMonitor> configuration_monitor)
|
|
: configuration_monitor_(std::move(configuration_monitor)) {}
|
|
WindowFinderMac::~WindowFinderMac() = default;
|
|
|
|
WindowId WindowFinderMac::GetWindowUnderPoint(DesktopVector point) {
|
|
WindowId id = kNullWindowId;
|
|
GetWindowList(
|
|
[&id, point](CFDictionaryRef window) {
|
|
DesktopRect bounds;
|
|
bounds = GetWindowBounds(window);
|
|
if (bounds.Contains(point)) {
|
|
id = GetWindowId(window);
|
|
return false;
|
|
}
|
|
return true;
|
|
},
|
|
true);
|
|
return id;
|
|
}
|
|
|
|
// static
|
|
std::unique_ptr<WindowFinder> WindowFinder::Create(
|
|
const WindowFinder::Options& options) {
|
|
return rtc::MakeUnique<WindowFinderMac>(options.configuration_monitor);
|
|
}
|
|
|
|
} // namespace webrtc
|