mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-11-10 04:57:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/glfwwin: update GLFW to 3.3.7

Browse Source 
Reference: 597ae79a86
This commit is contained in:
Hajime Hoshi 2022-05-20 23:09:10 +09:00
parent 5a4c46fc52
commit 8c467aaa1b
3 changed files with 115 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/glfwwin/api_windows.go
View File

@ -128,6 +128,7 @@ const (
_SIZE_RESTORED = 0
_SM_CXICON = 11
_SM_CXSMICON = 49
_SM_CYCAPTION = 4
_SM_CYICON = 12
_SM_CYSMICON = 50
_SPI_GETFOREGROUNDLOCKTIMEOUT = 0x2000
@ -798,6 +799,7 @@ var (
procGetPropW = user32.NewProc("GetPropW")
procGetRawInputData = user32.NewProc("GetRawInputData")
procGetSystemMetrics = user32.NewProc("GetSystemMetrics")
procGetSystemMetricsForDpi = user32.NewProc("GetSystemMetricsForDpi")
procGetWindowLongW = user32.NewProc("GetWindowLongW")
procGetWindowPlacement = user32.NewProc("GetWindowPlacement")
procGetWindowRect = user32.NewProc("GetWindowRect")
@ -810,6 +812,7 @@ var (
procMonitorFromWindow = user32.NewProc("MonitorFromWindow")
procMoveWindow = user32.NewProc("MoveWindow")
procMsgWaitForMultipleObjects = user32.NewProc("MsgWaitForMultipleObjects")
procOffsetRect = user32.NewProc("OffsetRect")
procPeekMessageW = user32.NewProc("PeekMessageW")
procPostMessageW = user32.NewProc("PostMessageW")
procPtInRect = user32.NewProc("PtInRect")
@ -1377,6 +1380,14 @@ func _GetSystemMetrics(nIndex int32) (int32, error) {
return int32(r), nil
}
func _GetSystemMetricsForDpi(nIndex int32, dpi uint32) (int32, error) {
r, _, e := procGetSystemMetricsForDpi.Call(uintptr(nIndex), uintptr(dpi))
if int32(r) == 0 && !errors.Is(e, windows.ERROR_SUCCESS) {
return 0, fmt.Errorf("glfwwin: GetSystemMetrics failed: %w", e)
}
return int32(r), nil
}
func _GetWindowLongW(hWnd windows.HWND, nIndex int32) (int32, error) {
r, _, e := procGetWindowLongW.Call(uintptr(hWnd), uintptr(nIndex))
if int32(r) == 0 && !errors.Is(e, windows.ERROR_SUCCESS) {
@ -1470,6 +1481,11 @@ func _MsgWaitForMultipleObjects(nCount uint32, pHandles *windows.Handle, waitAll
return uint32(r), nil
}
func _OffsetRect(lprect *_RECT, dx int32, dy int32) bool {
r, _, _ := procOffsetRect.Call(uintptr(unsafe.Pointer(lprect)), uintptr(dx), uintptr(dy))
return int32(r) != 0
}
func _PeekMessageW(lpMsg *_MSG, hWnd windows.HWND, wMsgFilterMin uint32, wMsgFilterMax uint32, wRemoveMsg uint32) bool {
r, _, _ := procPeekMessageW.Call(uintptr(unsafe.Pointer(lpMsg)), uintptr(hWnd), uintptr(wMsgFilterMin), uintptr(wMsgFilterMax), uintptr(wRemoveMsg))
return int32(r) != 0

99
internal/glfwwin/win32window_windows.go
View File

@ -514,6 +514,71 @@ func (w *Window) releaseMonitor() error {
return nil
}
func (w *Window) maximizeWindowManually() error {
mi, _ := _GetMonitorInfoW(_MonitorFromWindow(w.win32.handle, _MONITOR_DEFAULTTONEAREST))
rect := mi.rcWork
if w.maxwidth != DontCare && w.maxheight != DontCare {
if rect.right-rect.left > int32(w.maxwidth) {
rect.right = rect.left + int32(w.maxwidth)
}
if rect.bottom-rect.top > int32(w.maxheight) {
rect.bottom = rect.top + int32(w.maxheight)
}
}
s, err := _GetWindowLongW(w.win32.handle, _GWL_STYLE)
if err != nil {
return err
}
style := uint32(s)
style |= _WS_MAXIMIZE
if _, err := _SetWindowLongW(w.win32.handle, _GWL_STYLE, int32(style)); err != nil {
return err
}
if w.decorated {
s, err := _GetWindowLongW(w.win32.handle, _GWL_EXSTYLE)
if err != nil {
return err
}
exStyle := uint32(s)
if isWindows10AnniversaryUpdateOrGreaterWin32() {
dpi := _GetDpiForWindow(w.win32.handle)
if err := _AdjustWindowRectExForDpi(&rect, style, false, exStyle, dpi); err != nil {
return err
}
m, err := _GetSystemMetricsForDpi(_SM_CYCAPTION, dpi)
if err != nil {
return err
}
_OffsetRect(&rect, 0, m)
} else {
if err := _AdjustWindowRectEx(&rect, style, false, exStyle); err != nil {
return err
}
m, err := _GetSystemMetrics(_SM_CYCAPTION)
if err != nil {
return err
}
_OffsetRect(&rect, 0, m)
}
if rect.bottom > mi.rcWork.bottom {
rect.bottom = mi.rcWork.bottom
}
}
if err := _SetWindowPos(w.win32.handle, _HWND_TOP,
rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top,
_SWP_NOACTIVATE|_SWP_NOZORDER|_SWP_FRAMECHANGED); err != nil {
return err
}
return nil
}
func windowProc(hWnd windows.HWND, uMsg uint32, wParam _WPARAM, lParam _LPARAM) uintptr /*_LRESULT*/ {
window := (*Window)(unsafe.Pointer(_GetPropW(hWnd, "GLFW")))
if window == nil {
@ -1185,9 +1250,15 @@ func (w *Window) createNativeWindow(wndconfig *wndconfig, fbconfig *fbconfig) er
right: int32(wndconfig.width),
bottom: int32(wndconfig.height),
}
mh := _MonitorFromWindow(w.win32.handle, _MONITOR_DEFAULTTONEAREST)
// Adjust window rect to account for DPI scaling of the window frame and
// (if enabled) DPI scaling of the content area
// This cannot be done until we know what monitor the window was placed on
// Only update the restored window rect as the window may be maximized
if wndconfig.scaleToMonitor {
xscale, yscale, err := w.platformGetWindowContentScale()
xscale, yscale, err := getMonitorContentScaleWin32(mh)
if err != nil {
return err
}
@ -1217,11 +1288,25 @@ func (w *Window) createNativeWindow(wndconfig *wndconfig, fbconfig *fbconfig) er
if err != nil {
return err
}
_OffsetRect(&rect, wp.rcNormalPosition.left-rect.left, wp.rcNormalPosition.top-rect.top)
wp.rcNormalPosition = rect
wp.showCmd = _SW_HIDE
if err := _SetWindowPlacement(w.win32.handle, &wp); err != nil {
return err
}
// Adjust rect of maximized undecorated window, because by default Windows will
// make such a window cover the whole monitor instead of its workarea
if wndconfig.maximized && !wndconfig.decorated {
mi, _ := _GetMonitorInfoW(mh)
if err := _SetWindowPos(w.win32.handle, _HWND_TOP,
mi.rcWork.left, mi.rcWork.top, mi.rcWork.right-mi.rcWork.left, mi.rcWork.bottom-mi.rcWork.top,
_SWP_NOACTIVATE|_SWP_NOZORDER); err != nil {
return err
}
}
}
_DragAcceptFiles(w.win32.handle, true)
@ -1583,8 +1668,16 @@ func (w *Window) platformRestoreWindow() {
_ShowWindow(w.win32.handle, _SW_RESTORE)
}
func (w *Window) platformMaximizeWindow() {
_ShowWindow(w.win32.handle, _SW_MAXIMIZE)
func (w *Window) platformMaximizeWindow() error {
// TODO: Handle error
if _IsWindowVisible(w.win32.handle) {
_ShowWindow(w.win32.handle, _SW_MAXIMIZE)
} else {
if err := w.maximizeWindowManually(); err != nil {
return err
}
}
return nil
}
func (w *Window) platformShowWindow() {

4
internal/glfwwin/window_windows.go
View File

@ -546,7 +546,9 @@ func (w *Window) Maximize() error {
if w.monitor != nil {
return nil
}
w.platformMaximizeWindow()
if err := w.platformMaximizeWindow(); err != nil {
return err
}
return nil
}