mouse input now affects both paddles in a paddle pair

this undoes a lot of the work done in 5b6afb0 including the removal of
the PADDLEA and PADDLEB options

Author: JetSetIlly

debugger/commands.go

@@ -1835,11 +1835,8 @@ func (dbg *Debugger) processTokens(tokens *commandline.Tokens) error {
 				dbg.vcs.FingerprintPeripheral(id)
 			case "STICK":
 				err = dbg.vcs.RIOT.Ports.Plug(id, controllers.NewStick)
-			case "PADDLE", "PADDLEA":
-				err = dbg.vcs.RIOT.Ports.Plug(id, controllers.NewPaddlePair)
-			case "PADDLEB":
-				err = dbg.vcs.RIOT.Ports.Plug(id, controllers.NewPaddlePair)
-				dbg.controllers.SwappedPaddles(true)
+			case "PADDLE":
+				err = dbg.vcs.RIOT.Ports.Plug(id, controllers.NewPaddles)
 			case "KEYPAD":
 				err = dbg.vcs.RIOT.Ports.Plug(id, controllers.NewKeypad)
 			case "GAMEPAD":

debugger/commands_template.go

@@ -131,7 +131,7 @@ var commandTemplate = []string{
 	cmdDWARF + " [FUNCTIONS|GLOBALS (DERIVATION)|LOCALS {DERIVATION|RANGES}|FRAMEBASE (DERIVATION)|LINE %<file:line>S|CALLSTACK|CALLERS %<function>S]",
 
 	// user input
-	cmdPeripheral + " ([LEFT|RIGHT] (AUTO|STICK|PADDLE|PADDLEA|PADDLEB|KEYPAD|GAMEPAD|SAVEKEY|ATARIVOX)|SWAP)",
+	cmdPeripheral + " ([LEFT|RIGHT] (AUTO|STICK|PADDLE|KEYPAD|GAMEPAD|SAVEKEY|ATARIVOX)|SWAP)",
 	cmdPanel + " (SET [P0PRO|P1PRO|P0AM|P1AM|COL|BW]|TOGGLE [P0|P1|COL]|[HOLD|RELEASE] [SELECT|RESET])",
 	cmdStick + " [LEFT|RIGHT] [LEFT|RIGHT|UP|DOWN|FIRE|NOLEFT|NORIGHT|NOUP|NODOWN|NOFIRE]",
 	cmdKeypad + " [LEFT|RIGHT] [NONE|0|1|2|3|4|5|6|7|8|9|*|#]",

hardware/peripherals/controllers/paddle.go

@@ -193,7 +193,16 @@ func (pdl *Paddles) HandleEvent(event ports.Event, data ports.EventData) (bool,
 		}
 
 		// handle the incoming data
-		handle := func(d ports.EventDataPaddle) error {
+		var handle func(d ports.EventDataPaddle) error
+		handle = func(d ports.EventDataPaddle) error {
+			if d.Paddle == -1 {
+				d.Paddle = 0
+				_ = handle(d)
+				d.Paddle = 1
+				_ = handle(d)
+				return nil
+			}
+
 			if d.Paddle < 0 || d.Paddle > 1 {
 				return fmt.Errorf("paddle: %#v: paddle field must be 0 or 1", d)
 			}

hardware/peripherals/fingerprint.go

@@ -65,7 +65,7 @@ func Fingerprint(port plugging.PortID, loader cartridgeloader.Loader) ports.NewP
 		}
 	} else {
 		if fingerprintPaddle(port, loader) {
-			return controllers.NewPaddlePair
+			return controllers.NewPaddles
 		}
 	}
 

hardware/riot/ports/events.go

@@ -91,13 +91,14 @@ type EventDataPlayback string
 // Event data for stick types.
 type EventDataStick string
 
-// Event data for paddle types. The Paddle field indicates which paddle the data refers to.
+// Event data for paddle types. The Paddle field indicates which paddle the data refers to. A paddle
+// value of -1 indicates that both paddles in the pair are being controlled
 //
 // Values in the motion field are relative (to the current position) if the Relative field is set to
 // true. For non-relative values (ie. absolute values) the value should be scaled to be in the range
 // of -32768 and +32767
 type EventDataPaddle struct {
-	Paddle   int // 0 or 1
+	Paddle   int // 0 or 1 or -1
 	Motion   int16
 	Relative bool
 }

userinput/controllers.go

@@ -25,9 +25,8 @@ const ThumbstickDeadzone = 10000
 
 // Controllers keeps track of hardware userinput options.
 type Controllers struct {
-	inputHandler   HandleInput
-	swappedPorts   bool
-	swappedPaddles bool
+	inputHandler HandleInput
+	swappedPorts bool
 }
 
 // Controllers is the preferred method of initialisation for the Controllers type.
@@ -42,12 +41,6 @@ func (c *Controllers) SwappedPorts(swapped bool) {
 	c.swappedPorts = swapped
 }
 
-// SwappedPaddles is similar to SwapperPorts but affects which paddle of a paddle pair is to be
-// controlled by user input
-func (c *Controllers) SwappedPaddles(swapped bool) {
-	c.swappedPaddles = swapped
-}
-
 // handlePortSwap returns the required PortID relative to the supplied PortID if the
 // controls have been swapped
 func (c Controllers) handlePortSwap(port plugging.PortID) plugging.PortID {
@@ -62,14 +55,6 @@ func (c Controllers) handlePortSwap(port plugging.PortID) plugging.PortID {
 	return port
 }
 
-// handlePaddleSwap returns the required paddle number according to whether the player
-func (c Controllers) handlePaddleSwap() int {
-	if c.swappedPaddles {
-		return 1
-	}
-	return 0
-}
-
 // handleEvents sends the port/event information to each HandleInput
 // implementation.
 //
@@ -102,7 +87,7 @@ func (c *Controllers) mouseMotion(ev EventMouseMotion) (bool, error) {
 	}
 
 	return c.handleEvents(c.handlePortSwap(plugging.PortLeft), ports.PaddleSet, ports.EventDataPaddle{
-		Paddle:   c.handlePaddleSwap(),
+		Paddle:   -1,
 		Motion:   motion,
 		Relative: true,
 	})
@@ -112,17 +97,19 @@ func (c *Controllers) mouseButton(ev EventMouseButton) (bool, error) {
 	switch ev.Button {
 	case MouseButtonLeft:
 		if ev.Down {
-			if c.swappedPaddles {
-				return c.handleEvents(c.handlePortSwap(plugging.PortLeft), ports.SecondFire, true)
-			} else {
-				return c.handleEvents(c.handlePortSwap(plugging.PortLeft), ports.Fire, true)
+			a, err := c.handleEvents(c.handlePortSwap(plugging.PortLeft), ports.Fire, true)
+			if err != nil {
+				return false, err
 			}
+			b, err := c.handleEvents(c.handlePortSwap(plugging.PortLeft), ports.SecondFire, true)
+			return a && b, err
 		} else {
-			if c.swappedPaddles {
-				return c.handleEvents(c.handlePortSwap(plugging.PortLeft), ports.SecondFire, false)
-			} else {
-				return c.handleEvents(c.handlePortSwap(plugging.PortLeft), ports.Fire, false)
+			a, err := c.handleEvents(c.handlePortSwap(plugging.PortLeft), ports.Fire, false)
+			if err != nil {
+				return false, err
 			}
+			b, err := c.handleEvents(c.handlePortSwap(plugging.PortLeft), ports.SecondFire, false)
+			return a && b, err
 		}
 	}
 
@@ -464,7 +451,7 @@ func (c *Controllers) stelladaptor(ev EventStelladaptor) (bool, error) {
 
 	case plugging.PeriphPaddles:
 		return c.handleEvents(c.handlePortSwap(ev.ID), ports.PaddleSet, ports.EventDataPaddle{
-			Paddle: c.handlePaddleSwap(),
+			Paddle: -1,
 			Motion: -ev.Horiz - 1,
 		})
 	}