Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 12:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1689945 - Update display info when WM_DISPLAYCHANGE happens r=jrmuizel

Browse Source 
GfxInfo::RefreshMonitors() could not be called in ScreenHelperWin::RefreshScreens(), since the RefreshScreens() is called within nsAppShell::Init(). Then GfxInfo::RefreshMonitors() is called during WM_DISPLAYCHANGE event handling.

Differential Revision: https://phabricator.services.mozilla.com/D103661
This commit is contained in:
sotaro 2021-02-04 23:25:35 +00:00
parent c045cd7489
commit ee841fc548
7 changed files with 51 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gfx/tests/gtest/TestConfigManager.cpp
View File

@ -93,6 +93,7 @@ class MockGfxInfo final : public nsIGfxInfo {
JS::MutableHandleValue _retval) override {
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHOD RefreshMonitors(void) override { return NS_ERROR_NOT_IMPLEMENTED; }
NS_IMETHOD GetFailures(nsTArray<int32_t>& indices,
nsTArray<nsCString>& failures) override {
return NS_ERROR_NOT_IMPLEMENTED;

3
widget/GfxInfoBase.cpp
View File

@ -1473,6 +1473,9 @@ GfxInfoBase::GetMonitors(JSContext* aCx, JS::MutableHandleValue aResult) {
return NS_OK;
}
NS_IMETHODIMP
GfxInfoBase::RefreshMonitors() { return NS_ERROR_NOT_IMPLEMENTED; }
static inline bool SetJSPropertyString(JSContext* aCx,
JS::Handle<JSObject*> aObj,
const char* aProp, const char* aString) {

1
widget/GfxInfoBase.h
View File

@ -56,6 +56,7 @@ class GfxInfoBase : public nsIGfxInfo,
NS_IMETHOD GetMonitors(JSContext* cx,
JS::MutableHandleValue _retval) override;
NS_IMETHOD RefreshMonitors() override;
NS_IMETHOD GetFailures(nsTArray<int32_t>& indices,
nsTArray<nsCString>& failures) override;
NS_IMETHOD_(void) LogFailure(const nsACString& failure) override;

2
widget/nsIGfxInfo.idl
View File

@ -98,6 +98,8 @@ interface nsIGfxInfo : nsISupports
[implicit_jscontext]
jsval getMonitors();
void refreshMonitors();
Array<ACString> getFailures(out Array<long> indices);
[noscript, notxpcom] void logFailure(in ACString failure);

68
widget/windows/GfxInfo.cpp
View File

@ -867,36 +867,7 @@ nsresult GfxInfo::Init() {
}
// Get monitor information
for (int deviceIndex = 0;; deviceIndex++) {
DISPLAY_DEVICEW device;
device.cb = sizeof(device);
if (!::EnumDisplayDevicesW(nullptr, deviceIndex, &device, 0)) {
break;
}
if (!(device.StateFlags & DISPLAY_DEVICE_ACTIVE)) {
continue;
}
DEVMODEW mode;
mode.dmSize = sizeof(mode);
mode.dmDriverExtra = 0;
if (!::EnumDisplaySettingsW(device.DeviceName, ENUM_CURRENT_SETTINGS,
&mode)) {
continue;
}
DisplayInfo displayInfo;
displayInfo.mScreenWidth = mode.dmPelsWidth;
displayInfo.mScreenHeight = mode.dmPelsHeight;
displayInfo.mRefreshRate = mode.dmDisplayFrequency;
displayInfo.mIsPseudoDisplay =
!!(device.StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER);
displayInfo.mDeviceString = device.DeviceString;
mDisplayInfo.AppendElement(displayInfo);
}
RefreshMonitors();
const char* spoofedDriverVersionString =
PR_GetEnv("MOZ_GFX_SPOOF_DRIVER_VERSION");
@ -931,6 +902,43 @@ GfxInfo::GetAdapterDescription2(nsAString& aAdapterDescription) {
return NS_OK;
}
NS_IMETHODIMP
GfxInfo::RefreshMonitors() {
mDisplayInfo.Clear();
for (int deviceIndex = 0;; deviceIndex++) {
DISPLAY_DEVICEW device;
device.cb = sizeof(device);
if (!::EnumDisplayDevicesW(nullptr, deviceIndex, &device, 0)) {
break;
}
if (!(device.StateFlags & DISPLAY_DEVICE_ACTIVE)) {
continue;
}
DEVMODEW mode;
mode.dmSize = sizeof(mode);
mode.dmDriverExtra = 0;
if (!::EnumDisplaySettingsW(device.DeviceName, ENUM_CURRENT_SETTINGS,
&mode)) {
continue;
}
DisplayInfo displayInfo;
displayInfo.mScreenWidth = mode.dmPelsWidth;
displayInfo.mScreenHeight = mode.dmPelsHeight;
displayInfo.mRefreshRate = mode.dmDisplayFrequency;
displayInfo.mIsPseudoDisplay =
!!(device.StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER);
displayInfo.mDeviceString = device.DeviceString;
mDisplayInfo.AppendElement(displayInfo);
}
return NS_OK;
}
NS_IMETHODIMP
GfxInfo::GetAdapterRAM(uint32_t* aAdapterRAM) {
uint32_t result = 0;

2
widget/windows/GfxInfo.h
View File

@ -66,6 +66,8 @@ class GfxInfo : public GfxInfoBase {
nsresult FindMonitors(JSContext* cx, JS::HandleObject array) override;
NS_IMETHOD RefreshMonitors() override;
#ifdef DEBUG
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIGFXINFODEBUG

4
widget/windows/nsWindow.cpp
View File

@ -5967,6 +5967,10 @@ bool nsWindow::ProcessMessage(UINT msg, WPARAM& wParam, LPARAM& lParam,
case WM_DISPLAYCHANGE: {
ScreenHelperWin::RefreshScreens();
nsCOMPtr<nsIGfxInfo> gfxInfo = services::GetGfxInfo();
if (gfxInfo) {
gfxInfo->RefreshMonitors();
}
if (mWidgetListener) {
mWidgetListener->UIResolutionChanged();
}