Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 10:05:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix : handle localised default monitor names

Browse Source 
If your OS is not in English you won't have "Generic PnP Monitor" so the test will succeed inspite of having a localised default monitor name.

I changed the test to look for the output port between parenthesis as this is how the monitor will look like when driver is installed AFAICT.
This commit is contained in:
Scr3amer 2023-09-26 08:36:40 -04:00 committed by GitHub
parent 99ed2a3d22
commit 9f7a40059e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/win32_monitor.c
View File

@ -182,6 +182,14 @@ char* tryGetAccurateMonitorName(const WCHAR *deviceName)
return monitorName; return monitorName;
} }
BOOL nameContainsOutputPort(const char *const i_nameToCheck)
{
const size_t nameLength = strlen(i_nameToCheck);
const char lastChar = i_nameToCheck[nameLength - 1];
return lastChar == ')'; // Non generic initial names contain the output port use. E.g. MonitorName(DisplayPort)
}
// Callback for EnumDisplayMonitors in createMonitor // Callback for EnumDisplayMonitors in createMonitor
// //
static BOOL CALLBACK monitorCallback(HMONITOR handle, static BOOL CALLBACK monitorCallback(HMONITOR handle,
@ -205,7 +213,7 @@ static BOOL CALLBACK monitorCallback(HMONITOR handle,
monitor->win32.handle = handle; monitor->win32.handle = handle;
// If the monitor driver is installed, we will already have an accurate name for the monitor. // If the monitor driver is installed, we will already have an accurate name for the monitor.
if (strcmp(monitor->name, "Generic PnP Monitor") != 0) if (nameContainsOutputPort(monitor->name))
return TRUE; return TRUE;
accurateMonitorName = tryGetAccurateMonitorName(mi.szDevice); accurateMonitorName = tryGetAccurateMonitorName(mi.szDevice);