Lutro compat

input/binds_keyboard.go

@@ -18,6 +18,7 @@ var keyBinds = map[glfw.Key]uint32{
 	glfw.KeyRight:      libretro.DeviceIDJoypadRight,
 	glfw.KeyEnter:      libretro.DeviceIDJoypadStart,
 	glfw.KeyRightShift: libretro.DeviceIDJoypadSelect,
+	glfw.KeyTab:        ActionSwitchPads,
 	glfw.KeySpace:      ActionFastForwardToggle,
 	glfw.KeyP:          ActionMenuToggle,
 	glfw.KeyF:          ActionFullscreenToggle,

input/input.go

@@ -45,8 +45,10 @@ const (
 	ActionShouldClose uint32 = lr.DeviceIDJoypadR3 + 3
 	// ActionFastForwardToggle will run the core as fast as possible
 	ActionFastForwardToggle uint32 = lr.DeviceIDJoypadR3 + 4
+	// ActionSwitchPads
+	ActionSwitchPads uint32 = lr.DeviceIDJoypadR3 + 5
 	// ActionLast is used for iterating
-	ActionLast uint32 = lr.DeviceIDJoypadR3 + 5
+	ActionLast uint32 = lr.DeviceIDJoypadR3 + 6
 )
 
 // joystickCallback is triggered when a joypad is plugged.
@@ -72,6 +74,8 @@ func Init(v *video.Video) {
 	vid = v
 	if !glfw.UpdateGamepadMappings(mappings) {
 		log.Println("Failed to update mappings")
+	} else {
+		log.Println("Updated mappings")
 	}
 	glfw.SetJoystickCallback(joystickCallback)
 }
@@ -132,11 +136,13 @@ func pollJoypads(state States, analogState AnalogStates) (States, AnalogStates)
 	return state, analogState
 }
 
+var KbdPort int = 0
+
 // pollKeyboard processes keyboard keys
 func pollKeyboard(state States) States {
 	for k, v := range keyBinds {
 		if vid.Window.GetKey(k) == glfw.Press {
-			state[0][v] = 1
+			state[KbdPort][v] = 1
 		}
 	}
 	return state

menu/input.go

@@ -213,6 +213,11 @@ func (m *Menu) ProcessHotkeys() {
 		}
 	}
 
+	if input.Released[input.KbdPort][input.ActionSwitchPads] == 1 {
+		input.KbdPort = (input.KbdPort + 1) % 2
+		ntf.DisplayAndLog(ntf.Info, "Menu", "Switched pads")
+	}
+
 	// Close if ActionShouldClose is pressed, but display a confirmation dialog
 	// in case a game is running
 	if input.Pressed[0][input.ActionShouldClose] == 1 {