refactor: move all files handling input to a separate package

Author: elgopher

piebiten/internal/ebitengame.go

@@ -6,6 +6,7 @@ package internal
 import (
 	"github.com/elgopher/pi/piaudio"
 	"github.com/elgopher/pi/piebiten/internal/audio"
+	"github.com/elgopher/pi/piebiten/internal/input"
 	ebitenaudio "github.com/hajimehoshi/ebiten/v2/audio"
 	"math"
 	"time"
@@ -31,6 +32,12 @@ func RunEbitenGame() *EbitenGame {
 		drawScreenOpts: &ebiten.DrawImageOptions{},
 		audioBackend:   theAudioBackend,
 	}
+	game.inputBackend = &input.Backend{
+		Paused:  &game.paused,
+		LeftPos: &game.left,
+		TopPos:  &game.top,
+		Scale:   &game.scale,
+	}
 
 	pidebug.Target().SubscribeAll(game.onPidebugEvent)
 
@@ -59,8 +66,6 @@ type EbitenGame struct {
 	piScreen       pi.Canvas
 	ebitenScreen   *ebiten.Image
 	drawScreenOpts *ebiten.DrawImageOptions
-	keys           []ebiten.Key
-	mousePosition  pi.Position
 	cachedMonitor  cachedMonitor
 	started        bool
 
@@ -77,9 +82,9 @@ type EbitenGame struct {
 
 	paused bool
 
-	gamepads     ebitenGamepads
 	windowState  windowState
 	audioBackend *audio.Backend
+	inputBackend *input.Backend
 
 	ebitenFrame int // frame incremented on each Ebiten tick
 }
@@ -111,9 +116,7 @@ func (g *EbitenGame) Update() error {
 		piloop.DebugTarget().Publish(piloop.EventFrameStart)
 	}
 
-	g.updateMouse()
-	g.updateKeyboard()
-	g.gamepads.update()
+	g.inputBackend.Update()
 
 	if g.ebitenFrame%(ebitenTPS/pi.TPS()) == (ebitenTPS/pi.TPS())-1 {
 		if !g.paused {

piebiten/internal/input/input.go

@@ -0,0 +1,26 @@
+// Copyright 2025 Jacek Olszak
+// This code is licensed under MIT license (see LICENSE for details)
+
+package input
+
+import (
+	"github.com/elgopher/pi"
+	"github.com/hajimehoshi/ebiten/v2"
+)
+
+type Backend struct {
+	Paused  *bool
+	LeftPos *float64
+	TopPos  *float64
+	Scale   *float64
+
+	keys          []ebiten.Key
+	mousePosition pi.Position
+	gamepads      ebitenGamepads
+}
+
+func (g *Backend) Update() {
+	g.updateMouse()
+	g.updateKeyboard()
+	g.gamepads.update()
+}

piebiten/internal/keyboard.go piebiten/internal/input/keyboard.gopiebiten/internal/keyboard.go renamed to piebiten/internal/input/keyboard.go

@@ -1,7 +1,7 @@
 // Copyright 2025 Jacek Olszak
 // This code is licensed under MIT license (see LICENSE for details)
 
-package internal
+package input
 
 import (
 	"github.com/hajimehoshi/ebiten/v2"
@@ -10,11 +10,11 @@ import (
 	"github.com/elgopher/pi/pikey"
 )
 
-func (g *EbitenGame) updateKeyboard() {
+func (g *Backend) updateKeyboard() {
 	g.keys = inpututil.AppendJustPressedKeys(g.keys[:0])
 	for _, key := range g.keys {
 		event := pikey.Event{Type: pikey.EventDown, Key: keyMap[key]}
-		if !g.paused {
+		if !*g.Paused {
 			pikey.Target().Publish(event)
 		}
 		pikey.DebugTarget().Publish(event)
@@ -23,7 +23,7 @@ func (g *EbitenGame) updateKeyboard() {
 	g.keys = inpututil.AppendJustReleasedKeys(g.keys[:0])
 	for _, key := range g.keys {
 		event := pikey.Event{Type: pikey.EventUp, Key: keyMap[key]}
-		if !g.paused {
+		if !*g.Paused {
 			pikey.Target().Publish(event)
 		}
 		pikey.DebugTarget().Publish(event)

piebiten/internal/mouse.go piebiten/internal/input/mouse.gopiebiten/internal/mouse.go renamed to piebiten/internal/input/mouse.go

@@ -1,7 +1,7 @@
 // Copyright 2025 Jacek Olszak
 // This code is licensed under MIT license (see LICENSE for details)
 
-package internal
+package input
 
 import (
 	"github.com/hajimehoshi/ebiten/v2"
@@ -10,7 +10,7 @@ import (
 	"github.com/elgopher/pi/pimouse"
 )
 
-func (g *EbitenGame) updateMouse() {
+func (g *Backend) updateMouse() {
 	g.publishEventDown(ebiten.MouseButtonLeft, pimouse.Left)
 	g.publishEventDown(ebiten.MouseButtonMiddle, "Middle")
 	g.publishEventDown(ebiten.MouseButtonRight, pimouse.Right)
@@ -25,8 +25,8 @@ func (g *EbitenGame) updateMouse() {
 
 	x, y := ebiten.CursorPosition()
 	prev := g.mousePosition
-	g.mousePosition.X = int((float64(x) - g.left) / g.scale)
-	g.mousePosition.Y = int((float64(y) - g.top) / g.scale)
+	g.mousePosition.X = int((float64(x) - *g.LeftPos) / *g.Scale)
+	g.mousePosition.Y = int((float64(y) - *g.TopPos) / *g.Scale)
 
 	mouseMovementDelta := g.mousePosition.Subtract(prev)
 
@@ -35,33 +35,33 @@ func (g *EbitenGame) updateMouse() {
 			Position: g.mousePosition,
 			Previous: prev,
 		}
-		if !g.paused {
+		if !*g.Paused {
 			pimouse.MoveTarget().Publish(event)
 		}
 		pimouse.MoveDebugTarget().Publish(event)
 	}
 }
 
-func (g *EbitenGame) publishEventDown(button ebiten.MouseButton, key pimouse.Button) {
+func (g *Backend) publishEventDown(button ebiten.MouseButton, key pimouse.Button) {
 	if inpututil.IsMouseButtonJustPressed(button) {
 		event := pimouse.EventButton{
 			Type:   pimouse.EventButtonDown,
 			Button: key,
 		}
-		if !g.paused {
+		if !*g.Paused {
 			pimouse.ButtonTarget().Publish(event)
 		}
 		pimouse.ButtonDebugTarget().Publish(event)
 	}
 }
 
-func (g *EbitenGame) publishEventUp(button ebiten.MouseButton, key pimouse.Button) {
+func (g *Backend) publishEventUp(button ebiten.MouseButton, key pimouse.Button) {
 	if inpututil.IsMouseButtonJustReleased(button) {
 		event := pimouse.EventButton{
 			Type:   pimouse.EventButtonUp,
 			Button: key,
 		}
-		if !g.paused {
+		if !*g.Paused {
 			pimouse.ButtonTarget().Publish(event)
 		}
 		pimouse.ButtonDebugTarget().Publish(event)

piebiten/internal/pad.go piebiten/internal/input/pad.gopiebiten/internal/pad.go renamed to piebiten/internal/input/pad.go

@@ -1,7 +1,7 @@
 // Copyright 2025 Jacek Olszak
 // This code is licensed under MIT license (see LICENSE for details)
 
-package internal
+package input
 
 import (
 	"github.com/hajimehoshi/ebiten/v2"