merge
This commit is contained in:
parent
dc24c97b59
commit
69e3eb4372
56
src/external/RGFW.h
vendored
56
src/external/RGFW.h
vendored
|
|
@ -6604,13 +6604,6 @@ RGFW_event* RGFW_window_checkEvent(RGFW_window* win) {
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if(_WIN32_WINNT >= 0x0600)
|
|
||||||
case WM_DWMCOMPOSITIONCHANGED:
|
|
||||||
case WM_DWMCOLORIZATIONCOLORCHANGED:
|
|
||||||
RGFW_win32_makeWindowTransparent(win);
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
case WM_MOUSELEAVE:
|
case WM_MOUSELEAVE:
|
||||||
win->event.type = RGFW_mouseLeave;
|
win->event.type = RGFW_mouseLeave;
|
||||||
win->_flags |= RGFW_MOUSE_LEFT;
|
win->_flags |= RGFW_MOUSE_LEFT;
|
||||||
|
|
@ -6650,7 +6643,6 @@ RGFW_event* RGFW_window_checkEvent(RGFW_window* win) {
|
||||||
RGFW_keyCallback(win, win->event.key, win->event.keyChar, win->event.keyMod, 0);
|
RGFW_keyCallback(win, win->event.key, win->event.keyChar, win->event.keyMod, 0);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case WM_SYSKEYDOWN: case WM_KEYDOWN: {
|
|
||||||
case WM_SYSKEYDOWN: case WM_KEYDOWN: {
|
case WM_SYSKEYDOWN: case WM_KEYDOWN: {
|
||||||
i32 scancode = (HIWORD(msg.lParam) & (KF_EXTENDED | 0xff));
|
i32 scancode = (HIWORD(msg.lParam) & (KF_EXTENDED | 0xff));
|
||||||
if (scancode == 0)
|
if (scancode == 0)
|
||||||
|
|
@ -6912,7 +6904,6 @@ RGFW_monitor win32CreateMonitor(HMONITOR src) {
|
||||||
monitor.scaleX = dpiX / 96.0f;
|
monitor.scaleX = dpiX / 96.0f;
|
||||||
monitor.scaleY = dpiY / 96.0f;
|
monitor.scaleY = dpiY / 96.0f;
|
||||||
monitor.pixelRatio = dpiX >= 192.0f ? 2 : 1;
|
monitor.pixelRatio = dpiX >= 192.0f ? 2 : 1;
|
||||||
monitor.pixelRatio = dpiX >= 192.0f ? 2 : 1;
|
|
||||||
|
|
||||||
monitor.physW = GetDeviceCaps(hdc, HORZSIZE) / 25.4;
|
monitor.physW = GetDeviceCaps(hdc, HORZSIZE) / 25.4;
|
||||||
monitor.physH = GetDeviceCaps(hdc, VERTSIZE) / 25.4;
|
monitor.physH = GetDeviceCaps(hdc, VERTSIZE) / 25.4;
|
||||||
|
|
@ -7025,53 +7016,6 @@ RGFW_bool RGFW_monitor_requestMode(RGFW_monitor mon, RGFW_monitorMode mode, RGFW
|
||||||
return RGFW_FALSE;
|
return RGFW_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
RGFW_bool RGFW_monitor_requestMode(RGFW_monitor mon, RGFW_monitorMode mode, RGFW_modeRequest request) {
|
|
||||||
HMONITOR src = MonitorFromPoint((POINT) { mon.x, mon.y }, MONITOR_DEFAULTTOPRIMARY);
|
|
||||||
|
|
||||||
MONITORINFOEX monitorInfo;
|
|
||||||
monitorInfo.cbSize = sizeof(MONITORINFOEX);
|
|
||||||
GetMonitorInfoA(src, (LPMONITORINFO)&monitorInfo);
|
|
||||||
|
|
||||||
DISPLAY_DEVICE dd;
|
|
||||||
dd.cb = sizeof(dd);
|
|
||||||
|
|
||||||
// Enumerate display devices
|
|
||||||
for (DWORD deviceNum = 0; EnumDisplayDevicesA(NULL, deviceNum, &dd, 0); deviceNum++) {
|
|
||||||
if (!(dd.StateFlags & DISPLAY_DEVICE_ACTIVE))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
DEVMODE dm;
|
|
||||||
ZeroMemory(&dm, sizeof(dm));
|
|
||||||
dm.dmSize = sizeof(dm);
|
|
||||||
|
|
||||||
if (EnumDisplaySettingsA(dd.DeviceName, ENUM_CURRENT_SETTINGS, &dm)) {
|
|
||||||
if (request & RGFW_monitorScale) {
|
|
||||||
dm.dmFields |= DM_PELSWIDTH | DM_PELSHEIGHT;
|
|
||||||
dm.dmPelsWidth = mode.area.w;
|
|
||||||
dm.dmPelsHeight = mode.area.h;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (request & RGFW_monitorRefresh) {
|
|
||||||
dm.dmFields |= DM_DISPLAYFREQUENCY;
|
|
||||||
dm.dmDisplayFrequency = mode.refreshRate;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (request & RGFW_monitorRGB) {
|
|
||||||
dm.dmFields |= DM_BITSPERPEL;
|
|
||||||
dm.dmBitsPerPel = mode.red + mode.green + mode.blue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ChangeDisplaySettingsEx(dd.DeviceName, &dm, NULL, CDS_TEST, NULL) == DISP_CHANGE_SUCCESSFUL) {
|
|
||||||
if (ChangeDisplaySettingsEx(dd.DeviceName, &dm, NULL, CDS_UPDATEREGISTRY, NULL) == DISP_CHANGE_SUCCESSFUL)
|
|
||||||
return RGFW_TRUE;
|
|
||||||
return RGFW_FALSE;
|
|
||||||
} else return RGFW_FALSE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return RGFW_FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
HICON RGFW_loadHandleImage(u8* src, RGFW_area a, BOOL icon) {
|
HICON RGFW_loadHandleImage(u8* src, RGFW_area a, BOOL icon) {
|
||||||
BITMAPV5HEADER bi;
|
BITMAPV5HEADER bi;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user