This reverts commit 89653d5db46419d2a80898635cb27fed64898db2. Reason for revert: Tentatively revert since I believe this break remoting unittests on Asan/Tsan https://chromium-review.googlesource.com/c/chromium/src/+/1063330 https://chromium-swarm.appspot.com/task?id=3d8692bedcc85c10&refresh=10&show_raw=1 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} TBR=zijiehe@chromium.org,jamiewalch@chromium.org,perkj@webrtc.org,braveyao@webrtc.org Change-Id: Ica02365925623e21b256d20a21b5625e7ed6f49b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:9178 Reviewed-on: https://webrtc-review.googlesource.com/77461 Reviewed-by: Per Kjellander <perkj@webrtc.org> Commit-Queue: Per Kjellander <perkj@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23280}
112 lines
3.8 KiB
C++
112 lines
3.8 KiB
C++
/*
|
|
* Copyright (c) 2013 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.
|
|
*/
|
|
|
|
#ifndef MODULES_DESKTOP_CAPTURE_MOUSE_CURSOR_MONITOR_H_
|
|
#define MODULES_DESKTOP_CAPTURE_MOUSE_CURSOR_MONITOR_H_
|
|
|
|
#include <memory>
|
|
|
|
#include "modules/desktop_capture/desktop_capture_types.h"
|
|
#include "modules/desktop_capture/desktop_geometry.h"
|
|
#include "typedefs.h" // NOLINT(build/include)
|
|
|
|
namespace webrtc {
|
|
|
|
class DesktopCaptureOptions;
|
|
class DesktopFrame;
|
|
class MouseCursor;
|
|
|
|
// Captures mouse shape and position.
|
|
class MouseCursorMonitor {
|
|
public:
|
|
// Deprecated: CursorState will not be provided.
|
|
enum CursorState {
|
|
// Cursor on top of the window including window decorations.
|
|
INSIDE,
|
|
|
|
// Cursor is outside of the window.
|
|
OUTSIDE,
|
|
};
|
|
|
|
enum Mode {
|
|
// Capture only shape of the mouse cursor, but not position.
|
|
SHAPE_ONLY,
|
|
|
|
// Capture both, mouse cursor shape and position.
|
|
SHAPE_AND_POSITION,
|
|
};
|
|
|
|
// Callback interface used to pass current mouse cursor position and shape.
|
|
class Callback {
|
|
public:
|
|
// Called in response to Capture() when the cursor shape has changed. Must
|
|
// take ownership of |cursor|.
|
|
virtual void OnMouseCursor(MouseCursor* cursor) = 0;
|
|
|
|
// Called in response to Capture(). |position| indicates cursor position
|
|
// relative to the |window| specified in the constructor.
|
|
// Deprecated: use the following overload instead.
|
|
virtual void OnMouseCursorPosition(CursorState state,
|
|
const DesktopVector& position) = 0;
|
|
|
|
// Called in response to Capture(). |position| indicates cursor absolute
|
|
// position on the system in fullscreen coordinate, i.e. the top-left
|
|
// monitor always starts from (0, 0).
|
|
// TODO(zijiehe): Ensure all implementations return the absolute position.
|
|
// TODO(zijiehe): Make this function pure virtual after Chromium changes.
|
|
// TODO(zijiehe): Current this overload works correctly only when capturing
|
|
// mouse cursor against fullscreen.
|
|
virtual void OnMouseCursorPosition(const DesktopVector& position) {}
|
|
|
|
protected:
|
|
virtual ~Callback() {}
|
|
};
|
|
|
|
virtual ~MouseCursorMonitor() {}
|
|
|
|
// Creates a capturer that notifies of mouse cursor events while the cursor is
|
|
// over the specified window.
|
|
//
|
|
// Deprecated: use Create() function.
|
|
static MouseCursorMonitor* CreateForWindow(
|
|
const DesktopCaptureOptions& options,
|
|
WindowId window);
|
|
|
|
// Creates a capturer that monitors the mouse cursor shape and position over
|
|
// the specified screen.
|
|
//
|
|
// Deprecated: use Create() function.
|
|
static MouseCursorMonitor* CreateForScreen(
|
|
const DesktopCaptureOptions& options,
|
|
ScreenId screen);
|
|
|
|
// Creates a capturer that monitors the mouse cursor shape and position across
|
|
// the entire desktop. The capturer ensures that the top-left monitor starts
|
|
// from (0, 0).
|
|
static std::unique_ptr<MouseCursorMonitor> Create(
|
|
const DesktopCaptureOptions& options);
|
|
|
|
// Initializes the monitor with the |callback|, which must remain valid until
|
|
// capturer is destroyed.
|
|
virtual void Init(Callback* callback, Mode mode) = 0;
|
|
|
|
// Captures current cursor shape and position (depending on the |mode| passed
|
|
// to Init()). Calls Callback::OnMouseCursor() if cursor shape has
|
|
// changed since the last call (or when Capture() is called for the first
|
|
// time) and then Callback::OnMouseCursorPosition() if mode is set to
|
|
// SHAPE_AND_POSITION.
|
|
virtual void Capture() = 0;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_DESKTOP_CAPTURE_MOUSE_CURSOR_MONITOR_H_
|
|
|