input: refactor

inpututil.go

@@ -1,6 +1,8 @@
 package koebiten
 
-import "sync"
+import (
+	"sync"
+)
 
 type Key int
 
@@ -39,18 +41,32 @@ type pos struct {
 type inputState struct {
 	keyDurations     []int
 	prevKeyDurations []int
+	state            []bool
 
 	m sync.RWMutex
 }
 
 var theInputState = &inputState{
 	keyDurations:     make([]int, KeyMax+1),
 	prevKeyDurations: make([]int, KeyMax+1),
+	state:            make([]bool, KeyMax+1),
 }
 
+var isKeyPressed = make([]bool, KeyMax)
+
 func (i *inputState) update() {
 	i.m.Lock()
 	defer i.m.Unlock()
+
+	// Keyboard
+	copy(i.prevKeyDurations, i.keyDurations)
+	for k := Key(0); k <= KeyMax; k++ {
+		if i.state[k] {
+			i.keyDurations[k]++
+		} else {
+			i.keyDurations[k] = 0
+		}
+	}
 }
 
 // AppendPressedKeys append currently pressed keyboard keys to keys and returns the extended buffer.
@@ -60,8 +76,12 @@ func (i *inputState) update() {
 //
 // AppendPressedKeys is concurrent safe.
 func AppendPressedKeys(keys []Key) []Key {
-	theInputState.m.RLock()
-	defer theInputState.m.RUnlock()
+	theInputState.m.Lock()
+	defer theInputState.m.Unlock()
+
+	for _, k := range keys {
+		theInputState.state[k] = true
+	}
 
 	for i, d := range theInputState.keyDurations {
 		if d == 0 {
@@ -88,8 +108,12 @@ func PressedKeys() []Key {
 //
 // AppendJustPressedKeys is concurrent safe.
 func AppendJustPressedKeys(keys []Key) []Key {
-	theInputState.m.RLock()
-	defer theInputState.m.RUnlock()
+	theInputState.m.Lock()
+	defer theInputState.m.Unlock()
+
+	for _, k := range keys {
+		theInputState.state[k] = true
+	}
 
 	for i, d := range theInputState.keyDurations {
 		if d != 1 {
@@ -107,8 +131,12 @@ func AppendJustPressedKeys(keys []Key) []Key {
 //
 // AppendJustReleasedKeys is concurrent safe.
 func AppendJustReleasedKeys(keys []Key) []Key {
-	theInputState.m.RLock()
-	defer theInputState.m.RUnlock()
+	theInputState.m.Lock()
+	defer theInputState.m.Unlock()
+
+	for _, k := range keys {
+		theInputState.state[k] = false
+	}
 
 	for k := Key(0); k <= KeyMax; k++ {
 		if theInputState.keyDurations[k] != 0 {

koebiten.go

@@ -66,6 +66,7 @@ func Run(d func()) error {
 	for {
 		<-tick
 		keyUpdate()
+		theInputState.update()
 		textY = 0
 		display.ClearBuffer()
 		d()
@@ -79,6 +80,7 @@ func RunGame(game Game) error {
 	for {
 		<-tick
 		keyUpdate()
+		theInputState.update()
 		textY = 0
 		display.ClearBuffer()
 		err := game.Update()

machine.go

@@ -157,11 +157,9 @@ func keyGpioUpdate() {
 			}
 		case NoneToPress:
 			state[idx] = Press
-			theInputState.keyDurations[idx]++
 			AppendJustPressedKeys([]Key{Key(idx)})
 		case Press:
 			AppendPressedKeys([]Key{Key(idx)})
-			theInputState.keyDurations[idx]++
 			if current {
 				cycle[idx] = 0
 				duration[idx]++
@@ -177,7 +175,6 @@ func keyGpioUpdate() {
 		case PressToRelease:
 			state[idx] = None
 			AppendJustReleasedKeys([]Key{Key(idx)})
-			theInputState.keyDurations[idx] = 0
 		}
 	}
 }
@@ -207,11 +204,9 @@ func keyRotaryUpdate() {
 			} else {
 				state[idx] = PressToRelease
 			}
-			theInputState.keyDurations[idx]++
 			AppendJustPressedKeys([]Key{Key(idx)})
 		case Press:
 			AppendPressedKeys([]Key{Key(idx)})
-			theInputState.keyDurations[idx]++
 			if current {
 			} else {
 				state[idx] = PressToRelease
@@ -223,7 +218,6 @@ func keyRotaryUpdate() {
 				state[idx] = None
 			}
 			AppendJustReleasedKeys([]Key{Key(idx)})
-			theInputState.keyDurations[idx] = 0
 		}
 	}
 }
@@ -250,11 +244,9 @@ func keyMatrixUpdate() {
 				}
 			case NoneToPress:
 				state[idx] = Press
-				theInputState.keyDurations[idx]++
 				AppendJustPressedKeys([]Key{Key(idx)})
 			case Press:
 				AppendPressedKeys([]Key{Key(idx)})
-				theInputState.keyDurations[idx]++
 				if current {
 					cycle[idx] = 0
 					duration[idx]++
@@ -270,7 +262,6 @@ func keyMatrixUpdate() {
 			case PressToRelease:
 				state[idx] = None
 				AppendJustReleasedKeys([]Key{Key(idx)})
-				theInputState.keyDurations[idx] = 0
 			}
 
 			colPins[c].Low()
@@ -298,11 +289,9 @@ func keyJoystickUpdate() {
 			}
 		case NoneToPress:
 			state[idx] = Press
-			theInputState.keyDurations[idx]++
 			AppendJustPressedKeys([]Key{Key(idx)})
 		case Press:
 			AppendPressedKeys([]Key{Key(idx)})
-			theInputState.keyDurations[idx]++
 			if current {
 				cycle[idx] = 0
 				duration[idx]++
@@ -318,7 +307,6 @@ func keyJoystickUpdate() {
 		case PressToRelease:
 			state[idx] = None
 			AppendJustReleasedKeys([]Key{Key(idx)})
-			theInputState.keyDurations[idx] = 0
 		}
 	}
 }