OSD: Add Accessories type indicator to USB Input OSD

Author: kamfretoz

3rdparty/include/IconsPromptFont.h

@@ -185,7 +185,24 @@
 #define ICON_PF_KEYBOARD "\xE2\x90\xBD"
 #define ICON_PF_MOUSE "\xE2\x90\xBE"
 #define ICON_PF_MOUSE_AND_KEYBOARD "\xE2\x90\xBF"
+#define ICON_PF_DUALSHOCK2 "\xE2\x91\x81"
+#define ICON_PF_DUALSHOCK2_SLASH "\xE2\x91\x82"
 #define ICON_PF_GUITAR "\xE2\x91\x83"
+#define ICON_PF_STEERING_WHEEL_ALT "\xE2\x91\x84"
+#define ICON_PF_SEGA_SEAMIC "\xE2\x91\x85"
+#define ICON_PF_JOGCON "\xE2\x91\x86"
+#define ICON_PF_BUZZ_CONTROLLER "\xE2\x91\x87"
+#define ICON_PF_GAMETRAK_DEVICE "\xE2\x91\x88"
+#define ICON_PF_DJ_HERO_TURNTABLE "\xE2\x91\x89"
+#define ICON_PF_REALPLAY_BOWLING "\xE2\x91\x8A"
+#define ICON_PF_NEGCON "\xE2\x91\x8B"
+#define ICON_PF_REZ_VIBRATOR "\xE2\x91\x8C"
+#define ICON_PF_EYETOY_WEBCAM "\xE2\x91\x8D"
+#define ICON_PF_SINGSTAR_MIC "\xE2\x91\x8E"
+#define ICON_PF_GUNCON2 "\xE2\x91\x8F"
+#define ICON_PF_HEADSET "\xE2\x91\x90"
+#define ICON_PF_KEYBOARDMANIA "\xE2\x91\x91"
+#define ICON_PF_PRINTER "\xE2\x91\x92"
 #define ICON_PF_F1 "\xE2\x91\xA0"
 #define ICON_PF_F2 "\xE2\x91\xA1"
 #define ICON_PF_F3 "\xE2\x91\xA2"
@@ -362,6 +379,7 @@
 #define ICON_PF_HEARTBEAT_MAG "\xE2\x8D\xBE"
 #define ICON_PF_MONITOR_CODE "\xE2\x8D\xBF"
 #define ICON_PF_SIXTY_CIRCLE "\xE2\x8E\x80"
+#define ICON_PF_VIDEO_CAMERA "\xE2\x8E\x81"
 #define ICON_PF_SPEAKER_ALT "\xE2\x8D\xA7"
 #define ICON_PF_THUNDERBOLT "\xE2\x8D\x9C"
 #define ICON_PF_BACKWARD "\xE2\x8F\x8C"

3rdparty/promptfont/promptfont.sfd

@@ -467,7 +467,7 @@ ImFont* ImGuiManager::AddTextFont()
 {
 	// Exclude FA and PF ranges
 	// clang-format off
-	static constexpr ImWchar range_exclude_icons[] = { 0x2198,0x2199,0x219e,0x21a7,0x21b0,0x21b3,0x21ba,0x21c3,0x21ce,0x21d4,0x21dc,0x21dd,0x21e0,0x21e3,0x21e6,0x21e8,0x21f3,0x21f3,0x21f7,0x21fb,0x2206,0x2208,0x221a,0x221a,0x227a,0x227d,0x22bf,0x22c8,0x2349,0x2349,0x235a,0x2361,0x2364,0x2367,0x237a,0x237f,0x23b2,0x23b5,0x23cc,0x23cc,0x23f4,0x23f7,0x2427,0x243a,0x243d,0x243d,0x2443,0x2443,0x2460,0x246b,0x248f,0x248f,0x24f5,0x24ff,0x2605,0x2605,0x2699,0x2699,0x278a,0x278e,0xff21,0xff3a,0x0,0x0 };
+	static constexpr ImWchar range_exclude_icons[] = { 0x2198,0x2199,0x219e,0x21a7,0x21b0,0x21b3,0x21ba,0x21c3,0x21ce,0x21d4,0x21dc,0x21dd,0x21e0,0x21e3,0x21e6,0x21e8,0x21f3,0x21f3,0x21f7,0x21fb,0x2206,0x2208,0x221a,0x221a,0x227a,0x227d,0x22bf,0x22c8,0x2349,0x2349,0x235a,0x2361,0x2364,0x2367,0x237a,0x237f,0x23b2,0x23b5,0x23cc,0x23cc,0x23f4,0x23f7,0x2427,0x243a,0x243d,0x243e,0x2443,0x2452,0x2460,0x246b,0x248f,0x248f,0x24f5,0x24ff,0x2605,0x2605,0x2699,0x2699,0x278a,0x278e,0xff21,0xff3a,0x0,0x0 };
 	// clang-format on
 
 	ImFontConfig cfg;

bin/resources/fonts/promptfont.otf

@@ -670,7 +670,7 @@ __ri void ImGuiManager::DrawInputsOverlay(float scale, float margin, float spaci
 
 	for (u32 port = 0; port < USB::NUM_PORTS; port++)
 	{
-		if (EmuConfig.USB.Ports[port].DeviceType >= 0 && !USB::GetDeviceBindings(port).empty())
+		if (EmuConfig.USB.Ports[port].DeviceType >= 0)
 			num_ports++;
 	}
 
@@ -688,10 +688,7 @@ __ri void ImGuiManager::DrawInputsOverlay(float scale, float margin, float spaci
 			continue;
 
 		const Pad::ControllerInfo& cinfo = pad->GetInfo();
-		if (cinfo.icon_name)
-			text.format("{} {}", cinfo.icon_name, slot + 1u);
-		else
-			text.format("{} |", slot + 1u);
+		text.format("{} {} • {} |", ICON_FA_GAMEPAD, slot + 1u, cinfo.icon_name ? cinfo.icon_name : ICON_FA_TRIANGLE_EXCLAMATION);
 
 		for (u32 bind = 0; bind < static_cast<u32>(cinfo.bindings.size()); bind++)
 		{
@@ -744,10 +741,9 @@ __ri void ImGuiManager::DrawInputsOverlay(float scale, float margin, float spaci
 			continue;
 
 		const std::span<const InputBindingInfo> bindings(USB::GetDeviceBindings(port));
-		if (bindings.empty())
-			continue;
 
-		text.format("{} {} ", ICON_PF_USB, port + 1u);
+		const char* icon = USB::GetDeviceIconName(port);
+		text.format("{} {} • {} | ", ICON_PF_USB, port + 1u, icon ? icon : ICON_FA_TRIANGLE_EXCLAMATION);
 
 		for (const InputBindingInfo& bi : bindings)
 		{

pcsx2/ImGui/ImGuiManager.cpp

@@ -81,7 +81,7 @@ static const SettingInfo s_settings[] = {
 };
 
 const Pad::ControllerInfo PadDualshock2::ControllerInfo = {Pad::ControllerType::DualShock2, "DualShock2",
-	TRANSLATE_NOOP("Pad", "DualShock 2"), ICON_PF_GAMEPAD_ALT, s_bindings, s_settings, Pad::VibrationCapabilities::LargeSmallMotors};
+	TRANSLATE_NOOP("Pad", "DualShock 2"), ICON_PF_DUALSHOCK2, s_bindings, s_settings, Pad::VibrationCapabilities::LargeSmallMotors};
 
 void PadDualshock2::ConfigLog()
 {

pcsx2/ImGui/ImGuiOverlays.cpp

@@ -45,7 +45,7 @@ static const SettingInfo s_settings[] = {
 };
 
 const Pad::ControllerInfo PadJogcon::ControllerInfo = {Pad::ControllerType::Jogcon, "Jogcon",
-	TRANSLATE_NOOP("Pad", "Jogcon"), ICON_PF_GAMEPAD_ALT, s_bindings, s_settings, Pad::VibrationCapabilities::LargeSmallMotors};
+	TRANSLATE_NOOP("Pad", "Jogcon"), ICON_PF_JOGCON, s_bindings, s_settings, Pad::VibrationCapabilities::LargeSmallMotors};
 
 void PadJogcon::ConfigLog()
 {

pcsx2/SIO/Pad/PadDualshock2.cpp

@@ -42,7 +42,7 @@ static const SettingInfo s_settings[] = {
 };
 
 const Pad::ControllerInfo PadNegcon::ControllerInfo = {Pad::ControllerType::Negcon, "NeGcon",
-	TRANSLATE_NOOP("Pad", "NeGcon"), ICON_PF_GAMEPAD_ALT, s_bindings, s_settings, Pad::VibrationCapabilities::LargeSmallMotors};
+	TRANSLATE_NOOP("Pad", "NeGcon"), ICON_PF_NEGCON, s_bindings, s_settings, Pad::VibrationCapabilities::LargeSmallMotors};
 
 void PadNegcon::ConfigLog()
 {

pcsx2/SIO/Pad/PadJogcon.cpp

@@ -561,6 +561,15 @@ const char* USB::GetDeviceName(const std::string_view device)
 	return dev ? dev->Name() : TRANSLATE_NOOP("USB", "Not Connected");
 }
 
+const char* USB::GetDeviceIconName(u32 port)
+{
+    pxAssert(port < NUM_PORTS);
+    if (s_usb_device_proxy[port])
+        return s_usb_device_proxy[port]->IconName();
+    else
+        return nullptr;
+}
+
 const char* USB::GetDeviceSubtypeName(const std::string_view device, u32 subtype)
 {
 	const DeviceProxy* dev = RegisterDevice::instance().Device(device);

pcsx2/SIO/Pad/PadNegcon.cpp

@@ -27,6 +27,7 @@ namespace USB
 
 	std::vector<std::pair<const char*, const char*>> GetDeviceTypes();
 	const char* GetDeviceName(const std::string_view device);
+	const char* GetDeviceIconName(u32 port);
 	const char* GetDeviceSubtypeName(const std::string_view device, u32 subtype);
 	std::span<const char*> GetDeviceSubtypes(const std::string_view device);
 	std::span<const InputBindingInfo> GetDeviceBindings(const std::string_view device, u32 subtype);