Rename files

ui/cocoa/ui.go

@@ -24,7 +24,7 @@ type UI struct {
 	initialEventSent bool
 	textureFactory   *textureFactory
 	graphicsDevice   *opengl.Device
-	uiEvents
+	windowEvents
 }
 
 var currentUI *UI
@@ -69,7 +69,7 @@ func (u *UI) PollEvents() {
 	C.PollEvents()
 	if !u.initialEventSent {
 		e := ui.ScreenSizeUpdatedEvent{u.screenWidth, u.screenHeight}
-		u.uiEvents.notifyScreenSizeUpdated(e)
+		u.windowEvents.notifyScreenSizeUpdated(e)
 		u.initialEventSent = true
 	}
 }
@@ -122,7 +122,7 @@ func (u *UI) Draw(f func(graphics.Canvas)) {
 func ebiten_ScreenSizeUpdated(width, height int) {
 	u := currentUI
 	e := ui.ScreenSizeUpdatedEvent{width, height}
-	u.uiEvents.notifyScreenSizeUpdated(e)
+	u.windowEvents.notifyScreenSizeUpdated(e)
 }
 
 //export ebiten_InputUpdated
@@ -131,7 +131,7 @@ func ebiten_InputUpdated(inputType C.InputType, cx, cy C.int) {
 
 	if inputType == C.InputTypeMouseUp {
 		e := ui.InputStateUpdatedEvent{-1, -1}
-		u.uiEvents.notifyInputStateUpdated(e)
+		u.windowEvents.notifyInputStateUpdated(e)
 		return
 	}
 
@@ -149,5 +149,5 @@ func ebiten_InputUpdated(inputType C.InputType, cx, cy C.int) {
 		y = u.screenHeight - 1
 	}
 	e := ui.InputStateUpdatedEvent{x, y}
-	u.uiEvents.notifyInputStateUpdated(e)
+	u.windowEvents.notifyInputStateUpdated(e)
 }

ui/cocoa/ui_events.go

@@ -1,44 +0,0 @@
-package cocoa
-
-import (
-	"github.com/hajimehoshi/go-ebiten/ui"
-)
-
-type uiEvents struct {
-	screenSizeUpdated chan ui.ScreenSizeUpdatedEvent // initialized lazily
-	inputStateUpdated chan ui.InputStateUpdatedEvent // initialized lazily
-}
-
-func (u *uiEvents) ScreenSizeUpdated() <-chan ui.ScreenSizeUpdatedEvent {
-	if u.screenSizeUpdated != nil {
-		return u.screenSizeUpdated
-	}
-	u.screenSizeUpdated = make(chan ui.ScreenSizeUpdatedEvent)
-	return u.screenSizeUpdated
-}
-
-func (u *uiEvents) notifyScreenSizeUpdated(e ui.ScreenSizeUpdatedEvent) {
-	if u.screenSizeUpdated == nil {
-		return
-	}
-	go func() {
-		u.screenSizeUpdated <- e
-	}()
-}
-
-func (u *uiEvents) InputStateUpdated() <-chan ui.InputStateUpdatedEvent {
-	if u.inputStateUpdated != nil {
-		return u.inputStateUpdated
-	}
-	u.inputStateUpdated = make(chan ui.InputStateUpdatedEvent)
-	return u.inputStateUpdated
-}
-
-func (u *uiEvents) notifyInputStateUpdated(e ui.InputStateUpdatedEvent) {
-	if u.inputStateUpdated == nil {
-		return
-	}
-	go func() {
-		u.inputStateUpdated <- e
-	}()
-}

ui/cocoa/window_events.go

@@ -0,0 +1,44 @@
+package cocoa
+
+import (
+	"github.com/hajimehoshi/go-ebiten/ui"
+)
+
+type windowEvents struct {
+	screenSizeUpdated chan ui.ScreenSizeUpdatedEvent // initialized lazily
+	inputStateUpdated chan ui.InputStateUpdatedEvent // initialized lazily
+}
+
+func (w *windowEvents) ScreenSizeUpdated() <-chan ui.ScreenSizeUpdatedEvent {
+	if w.screenSizeUpdated != nil {
+		return w.screenSizeUpdated
+	}
+	w.screenSizeUpdated = make(chan ui.ScreenSizeUpdatedEvent)
+	return w.screenSizeUpdated
+}
+
+func (w *windowEvents) notifyScreenSizeUpdated(e ui.ScreenSizeUpdatedEvent) {
+	if w.screenSizeUpdated == nil {
+		return
+	}
+	go func() {
+		w.screenSizeUpdated <- e
+	}()
+}
+
+func (w *windowEvents) InputStateUpdated() <-chan ui.InputStateUpdatedEvent {
+	if w.inputStateUpdated != nil {
+		return w.inputStateUpdated
+	}
+	w.inputStateUpdated = make(chan ui.InputStateUpdatedEvent)
+	return w.inputStateUpdated
+}
+
+func (w *windowEvents) notifyInputStateUpdated(e ui.InputStateUpdatedEvent) {
+	if w.inputStateUpdated == nil {
+		return
+	}
+	go func() {
+		w.inputStateUpdated <- e
+	}()
+}