Convert non RGBA images to RGBA, use Image interface

1 files changed, 20 insertions, 8 deletions

diff --git a/input.go b/input.go
index 4b439e1..22c7d70 100644
--- a/input.go
+++ b/input.go
@@ -15,6 +15,7 @@ import "C"
 
 import (
 	"image"
+	"image/draw"
 	"unsafe"
 )
 
@@ -246,8 +247,6 @@ type Cursor struct {
 	data *C.GLFWcursor
 }
 
-type Image *image.NRGBA
-
 //export goMouseButtonCB
 func goMouseButtonCB(window unsafe.Pointer, button, action, mods C.int) {
 	w := windows.get((*C.GLFWwindow)(window))
@@ -371,12 +370,25 @@ func (w *Window) SetCursorPos(xpos, ypos float64) error {
 //
 // The cursor hotspot is specified in pixels, relative to the upper-left corner of the cursor image.
 // Like all other coordinate systems in GLFW, the X-axis points to the right and the Y-axis points down.
-func CreateCursor(image Image, xhot, yhot int) (*Cursor, error) {
-	var img C.GLFWimage
-	img.width = C.int(image.Rect.Max.X)
-	img.height = C.int(image.Rect.Max.Y)
-	img.pixels = (*C.uchar)(&image.Pix[0])
-	c := C.glfwCreateCursor(&img, C.int(xhot), C.int(yhot))
+func CreateCursor(img image.Image, xhot, yhot int) (*Cursor, error) {
+	var img_c C.GLFWimage
+	var pixPointer *uint8
+	b := img.Bounds()
+
+	switch img := img.(type) {
+		case *image.RGBA:
+			pixPointer = &img.Pix[0]
+		default:
+			m := image.NewRGBA(image.Rect(0, 0, b.Dx(), b.Dy()))
+			draw.Draw(m, m.Bounds(), img, b.Min, draw.Src)
+			pixPointer = &m.Pix[0]
+	}
+	
+	img_c.width = C.int(b.Dx())
+	img_c.height = C.int(b.Dy())
+	img_c.pixels = (*C.uchar)(pixPointer)
+	c := C.glfwCreateCursor(&img_c, C.int(xhot), C.int(yhot))
+	
 	return &Cursor{c}, fetchError()
 }