mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-09-20 05:12:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

internal/glfw: refactoring: make callback handlers consistent

Browse Source
This commit is contained in:
Hajime Hoshi 2022-05-19 01:49:21 +09:00
parent 7189c7f649
commit 8d2b08dd14
6 changed files with 40 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
internal/glfw/callback_notwindows.go
View File

@ -25,6 +25,7 @@ var (
charModsCallbacks = map[CharModsCallback]glfw.CharModsCallback{}
closeCallbacks = map[CloseCallback]glfw.CloseCallback{}
framebufferSizeCallbacks = map[FramebufferSizeCallback]glfw.FramebufferSizeCallback{}
monitorCallbacks = map[MonitorCallback]glfw.MonitorCallback{}
scrollCallbacks = map[ScrollCallback]glfw.ScrollCallback{}
sizeCallbacks = map[SizeCallback]glfw.SizeCallback{}
)
@ -65,6 +66,22 @@ func ToFramebufferSizeCallback(cb func(window *Window, width int, height int)) F
return id
}
func ToMonitorCallback(cb func(monitor *Monitor, event PeripheralEvent)) MonitorCallback {
if cb == nil {
return 0
}
id := MonitorCallback(len(monitorCallbacks) + 1)
var gcb glfw.MonitorCallback = func(monitor *glfw.Monitor, event glfw.PeripheralEvent) {
var m *Monitor
if monitor != nil {
m = &Monitor{monitor}
}
cb(m, PeripheralEvent(event))
}
monitorCallbacks[id] = gcb
return id
}
func ToScrollCallback(cb func(window *Window, xoff float64, yoff float64)) ScrollCallback {
if cb == nil {
return 0

14
internal/glfw/callback_windows.go
View File

@ -48,6 +48,20 @@ func ToFramebufferSizeCallback(cb func(window *Window, width int, height int)) F
}))
}
func ToMonitorCallback(cb func(monitor *Monitor, event PeripheralEvent)) MonitorCallback {
if cb == nil {
return 0
}
return MonitorCallback(windows.NewCallbackCDecl(func(monitor uintptr, event PeripheralEvent) uintptr {
var m *Monitor
if monitor != 0 {
m = &Monitor{monitor}
}
cb(m, event)
return 0
}))
}
func ToScrollCallback(cb func(window *Window, xoff float64, yoff float64)) ScrollCallback {
if cb == nil {
return 0

15
internal/glfw/glfw_notwindows.go
View File

@ -301,18 +301,9 @@ func PostEmptyEvent() {
glfw.PostEmptyEvent()
}
func SetMonitorCallback(cbfun func(monitor *Monitor, event PeripheralEvent)) {
var gcb func(monitor *glfw.Monitor, event glfw.PeripheralEvent)
if cbfun != nil {
gcb = func(monitor *glfw.Monitor, event glfw.PeripheralEvent) {
var m *Monitor
if monitor != nil {
m = &Monitor{monitor}
}
cbfun(m, PeripheralEvent(event))
}
}
glfw.SetMonitorCallback(gcb)
func SetMonitorCallback(cbfun MonitorCallback) MonitorCallback {
glfw.SetMonitorCallback(monitorCallbacks[cbfun])
return ToMonitorCallback(nil)
}
func SwapInterval(interval int) {

18
internal/glfw/glfw_windows.go
View File

@ -22,8 +22,6 @@ import (
"runtime"
"sync"
"unsafe"
"golang.org/x/sys/windows"
)
type glfwImage struct {
@ -414,20 +412,10 @@ func PostEmptyEvent() {
panicError()
}
func SetMonitorCallback(cbfun func(monitor *Monitor, event PeripheralEvent)) {
var gcb uintptr
if cbfun != nil {
gcb = windows.NewCallbackCDecl(func(monitor uintptr, event PeripheralEvent) uintptr {
var m *Monitor
if monitor != 0 {
m = &Monitor{monitor}
}
cbfun(m, event)
return 0
})
}
glfwDLL.call("glfwSetMonitorCallback", gcb)
func SetMonitorCallback(cbfun MonitorCallback) MonitorCallback {
glfwDLL.call("glfwSetMonitorCallback", uintptr(cbfun))
panicError()
return ToMonitorCallback(nil) // TODO
}
func SwapInterval(interval int) {

1
internal/glfw/type.go
View File

@ -21,6 +21,7 @@ type (
CharModsCallback uintptr
CloseCallback uintptr
FramebufferSizeCallback uintptr
MonitorCallback uintptr
ScrollCallback uintptr
SizeCallback uintptr
)

4
internal/ui/ui_glfw.go
View File

@ -150,9 +150,9 @@ func init() {
if err := initialize(); err != nil {
panic(err)
}
glfw.SetMonitorCallback(func(monitor *glfw.Monitor, event glfw.PeripheralEvent) {
glfw.SetMonitorCallback(glfw.ToMonitorCallback(func(monitor *glfw.Monitor, event glfw.PeripheralEvent) {
updateMonitors()
})
}))
updateMonitors()
}