Merge pull request #2774 from AdmiralCurtiss/wiimote-extension-reconnect-on-button-press

Wiimote: Extend emulated Wiimote reconnect-on-button-press to attachments.

14 files changed, 59 insertions, 1 deletions

diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp
index 9049af9603..042ea95176 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp
@@ -50,3 +50,15 @@ void ControllerEmu::Extension::GetState(u8* const data)
 {
 	((WiimoteEmu::Attachment*)attachments[active_extension].get())->GetState(data);
 }
+
+bool ControllerEmu::Extension::IsButtonPressed() const
+{
+	// Extension == 0 means no Extension, > 0 means one is connected
+	// Since we want to use this to know if disconnected Wiimotes want to be connected, and disconnected
+	// Wiimotes (can? always?) have their active_extension set to -1, we also have to check the switch_extension
+	if (active_extension > 0)
+		return ((WiimoteEmu::Attachment*)attachments[active_extension].get())->IsButtonPressed();
+	if (switch_extension > 0)
+		return ((WiimoteEmu::Attachment*)attachments[switch_extension].get())->IsButtonPressed();
+	return false;
+}
diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.h
index f5c0afe6cc..9493430324 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.h
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.h
@@ -17,6 +17,7 @@ public:
 	Attachment(const char* const _name, WiimoteEmu::ExtensionReg& _reg);
 
 	virtual void GetState(u8* const data) {}
+	virtual bool IsButtonPressed() const { return false; }
 	void Reset();
 	std::string GetName() const override;
 
diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp
index 2c817366d7..2a72d5788d 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.cpp
@@ -135,5 +135,14 @@ void Classic::GetState(u8* const data)
 	ccdata->bt.hex ^= 0xFFFF;
 }
 
+bool Classic::IsButtonPressed() const
+{
+	u16 buttons = 0;
+	ControlState trigs[2] = { 0, 0 };
+	m_buttons->GetState(&buttons, classic_button_bitmasks);
+	m_dpad->GetState(&buttons, classic_dpad_bitmasks);
+	m_triggers->GetState(&buttons, classic_trigger_bitmasks, trigs);
+	return buttons != 0;
+}
 
 }
diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.h
index b812cb7f10..9a1b9dce92 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.h
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.h
@@ -16,6 +16,7 @@ class Classic : public Attachment
 public:
 	Classic(WiimoteEmu::ExtensionReg& _reg);
 	void GetState(u8* const data) override;
+	bool IsButtonPressed() const override;
 
 	enum
 	{
diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp
index 331195cc5b..de632aff18 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.cpp
@@ -81,4 +81,12 @@ void Drums::GetState(u8* const data)
 	ddata->bt ^= 0xFFFF;
 }
 
+bool Drums::IsButtonPressed() const
+{
+	u16 buttons = 0;
+	m_buttons->GetState(&buttons, drum_button_bitmasks);
+	m_pads->GetState(&buttons, drum_pad_bitmasks);
+	return buttons != 0;
+}
+
 }
diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.h
index f4aefbd0d8..adb4032b29 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.h
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.h
@@ -16,6 +16,7 @@ class Drums : public Attachment
 public:
 	Drums(WiimoteEmu::ExtensionReg& _reg);
 	void GetState(u8* const data) override;
+	bool IsButtonPressed() const override;
 
 	enum
 	{
diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp
index ab1688d7d9..7d64d278d4 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.cpp
@@ -100,4 +100,13 @@ void Guitar::GetState(u8* const data)
 	gdata->bt ^= 0xFFFF;
 }
 
+bool Guitar::IsButtonPressed() const
+{
+	u16 buttons = 0;
+	m_buttons->GetState(&buttons, guitar_button_bitmasks);
+	m_frets->GetState(&buttons, guitar_fret_bitmasks);
+	m_strum->GetState(&buttons, guitar_strum_bitmasks);
+	return buttons != 0;
+}
+
 }
diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.h
index 994b548358..a120ed891b 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.h
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.h
@@ -16,6 +16,7 @@ class Guitar : public Attachment
 public:
 	Guitar(WiimoteEmu::ExtensionReg& _reg);
 	void GetState(u8* const data) override;
+	bool IsButtonPressed() const override;
 
 	enum
 	{
diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp
index 2796e473f3..dedb98b080 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp
@@ -106,6 +106,13 @@ void Nunchuk::GetState(u8* const data)
 	ncdata->bt.acc_z_lsb = accel_z & 0x3;
 }
 
+bool Nunchuk::IsButtonPressed() const
+{
+	u8 buttons = 0;
+	m_buttons->GetState(&buttons, nunchuk_button_bitmasks);
+	return buttons != 0;
+}
+
 void Nunchuk::LoadDefaults(const ControllerInterface& ciface)
 {
 	// ugly macroooo
diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.h
index b97509c6d5..3470fe94a3 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.h
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.h
@@ -17,6 +17,7 @@ public:
 	Nunchuk(WiimoteEmu::ExtensionReg& _reg);
 
 	void GetState(u8* const data) override;
+	bool IsButtonPressed() const override;
 
 	enum
 	{
diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp
index 7246601bc3..2ba34033bf 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.cpp
@@ -127,5 +127,11 @@ void Turntable::GetState(u8* const data)
 		);
 }
 
+bool Turntable::IsButtonPressed() const
+{
+	u16 buttons = 0;
+	m_buttons->GetState(&buttons, turntable_button_bitmasks);
+	return buttons != 0;
+}
 
 }
diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.h b/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.h
index 590dc52b54..132d9946e4 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.h
+++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.h
@@ -16,6 +16,7 @@ class Turntable : public Attachment
 public:
 	Turntable(WiimoteEmu::ExtensionReg& _reg);
 	void GetState(u8* const data) override;
+	bool IsButtonPressed() const override;
 
 	enum
 	{
diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
index 8078887772..14dba4deaf 100644
--- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
@@ -880,7 +880,7 @@ void Wiimote::ConnectOnInput()
 	m_buttons->GetState(&buttons, button_bitmasks);
 	m_dpad->GetState(&buttons, dpad_bitmasks);
 
-	if (buttons != 0)
+	if (buttons != 0 || m_extension->IsButtonPressed())
 	{
 		Host_ConnectWiimote(m_index, true);
 		// arbitrary value so it doesn't try to send multiple requests before Dolphin can react
diff --git a/Source/Core/InputCommon/ControllerEmu.h b/Source/Core/InputCommon/ControllerEmu.h
index 0737556c69..a7ee642252 100644
--- a/Source/Core/InputCommon/ControllerEmu.h
+++ b/Source/Core/InputCommon/ControllerEmu.h
@@ -424,6 +424,7 @@ public:
 		~Extension() {}
 
 		void GetState(u8* const data);
+		bool IsButtonPressed() const;
 
 		std::vector<std::unique_ptr<ControllerEmu>> attachments;