Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(64)

Side by Side Diff: ui/gfx/screen_mac.mm

Issue 341983008: Listen to Display reconfiguration and notify DisplayObservers on Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mac_display
Patch Set: review comments Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/gfx/screen.h" 5 #include "ui/gfx/screen.h"
6 6
7 #import <ApplicationServices/ApplicationServices.h> 7 #import <ApplicationServices/ApplicationServices.h>
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include <map> 10 #include <map>
11 11
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/mac/sdk_forward_declarations.h" 13 #include "base/mac/sdk_forward_declarations.h"
14 #include "base/timer/timer.h"
14 #include "ui/gfx/display.h" 15 #include "ui/gfx/display.h"
16 #include "ui/gfx/screen_display_observer_delegate.h"
15 17
16 namespace { 18 namespace {
17 19
20 // The delay to handle the display configuration changes.
21 // See comments in ScreenMac::HandleDisplayReconfiguration.
22 const int64 kConfigureDelayMs = 500;
23
18 gfx::Rect ConvertCoordinateSystem(NSRect ns_rect) { 24 gfx::Rect ConvertCoordinateSystem(NSRect ns_rect) {
19 // Primary monitor is defined as the monitor with the menubar, 25 // Primary monitor is defined as the monitor with the menubar,
20 // which is always at index 0. 26 // which is always at index 0.
21 NSScreen* primary_screen = [[NSScreen screens] objectAtIndex:0]; 27 NSScreen* primary_screen = [[NSScreen screens] objectAtIndex:0];
22 float primary_screen_height = [primary_screen frame].size.height; 28 float primary_screen_height = [primary_screen frame].size.height;
23 gfx::Rect rect(NSRectToCGRect(ns_rect)); 29 gfx::Rect rect(NSRectToCGRect(ns_rect));
24 rect.set_y(primary_screen_height - rect.y() - rect.height()); 30 rect.set_y(primary_screen_height - rect.y() - rect.height());
25 return rect; 31 return rect;
26 } 32 }
27 33
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 scale = [screen userSpaceScaleFactor]; 77 scale = [screen userSpaceScaleFactor];
72 display.set_device_scale_factor(scale); 78 display.set_device_scale_factor(scale);
73 // CGDisplayRotation returns a double. Display::SetRotationAsDegree will 79 // CGDisplayRotation returns a double. Display::SetRotationAsDegree will
74 // handle the unexpected situations were the angle is not a multiple of 90. 80 // handle the unexpected situations were the angle is not a multiple of 90.
75 display.SetRotationAsDegree(static_cast<int>(CGDisplayRotation(display_id))); 81 display.SetRotationAsDegree(static_cast<int>(CGDisplayRotation(display_id)));
76 return display; 82 return display;
77 } 83 }
78 84
79 class ScreenMac : public gfx::Screen { 85 class ScreenMac : public gfx::Screen {
80 public: 86 public:
81 ScreenMac() {} 87 ScreenMac() {
88 displays_ = BuildDisplaysFromQuartz();
89
90 CGDisplayRegisterReconfigurationCallback(
91 ScreenMac::DisplayReconfigurationCallBack, this);
92 }
82 93
83 virtual bool IsDIPEnabled() OVERRIDE { 94 virtual bool IsDIPEnabled() OVERRIDE {
84 return true; 95 return true;
85 } 96 }
86 97
87 virtual gfx::Point GetCursorScreenPoint() OVERRIDE { 98 virtual gfx::Point GetCursorScreenPoint() OVERRIDE {
88 NSPoint mouseLocation = [NSEvent mouseLocation]; 99 NSPoint mouseLocation = [NSEvent mouseLocation];
89 // Flip coordinates to gfx (0,0 in top-left corner) using primary screen. 100 // Flip coordinates to gfx (0,0 in top-left corner) using primary screen.
90 NSScreen* screen = [[NSScreen screens] objectAtIndex:0]; 101 NSScreen* screen = [[NSScreen screens] objectAtIndex:0];
91 mouseLocation.y = NSMaxY([screen frame]) - mouseLocation.y; 102 mouseLocation.y = NSMaxY([screen frame]) - mouseLocation.y;
(...skipping 10 matching lines...) Expand all
102 NOTIMPLEMENTED(); 113 NOTIMPLEMENTED();
103 return gfx::NativeWindow(); 114 return gfx::NativeWindow();
104 } 115 }
105 116
106 virtual int GetNumDisplays() const OVERRIDE { 117 virtual int GetNumDisplays() const OVERRIDE {
107 return GetAllDisplays().size(); 118 return GetAllDisplays().size();
108 119
109 } 120 }
110 121
111 virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE { 122 virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE {
112 // Don't just return all online displays. This would include displays 123 return displays_;
113 // that mirror other displays, which are not desired in this list. It's
114 // tempting to use the count returned by CGGetActiveDisplayList, but active
115 // displays exclude sleeping displays, and those are desired.
116
117 // It would be ridiculous to have this many displays connected, but
118 // CGDirectDisplayID is just an integer, so supporting up to this many
119 // doesn't hurt.
120 CGDirectDisplayID online_displays[128];
121 CGDisplayCount online_display_count = 0;
122 if (CGGetOnlineDisplayList(arraysize(online_displays),
123 online_displays,
124 &online_display_count) != kCGErrorSuccess) {
125 return std::vector<gfx::Display>(1, GetPrimaryDisplay());
126 }
127
128 typedef std::map<int64, NSScreen*> ScreenIdsToScreensMap;
129 ScreenIdsToScreensMap screen_ids_to_screens;
130 for (NSScreen* screen in [NSScreen screens]) {
131 NSDictionary* screen_device_description = [screen deviceDescription];
132 int64 screen_id = [[screen_device_description
133 objectForKey:@"NSScreenNumber"] unsignedIntValue];
134 screen_ids_to_screens[screen_id] = screen;
135 }
136
137 std::vector<gfx::Display> displays;
138 for (CGDisplayCount online_display_index = 0;
139 online_display_index < online_display_count;
140 ++online_display_index) {
141 CGDirectDisplayID online_display = online_displays[online_display_index];
142 if (CGDisplayMirrorsDisplay(online_display) == kCGNullDirectDisplay) {
143 // If this display doesn't mirror any other, include it in the list.
144 // The primary display in a mirrored set will be counted, but those that
145 // mirror it will not be.
146 ScreenIdsToScreensMap::iterator foundScreen =
147 screen_ids_to_screens.find(online_display);
148 if (foundScreen != screen_ids_to_screens.end()) {
149 displays.push_back(GetDisplayForScreen(foundScreen->second));
150 }
151 }
152 }
153
154 if (!displays.size())
155 return std::vector<gfx::Display>(1, GetPrimaryDisplay());
156
157 return displays;
158 } 124 }
159 125
160 virtual gfx::Display GetDisplayNearestWindow( 126 virtual gfx::Display GetDisplayNearestWindow(
161 gfx::NativeView view) const OVERRIDE { 127 gfx::NativeView view) const OVERRIDE {
162 NSWindow* window = nil; 128 NSWindow* window = nil;
163 #if !defined(USE_AURA) 129 #if !defined(USE_AURA)
164 window = [view window]; 130 window = [view window];
165 #endif 131 #endif
166 if (!window) 132 if (!window)
167 return GetPrimaryDisplay(); 133 return GetPrimaryDisplay();
(...skipping 27 matching lines...) Expand all
195 // Returns the primary display. 161 // Returns the primary display.
196 virtual gfx::Display GetPrimaryDisplay() const OVERRIDE { 162 virtual gfx::Display GetPrimaryDisplay() const OVERRIDE {
197 // Primary display is defined as the display with the menubar, 163 // Primary display is defined as the display with the menubar,
198 // which is always at index 0. 164 // which is always at index 0.
199 NSScreen* primary = [[NSScreen screens] objectAtIndex:0]; 165 NSScreen* primary = [[NSScreen screens] objectAtIndex:0];
200 gfx::Display display = GetDisplayForScreen(primary); 166 gfx::Display display = GetDisplayForScreen(primary);
201 return display; 167 return display;
202 } 168 }
203 169
204 virtual void AddObserver(gfx::DisplayObserver* observer) OVERRIDE { 170 virtual void AddObserver(gfx::DisplayObserver* observer) OVERRIDE {
205 // TODO(oshima): crbug.com/122863. 171 observer_delegate_.AddObserver(observer);
206 } 172 }
207 173
208 virtual void RemoveObserver(gfx::DisplayObserver* observer) OVERRIDE { 174 virtual void RemoveObserver(gfx::DisplayObserver* observer) OVERRIDE {
209 // TODO(oshima): crbug.com/122863. 175 observer_delegate_.RemoveObserver(observer);
176 }
177
178 static void DisplayReconfigurationCallBack(CGDirectDisplayID display,
179 CGDisplayChangeSummaryFlags flags,
180 void* userInfo) {
181 if (flags & kCGDisplayBeginConfigurationFlag)
182 return;
183
184 static_cast<ScreenMac*>(userInfo)->HandleDisplayReconfiguration();
185 }
186
187 void HandleDisplayReconfiguration() {
188 // Given that we need to rebuild the list of displays, we want to coalesce
189 // the events. For that, we use a timer that will be reset every time we get
190 // a new event and will be fulfilled kConfigureDelayMs after the latest.
191 if (configure_timer_.get() && configure_timer_->IsRunning()) {
192 configure_timer_->Reset();
193 return;
194 }
195
196 configure_timer_.reset(new base::OneShotTimer<ScreenMac>());
197 configure_timer_->Start(
198 FROM_HERE,
199 base::TimeDelta::FromMilliseconds(kConfigureDelayMs),
200 this,
201 &ScreenMac::ConfigureTimerFired);
210 } 202 }
211 203
212 private: 204 private:
205 void ConfigureTimerFired() {
206 std::vector<gfx::Display> old_displays = displays_;
207 displays_ = BuildDisplaysFromQuartz();
208
209 observer_delegate_.NotifyDisplaysChanged(old_displays, displays_);
210 }
211
212 std::vector<gfx::Display> BuildDisplaysFromQuartz() const {
213 // Don't just return all online displays. This would include displays
214 // that mirror other displays, which are not desired in this list. It's
215 // tempting to use the count returned by CGGetActiveDisplayList, but active
216 // displays exclude sleeping displays, and those are desired.
217
218 // It would be ridiculous to have this many displays connected, but
219 // CGDirectDisplayID is just an integer, so supporting up to this many
220 // doesn't hurt.
221 CGDirectDisplayID online_displays[128];
222 CGDisplayCount online_display_count = 0;
223 if (CGGetOnlineDisplayList(arraysize(online_displays),
224 online_displays,
225 &online_display_count) != kCGErrorSuccess) {
226 return std::vector<gfx::Display>(1, GetPrimaryDisplay());
227 }
228
229 typedef std::map<int64, NSScreen*> ScreenIdsToScreensMap;
230 ScreenIdsToScreensMap screen_ids_to_screens;
231 for (NSScreen* screen in [NSScreen screens]) {
232 NSDictionary* screen_device_description = [screen deviceDescription];
233 int64 screen_id = [[screen_device_description
234 objectForKey:@"NSScreenNumber"] unsignedIntValue];
235 screen_ids_to_screens[screen_id] = screen;
236 }
237
238 std::vector<gfx::Display> displays;
239 for (CGDisplayCount online_display_index = 0;
240 online_display_index < online_display_count;
241 ++online_display_index) {
242 CGDirectDisplayID online_display = online_displays[online_display_index];
243 if (CGDisplayMirrorsDisplay(online_display) == kCGNullDirectDisplay) {
244 // If this display doesn't mirror any other, include it in the list.
245 // The primary display in a mirrored set will be counted, but those that
246 // mirror it will not be.
247 ScreenIdsToScreensMap::iterator foundScreen =
248 screen_ids_to_screens.find(online_display);
249 if (foundScreen != screen_ids_to_screens.end()) {
250 displays.push_back(GetDisplayForScreen(foundScreen->second));
251 }
252 }
253 }
254
255 if (!displays.size())
256 return std::vector<gfx::Display>(1, GetPrimaryDisplay());
257
258 return displays;
259 }
260
261 // The displays currently attached to the device.
262 std::vector<gfx::Display> displays_;
263
264 // The timer to delay configuring outputs. See also the comments in
265 // HandleDisplayReconfiguration().
266 scoped_ptr<base::OneShotTimer<ScreenMac> > configure_timer_;
267
268 ScreenDisplayObserverDelegate observer_delegate_;
269
213 DISALLOW_COPY_AND_ASSIGN(ScreenMac); 270 DISALLOW_COPY_AND_ASSIGN(ScreenMac);
214 }; 271 };
215 272
216 } // namespace 273 } // namespace
217 274
218 namespace gfx { 275 namespace gfx {
219 276
220 #if !defined(USE_AURA) 277 #if !defined(USE_AURA)
221 Screen* CreateNativeScreen() { 278 Screen* CreateNativeScreen() {
222 return new ScreenMac; 279 return new ScreenMac;
223 } 280 }
224 #endif 281 #endif
225 282
226 } 283 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698