mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-25 11:18:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/uidriver/glfw: Native macOS implementation for setting cursor shape (#1624)

Browse Source 
Updates #1624
This commit is contained in:
Tom Lister 2021-05-02 15:50:50 +10:00 committed by GitHub
parent 7adf6aac27
commit bea5ab3335
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 65 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cursor.go
View File

@ -35,4 +35,6 @@ const (
CursorShapeText CursorShapeType = CursorShapeType(driver.CursorShapeText)
CursorShapeCrosshair CursorShapeType = CursorShapeType(driver.CursorShapeCrosshair)
CursorShapePointer CursorShapeType = CursorShapeType(driver.CursorShapePointer)
CursorShapeEWResize CursorShapeType = CursorShapeType(driver.CursorShapeEWResize)
CursorShapeNSResize CursorShapeType = CursorShapeType(driver.CursorShapeNSResize)
)

21
examples/cursor/main.go
View File

@ -61,6 +61,10 @@ func (g *Game) Draw(screen *ebiten.Image) {
ebitenutil.DebugPrint(screen, "CursorShape: Crosshair")
case ebiten.CursorShapePointer:
ebitenutil.DebugPrint(screen, "CursorShape: Pointer")
case ebiten.CursorShapeEWResize:
ebitenutil.DebugPrint(screen, "CursorShape: EW Resize")
case ebiten.CursorShapeNSResize:
ebitenutil.DebugPrint(screen, "CursorShape: NS Resize")
}
}
@ -71,22 +75,21 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
func main() {
g := &Game{
grids: map[image.Rectangle]ebiten.CursorShapeType{
image.Rect(100, 100, 200, 300): ebiten.CursorShapeDefault,
image.Rect(200, 100, 300, 300): ebiten.CursorShapeText,
image.Rect(300, 100, 400, 300): ebiten.CursorShapeCrosshair,
image.Rect(400, 100, 500, 300): ebiten.CursorShapePointer,
image.Rect(100, 100, 200, 200): ebiten.CursorShapeDefault,
image.Rect(200, 100, 300, 200): ebiten.CursorShapeText,
image.Rect(300, 100, 400, 200): ebiten.CursorShapeCrosshair,
image.Rect(100, 200, 200, 300): ebiten.CursorShapePointer,
image.Rect(200, 200, 300, 300): ebiten.CursorShapeEWResize,
image.Rect(300, 200, 400, 300): ebiten.CursorShapeNSResize,
},
gridColors: map[image.Rectangle]color.Color{},
}
for rect, c := range g.grids {
clr := color.RGBA{0x40, 0x40, 0x40, 0xff}
switch c % 3 {
case 0:
if c%2 == 0 {
clr.R = 0x80
case 1:
} else {
clr.G = 0x80
case 2:
clr.B = 0x80
}
g.gridColors[rect] = clr
}

2
internal/driver/cursor.go
View File

@ -29,4 +29,6 @@ const (
CursorShapeText
CursorShapeCrosshair
CursorShapePointer
CursorShapeEWResize
CursorShapeNSResize
)

4
internal/uidriver/glfw/ui.go
View File

@ -190,6 +190,8 @@ func initialize() error {
glfwSystemCursors[driver.CursorShapeText] = glfw.CreateStandardCursor(glfw.IBeamCursor)
glfwSystemCursors[driver.CursorShapeCrosshair] = glfw.CreateStandardCursor(glfw.CrosshairCursor)
glfwSystemCursors[driver.CursorShapePointer] = glfw.CreateStandardCursor(glfw.HandCursor)
glfwSystemCursors[driver.CursorShapeEWResize] = glfw.CreateStandardCursor(glfw.HResizeCursor)
glfwSystemCursors[driver.CursorShapeNSResize] = glfw.CreateStandardCursor(glfw.VResizeCursor)
return nil
}
@ -651,7 +653,7 @@ func (u *UserInterface) SetCursorShape(shape driver.CursorShape) {
return
}
_ = u.t.Call(func() error {
u.window.SetCursor(glfwSystemCursors[shape])
u.setNativeCursor(shape)
return nil
})
}

30
internal/uidriver/glfw/ui_darwin.go
View File

@ -43,9 +43,35 @@ package glfw
// return [[NSApplication sharedApplication] currentSystemPresentationOptions] &
// NSApplicationPresentationFullScreen;
// }
//
// static void setNativeCursor(int cursorID) {
// id cursor = [[NSCursor class] performSelector:@selector(arrowCursor)];
// switch (cursorID) {
// case 0:
// cursor = [[NSCursor class] performSelector:@selector(arrowCursor)];
// break;
// case 1:
// cursor = [[NSCursor class] performSelector:@selector(IBeamCursor)];
// break;
// case 2:
// cursor = [[NSCursor class] performSelector:@selector(crosshairCursor)];
// break;
// case 3:
// cursor = [[NSCursor class] performSelector:@selector(pointingHandCursor)];
// break;
// case 4:
// cursor = [[NSCursor class] performSelector:@selector(_windowResizeEastWestCursor)];
// break;
// case 5:
// cursor = [[NSCursor class] performSelector:@selector(_windowResizeNorthSouthCursor)];
// break;
// }
// [cursor push];
// }
import "C"
import (
"github.com/hajimehoshi/ebiten/v2/internal/driver"
"github.com/hajimehoshi/ebiten/v2/internal/glfw"
)
@ -91,3 +117,7 @@ func (u *UserInterface) nativeWindow() uintptr {
func (u *UserInterface) isNativeFullscreen() bool {
return bool(C.isNativeFullscreen())
}
func (u *UserInterface) setNativeCursor(shape driver.CursorShape) {
C.setNativeCursor(C.int(shape))
}

6
internal/uidriver/glfw/ui_unix.go
View File

@ -20,6 +20,7 @@ package glfw
import (
"math"
"github.com/hajimehoshi/ebiten/v2/internal/driver"
"github.com/hajimehoshi/ebiten/v2/internal/glfw"
)
@ -67,3 +68,8 @@ func (u *UserInterface) nativeWindow() uintptr {
func (u *UserInterface) isNativeFullscreen() bool {
return false
}
func (u *UserInterface) setNativeCursor(shape driver.CursorShape) {
// TODO: Use native API in the future (#1571)
u.window.SetCursor(glfwSystemCursors[shape])
}

6
internal/uidriver/glfw/ui_windows.go
View File

@ -20,6 +20,7 @@ import (
"golang.org/x/sys/windows"
"github.com/hajimehoshi/ebiten/v2/internal/driver"
"github.com/hajimehoshi/ebiten/v2/internal/glfw"
)
@ -186,3 +187,8 @@ func (u *UserInterface) nativeWindow() uintptr {
func (u *UserInterface) isNativeFullscreen() bool {
return false
}
func (u *UserInterface) setNativeCursor(shape driver.CursorShape) {
// TODO: Use native API in the future (#1571)
u.window.SetCursor(glfwSystemCursors[shape])
}

4
internal/uidriver/js/ui_js.go
View File

@ -41,6 +41,10 @@ func driverCursorShapeToCSSCursor(cursor driver.CursorShape) string {
return "crosshair"
case driver.CursorShapePointer:
return "pointer"
case driver.CursorShapeEWResize:
return "ew-resize"
case driver.CursorShapeNSResize:
return "ns-resize"
}
return "auto"
}