USB: Move to Qt (with *significant* refactoring)

2026-08-24 16:50:16 -07:00 · 2022-12-18 03:47:00 +00:00
parent 4ebb5a87b2
commit fc14b8f0da
196 changed files with 8511 additions and 26760 deletions
@@ -42,8 +42,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblzma", "3rdparty\xz\libl
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "3rdparty\fmt\fmt.vcxproj", "{449AD25E-424A-4714-BABC-68706CDCC33B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsamplerate", "3rdparty\libsamplerate\libsamplerate.vcxproj", "{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchdr", "3rdparty\libchdr\libchdr.vcxproj", "{A0D2B3AD-1F72-4EE3-8B5C-F2C358DA35F0}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpgd", "3rdparty\jpgd\jpgd.vcxproj", "{ED2F21FD-0A36-4A8F-9B90-E7D92A2ACB63}"
@@ -248,18 +246,6 @@ Global
 		{449AD25E-424A-4714-BABC-68706CDCC33B}.Release AVX2|x64.Build.0 = Release|x64
 		{449AD25E-424A-4714-BABC-68706CDCC33B}.Release|x64.ActiveCfg = Release|x64
 		{449AD25E-424A-4714-BABC-68706CDCC33B}.Release|x64.Build.0 = Release|x64
-		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Debug AVX2|x64.ActiveCfg = Debug|x64
-		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Debug AVX2|x64.Build.0 = Debug|x64
-		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Debug|x64.ActiveCfg = Debug|x64
-		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Debug|x64.Build.0 = Debug|x64
-		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Devel AVX2|x64.ActiveCfg = Devel|x64
-		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Devel AVX2|x64.Build.0 = Devel|x64
-		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Devel|x64.ActiveCfg = Devel|x64
-		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Devel|x64.Build.0 = Devel|x64
-		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Release AVX2|x64.ActiveCfg = Release|x64
-		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Release AVX2|x64.Build.0 = Release|x64
-		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Release|x64.ActiveCfg = Release|x64
-		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F}.Release|x64.Build.0 = Release|x64
 		{A0D2B3AD-1F72-4EE3-8B5C-F2C358DA35F0}.Debug AVX2|x64.ActiveCfg = Debug|x64
 		{A0D2B3AD-1F72-4EE3-8B5C-F2C358DA35F0}.Debug AVX2|x64.Build.0 = Debug|x64
 		{A0D2B3AD-1F72-4EE3-8B5C-F2C358DA35F0}.Debug|x64.ActiveCfg = Debug|x64
@@ -434,7 +420,6 @@ Global
 		{27F17499-A372-4408-8AFA-4F9F4584FBD3} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38}
 		{12728250-16EC-4DC6-94D7-E21DD88947F8} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38}
 		{449AD25E-424A-4714-BABC-68706CDCC33B} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38}
-		{47AFDBEF-F15F-4BC0-B436-5BE443C3F80F} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38}
 		{A0D2B3AD-1F72-4EE3-8B5C-F2C358DA35F0} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38}
 		{ED2F21FD-0A36-4A8F-9B90-E7D92A2ACB63} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38}
 		{C0293B32-5ACF-40F0-AA6C-E6DA6F3BF33A} = {78EBE642-7A4D-4EA7-86BE-5639C6646C38}
@@ -258,6 +258,10 @@ void Host::OnInputDeviceDisconnected(const std::string_view& identifier)
 {
 }

+void Host::SetRelativeMouseMode(bool enabled)
+{
+}
+
 bool Host::AcquireHostDisplay(RenderAPI api, bool clear_state_on_fail)
 {
 	const std::optional<WindowInfo> wi(GSRunner::GetPlatformWindowInfo());
@@ -772,4 +776,4 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 	return DefWindowProcW(hwnd, msg, wParam, lParam);
 }

-#endif // _WIN32
+#endif // _WIN32
@@ -117,6 +117,8 @@ target_sources(pcsx2-qt PRIVATE
 	Settings/SettingsDialog.cpp
 	Settings/SettingsDialog.h
 	Settings/SettingsDialog.ui
+	Settings/USBBindingWidget_DrivingForce.ui
+	Settings/USBBindingWidget_GTForce.ui
 	Tools/InputRecording/NewInputRecordingDlg.cpp
 	Tools/InputRecording/NewInputRecordingDlg.h
 	Tools/InputRecording/NewInputRecordingDlg.ui
@@ -84,17 +84,15 @@ std::optional<WindowInfo> DisplayWidget::getWindowInfo()
 	return ret;
 }

-void DisplayWidget::updateRelativeMode(bool master_enable)
+void DisplayWidget::updateRelativeMode(bool enabled)
 {
-	bool relative_mode = master_enable && InputManager::HasPointerAxisBinds();
-
 #ifdef _WIN32
 	// prefer ClipCursor() over warping movement when we're using raw input
-	bool clip_cursor = relative_mode && false /*InputManager::IsUsingRawInput()*/;
-	if (m_relative_mouse_enabled == relative_mode && m_clip_mouse_enabled == clip_cursor)
+	bool clip_cursor = enabled && false /*InputManager::IsUsingRawInput()*/;
+	if (m_relative_mouse_enabled == enabled && m_clip_mouse_enabled == clip_cursor)
 		return;

-	DevCon.WriteLn("updateRelativeMode(): relative=%s, clip=%s", relative_mode ? "yes" : "no", clip_cursor ? "yes" : "no");
+	DevCon.WriteLn("updateRelativeMode(): relative=%s, clip=%s", enabled ? "yes" : "no", clip_cursor ? "yes" : "no");

 	if (!clip_cursor && m_clip_mouse_enabled)
 	{
@@ -102,13 +100,13 @@ void DisplayWidget::updateRelativeMode(bool master_enable)
 		ClipCursor(nullptr);
 	}
 #else
-	if (m_relative_mouse_enabled == relative_mode)
+	if (m_relative_mouse_enabled == enabled)
 		return;

-	DevCon.WriteLn("updateRelativeMode(): relative=%s", relative_mode ? "yes" : "no");
+	DevCon.WriteLn("updateRelativeMode(): relative=%s", enabled ? "yes" : "no");
 #endif

-	if (relative_mode)
+	if (enabled)
 	{
 #ifdef _WIN32
 		m_relative_mouse_enabled = !clip_cursor;
@@ -129,21 +127,22 @@ void DisplayWidget::updateRelativeMode(bool master_enable)

 }

-void DisplayWidget::updateCursor(bool master_enable)
+void DisplayWidget::updateCursor(bool hidden)
 {
-#ifdef _WIN32
-	const bool hide = master_enable && (m_should_hide_cursor || m_relative_mouse_enabled || m_clip_mouse_enabled);
-#else
-	const bool hide = master_enable && (m_should_hide_cursor || m_relative_mouse_enabled);
-#endif
-	if (m_cursor_hidden == hide)
+	if (m_cursor_hidden == hidden)
 		return;

-	m_cursor_hidden = hide;
-	if (hide)
+	m_cursor_hidden = hidden;
+	if (hidden)
+	{
+		DevCon.WriteLn("updateCursor(): Cursor is now hidden");
 		setCursor(Qt::BlankCursor);
+	}
 	else
+	{
+		DevCon.WriteLn("updateCursor(): Cursor is now shown");
 		unsetCursor();
+	}
 }

 void DisplayWidget::handleCloseEvent(QCloseEvent* event)
@@ -32,15 +32,13 @@ public:

 	QPaintEngine* paintEngine() const override;

-	__fi void setShouldHideCursor(bool hide) { m_should_hide_cursor = hide; }
-
 	int scaledWindowWidth() const;
 	int scaledWindowHeight() const;

 	std::optional<WindowInfo> getWindowInfo();

-	void updateRelativeMode(bool master_enable);
-	void updateCursor(bool master_enable);
+	void updateRelativeMode(bool enabled);
+	void updateCursor(bool hidden);

 	void handleCloseEvent(QCloseEvent* event);

@@ -60,7 +58,6 @@ private:
 #ifdef _WIN32
 	bool m_clip_mouse_enabled = false;
 #endif
-	bool m_should_hide_cursor = false;
 	bool m_cursor_hidden = false;

 	std::vector<int> m_keys_pressed_with_modifiers;
@@ -409,6 +409,7 @@ void MainWindow::connectVMThreadSignals(EmuThread* thread)
 	connect(thread, &EmuThread::onUpdateDisplayRequested, this, &MainWindow::updateDisplay, Qt::BlockingQueuedConnection);
 	connect(thread, &EmuThread::onDestroyDisplayRequested, this, &MainWindow::destroyDisplay, Qt::BlockingQueuedConnection);
 	connect(thread, &EmuThread::onResizeDisplayRequested, this, &MainWindow::displayResizeRequested);
+	connect(thread, &EmuThread::onRelativeMouseModeRequested, this, &MainWindow::relativeMouseModeRequested);
 	connect(thread, &EmuThread::onVMStarting, this, &MainWindow::onVMStarting);
 	connect(thread, &EmuThread::onVMStarted, this, &MainWindow::onVMStarted);
 	connect(thread, &EmuThread::onVMPaused, this, &MainWindow::onVMPaused);
@@ -1089,7 +1090,7 @@ bool MainWindow::isRenderingToMain() const

 bool MainWindow::shouldHideMouseCursor() const
 {
-	return isRenderingFullscreen() && Host::GetBoolSettingValue("UI", "HideMouseCursor", false);
+	return (isRenderingFullscreen() && Host::GetBoolSettingValue("UI", "HideMouseCursor", false)) || m_relative_mouse_mode;
 }

 bool MainWindow::shouldHideMainWindow() const
@@ -1250,7 +1251,7 @@ void MainWindow::requestExit()
 void MainWindow::checkForSettingChanges()
 {
 	if (m_display_widget)
-		m_display_widget->updateRelativeMode(s_vm_valid && !s_vm_paused);
+		updateDisplayWidgetCursor();

 	updateWindowState();
 }
@@ -1802,10 +1803,7 @@ void MainWindow::onVMPaused()
 	m_last_fps_status = m_status_verbose_widget->text();
 	m_status_verbose_widget->setText(tr("Paused"));
 	if (m_display_widget)
-	{
-		m_display_widget->updateRelativeMode(false);
-		m_display_widget->updateCursor(false);
-	}
+		updateDisplayWidgetCursor();
 }

 void MainWindow::onVMResumed()
@@ -1824,8 +1822,7 @@ void MainWindow::onVMResumed()
 	m_last_fps_status = QString();
 	if (m_display_widget)
 	{
-		m_display_widget->updateRelativeMode(true);
-		m_display_widget->updateCursor(true);
+		updateDisplayWidgetCursor();
 		m_display_widget->setFocus();
 	}
 }
@@ -1842,14 +1839,9 @@ void MainWindow::onVMStopped()
 	updateInputRecordingActions(false);

 	if (m_display_widget)
-	{
-		m_display_widget->updateRelativeMode(false);
-		m_display_widget->updateCursor(false);
-	}
+		updateDisplayWidgetCursor();
 	else
-	{
 		switchToGameListView();
-	}

 	// reload played time
 	if (m_game_list_widget->isShowingGameList())
@@ -2035,9 +2027,7 @@ DisplayWidget* MainWindow::createDisplay(bool fullscreen, bool render_to_main)
 	m_ui.actionStartFullscreenUI->setEnabled(false);
 	m_ui.actionStartFullscreenUI2->setEnabled(false);

-	m_display_widget->setShouldHideCursor(shouldHideMouseCursor());
-	m_display_widget->updateRelativeMode(s_vm_valid && !s_vm_paused);
-	m_display_widget->updateCursor(s_vm_valid && !s_vm_paused);
+	updateDisplayWidgetCursor();
 	m_display_widget->setFocus();

 	g_host_display->DoneCurrent();
@@ -2083,10 +2073,8 @@ DisplayWidget* MainWindow::updateDisplay(bool fullscreen, bool render_to_main, b
 			container->showNormal();
 		}

+		updateDisplayWidgetCursor();
 		m_display_widget->setFocus();
-		m_display_widget->setShouldHideCursor(shouldHideMouseCursor());
-		m_display_widget->updateRelativeMode(s_vm_valid && !s_vm_paused);
-		m_display_widget->updateCursor(s_vm_valid && !s_vm_paused);
 		updateWindowState();

 		QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
@@ -2122,10 +2110,8 @@ DisplayWidget* MainWindow::updateDisplay(bool fullscreen, bool render_to_main, b
 	updateWindowTitle();
 	updateWindowState();

+	updateDisplayWidgetCursor();
 	m_display_widget->setFocus();
-	m_display_widget->setShouldHideCursor(shouldHideMouseCursor());
-	m_display_widget->updateRelativeMode(s_vm_valid && !s_vm_paused);
-	m_display_widget->updateCursor(s_vm_valid && !s_vm_paused);

 	return m_display_widget;
 }
@@ -2221,6 +2207,16 @@ void MainWindow::displayResizeRequested(qint32 width, qint32 height)
 	QtUtils::ResizePotentiallyFixedSizeWindow(this, width, height + extra_height);
 }

+void MainWindow::relativeMouseModeRequested(bool enabled)
+{
+	if (m_relative_mouse_mode == enabled)
+		return;
+
+	m_relative_mouse_mode = enabled;
+	if (s_vm_valid && !s_vm_paused)
+		updateDisplayWidgetCursor();
+}
+
 void MainWindow::destroyDisplay()
 {
 	// Now we can safely destroy the display window.
@@ -2284,6 +2280,12 @@ void MainWindow::destroyDisplayWidget(bool show_game_list)
 	updateDisplayRelatedActions(false, false, false);
 }

+void MainWindow::updateDisplayWidgetCursor()
+{
+	m_display_widget->updateRelativeMode(s_vm_valid && !s_vm_paused && m_relative_mouse_mode);
+	m_display_widget->updateCursor(s_vm_valid && !s_vm_paused && shouldHideMouseCursor());
+}
+
 void MainWindow::focusDisplayWidget()
 {
 	if (!m_display_widget || centralWidget() != m_display_widget)
@@ -129,6 +129,7 @@ private Q_SLOTS:
 	DisplayWidget* createDisplay(bool fullscreen, bool render_to_main);
 	DisplayWidget* updateDisplay(bool fullscreen, bool render_to_main, bool surfaceless);
 	void displayResizeRequested(qint32 width, qint32 height);
+	void relativeMouseModeRequested(bool enabled);
 	void destroyDisplay();
 	void focusDisplayWidget();

@@ -231,6 +232,7 @@ private:
 	void restoreDisplayWindowGeometryFromConfig();
 	void createDisplayWidget(bool fullscreen, bool render_to_main, bool is_exclusive_fullscreen);
 	void destroyDisplayWidget(bool show_game_list);
+	void updateDisplayWidgetCursor();
 	void setDisplayFullscreen(const std::string& fullscreen_mode);

 	SettingsDialog* getSettingsDialog();
@@ -283,6 +285,7 @@ private:
 	quint32 m_current_game_crc;

 	bool m_display_created = false;
+	bool m_relative_mouse_mode = false;
 	bool m_save_states_invalidated = false;
 	bool m_was_paused_on_surface_loss = false;
 	bool m_was_disc_change_request = false;
@@ -1486,6 +1486,11 @@ void Host::OnInputDeviceDisconnected(const std::string_view& identifier)
 	emit g_emu_thread->onInputDeviceDisconnected(identifier.empty() ? QString() : QString::fromUtf8(identifier.data(), identifier.size()));
 }

+void Host::SetRelativeMouseMode(bool enabled)
+{
+	emit g_emu_thread->onRelativeMouseModeRequested(enabled);
+}
+
 //////////////////////////////////////////////////////////////////////////
 // Hotkeys
 //////////////////////////////////////////////////////////////////////////
@@ -120,6 +120,7 @@ Q_SIGNALS:
 	DisplayWidget* onUpdateDisplayRequested(bool fullscreen, bool render_to_main, bool surfaceless);
 	void onResizeDisplayRequested(qint32 width, qint32 height);
 	void onDestroyDisplayRequested();
+	void onRelativeMouseModeRequested(bool enabled);

 	/// Called when the VM is starting initialization, but has not been completed yet.
 	void onVMStarting();
@@ -19,10 +19,13 @@

 #include <QtWidgets/QWidget>

+#include "gsl/span"
+
 #include "ui_ControllerBindingWidget.h"
 #include "ui_ControllerBindingWidget_DualShock2.h"
 #include "ui_ControllerMacroWidget.h"
 #include "ui_ControllerMacroEditWidget.h"
+#include "ui_USBDeviceWidget.h"

 class InputBindingWidget;
 class ControllerSettingsDialog;
@@ -31,6 +34,8 @@ class ControllerMacroWidget;
 class ControllerMacroEditWidget;
 class ControllerBindingWidget_Base;

+class USBBindingWidget;
+
 class ControllerBindingWidget final : public QWidget
 {
 	Q_OBJECT
@@ -133,16 +138,20 @@ class ControllerCustomSettingsWidget : public QWidget
 	Q_OBJECT

 public:
-	ControllerCustomSettingsWidget(ControllerBindingWidget* parent, QWidget* parent_widget);
+	ControllerCustomSettingsWidget(gsl::span<const SettingInfo> settings, std::string config_section, std::string config_prefix,
+		const QString& group_title, const char* translation_ctx, ControllerSettingsDialog* dialog, QWidget* parent_widget);
 	~ControllerCustomSettingsWidget();

-	void createSettingWidgets(ControllerBindingWidget* parent, QWidget* widget_parent, QGridLayout* layout, const PAD::ControllerInfo* cinfo);
-
 private Q_SLOTS:
 	void restoreDefaults();

 private:
-	ControllerBindingWidget* m_parent;
+	void createSettingWidgets(const char* translation_ctx, QWidget* widget_parent, QGridLayout* layout);
+
+	gsl::span<const SettingInfo> m_settings;
+	std::string m_config_section;
+	std::string m_config_prefix;
+	ControllerSettingsDialog* m_dialog;
 };

 //////////////////////////////////////////////////////////////////////////
@@ -182,3 +191,71 @@ public:
 private:
 	Ui::ControllerBindingWidget_DualShock2 m_ui;
 };
+
+//////////////////////////////////////////////////////////////////////////
+
+class USBDeviceWidget final : public QWidget
+{
+	Q_OBJECT
+
+public:
+	USBDeviceWidget(QWidget* parent, ControllerSettingsDialog* dialog, u32 port);
+	~USBDeviceWidget();
+
+	QIcon getIcon() const;
+
+	__fi ControllerSettingsDialog* getDialog() const { return m_dialog; }
+	__fi const std::string& getConfigSection() const { return m_config_section; }
+	__fi const std::string& getDeviceType() const { return m_device_type; }
+	__fi u32 getPortNumber() const { return m_port_number; }
+
+private Q_SLOTS:
+	void onTypeChanged();
+	void onSubTypeChanged(int new_index);
+	void onAutomaticBindingClicked();
+	void onClearBindingsClicked();
+	void onBindingsClicked();
+	void onSettingsClicked();
+
+private:
+	void populateDeviceTypes();
+	void populatePages();
+	void updateHeaderToolButtons();
+	void doDeviceAutomaticBinding(const QString& device);
+
+	Ui::USBDeviceWidget m_ui;
+
+	ControllerSettingsDialog* m_dialog;
+
+	std::string m_config_section;
+	std::string m_device_type;
+	u32 m_device_subtype;
+	u32 m_port_number;
+
+	USBBindingWidget* m_bindings_widget = nullptr;
+	ControllerCustomSettingsWidget* m_settings_widget = nullptr;
+};
+
+class USBBindingWidget : public QWidget
+{
+	Q_OBJECT
+
+public:
+	USBBindingWidget(USBDeviceWidget* parent);
+	~USBBindingWidget() override;
+
+	__fi ControllerSettingsDialog* getDialog() const { return static_cast<USBDeviceWidget*>(parent())->getDialog(); }
+	__fi const std::string& getConfigSection() const { return static_cast<USBDeviceWidget*>(parent())->getConfigSection(); }
+	__fi const std::string& getDeviceType() const { return static_cast<USBDeviceWidget*>(parent())->getDeviceType(); }
+	__fi u32 getPortNumber() const { return static_cast<USBDeviceWidget*>(parent())->getPortNumber(); }
+
+	QIcon getIcon() const;
+
+	static USBBindingWidget* createInstance(const std::string& type, u32 subtype, gsl::span<const InputBindingInfo> bindings, USBDeviceWidget* parent);
+
+protected:
+	std::string getBindingKey(const char* binding_name) const;
+
+	void createWidgets(gsl::span<const InputBindingInfo> bindings);
+	void bindWidgets(gsl::span<const InputBindingInfo> bindings);
+};
@@ -114,7 +114,8 @@ void ControllerSettingsDialog::onNewProfileClicked()
 	}

 	const int res = QMessageBox::question(this, tr("Create Input Profile"),
-		tr("Do you want to copy all bindings from the currently-selected profile to the new profile? Selecting No will create a completely empty profile."),
+		tr("Do you want to copy all bindings from the currently-selected profile to the new profile? Selecting No will create a completely "
+		   "empty profile."),
 		QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
 	if (res == QMessageBox::Cancel)
 		return;
@@ -140,7 +141,8 @@ void ControllerSettingsDialog::onNewProfileClicked()

 	if (!temp_si.Save())
 	{
-		QMessageBox::critical(this, tr("Error"), tr("Failed to save the new profile to '%1'.").arg(QString::fromStdString(temp_si.GetFileName())));
+		QMessageBox::critical(
+			this, tr("Error"), tr("Failed to save the new profile to '%1'.").arg(QString::fromStdString(temp_si.GetFileName())));
 		return;
 	}

@@ -252,7 +254,7 @@ void ControllerSettingsDialog::onVibrationMotorsEnumerated(const QList<InputBind

 	for (const InputBindingKey key : motors)
 	{
-		const std::string key_str(InputManager::ConvertInputBindingKeyToString(key));
+		const std::string key_str(InputManager::ConvertInputBindingKeyToString(InputBindingInfo::Type::Motor, key));
 		if (!key_str.empty())
 			m_vibration_motors.push_back(QString::fromStdString(key_str));
 	}
@@ -380,8 +382,7 @@ void ControllerSettingsDialog::createWidgets()
 	}

 	// load mtap settings
-	const std::array<bool, 2> mtap_enabled = {{getBoolValue("Pad", "MultitapPort1", false),
-		getBoolValue("Pad", "MultitapPort2", false)}};
+	const std::array<bool, 2> mtap_enabled = {{getBoolValue("Pad", "MultitapPort1", false), getBoolValue("Pad", "MultitapPort2", false)}};

 	// we reorder things a little to make it look less silly for mtap
 	static constexpr const std::array<u32, MAX_PORTS> mtap_port_order = {{0, 2, 3, 4, 1, 5, 6, 7}};
@@ -401,14 +402,29 @@ void ControllerSettingsDialog::createWidgets()
 		const QString display_name(ci ? QString::fromUtf8(ci->display_name) : QStringLiteral("Unknown"));

 		QListWidgetItem* item = new QListWidgetItem();
-		item->setText(mtap_enabled[port] ?
-						  (tr("Controller Port %1%2\n%3").arg(port + 1).arg(s_mtap_slot_names[slot]).arg(display_name)) :
-                          tr("Controller Port %1\n%2").arg(port + 1).arg(display_name));
+		item->setText(mtap_enabled[port] ? (tr("Controller Port %1%2\n%3").arg(port + 1).arg(s_mtap_slot_names[slot]).arg(display_name)) :
+                                           tr("Controller Port %1\n%2").arg(port + 1).arg(display_name));
 		item->setIcon(m_port_bindings[global_slot]->getIcon());
 		item->setData(Qt::UserRole, QVariant(global_slot));
 		m_ui.settingsCategory->addItem(item);
 	}

+	// USB ports
+	for (u32 port = 0; port < USB::NUM_PORTS; port++)
+	{
+		m_usb_bindings[port] = new USBDeviceWidget(m_ui.settingsContainer, this, port);
+		m_ui.settingsContainer->addWidget(m_usb_bindings[port]);
+
+		const std::string dtype(getStringValue(fmt::format("USB{}", port + 1).c_str(), "Type", "None"));
+		const QString display_name(qApp->translate("USB", USB::GetDeviceName(dtype)));
+
+		QListWidgetItem* item = new QListWidgetItem();
+		item->setText(tr("USB Port %1\n%2").arg(port + 1).arg(display_name));
+		item->setIcon(m_usb_bindings[port]->getIcon());
+		item->setData(Qt::UserRole, QVariant(MAX_PORTS + port));
+		m_ui.settingsCategory->addItem(item);
+	}
+
 	// only add hotkeys if we're editing global settings
 	if (!m_profile_interface || m_profile_interface->GetBoolValue("Pad", "UseProfileHotkeyBindings", false))
 	{
@@ -439,14 +455,32 @@ void ControllerSettingsDialog::updateListDescription(u32 global_slot, Controller
 			const PAD::ControllerInfo* ci = PAD::GetControllerInfo(widget->getControllerType());
 			const QString display_name(ci ? QString::fromUtf8(ci->display_name) : QStringLiteral("Unknown"));

-			item->setText(mtap_enabled ?
-							  (tr("Controller Port %1%2\n%3").arg(port + 1).arg(s_mtap_slot_names[slot]).arg(display_name)) :
-                              tr("Controller Port %1\n%2").arg(port + 1).arg(display_name));
+			item->setText(mtap_enabled ? (tr("Controller Port %1%2\n%3").arg(port + 1).arg(s_mtap_slot_names[slot]).arg(display_name)) :
+                                         tr("Controller Port %1\n%2").arg(port + 1).arg(display_name));
 			item->setIcon(widget->getIcon());
 			break;
 		}
 	}
 }
+
+void ControllerSettingsDialog::updateListDescription(u32 port, USBDeviceWidget* widget)
+{
+	for (int i = 0; i < m_ui.settingsCategory->count(); i++)
+	{
+		QListWidgetItem* item = m_ui.settingsCategory->item(i);
+		const QVariant data(item->data(Qt::UserRole));
+		if (data.type() == QVariant::UInt && data.toUInt() == (MAX_PORTS + port))
+		{
+			const std::string dtype(getStringValue(fmt::format("USB{}", port + 1).c_str(), "Type", "None"));
+			const QString display_name(qApp->translate("USB", USB::GetDeviceName(dtype)));
+
+			item->setText(tr("USB Port %1\n%2").arg(port + 1).arg(display_name));
+			item->setIcon(widget->getIcon());
+			break;
+		}
+	}
+}
+
 void ControllerSettingsDialog::refreshProfileList()
 {
 	const std::vector<std::string> names(PAD::GetInputProfileNames());
@@ -15,7 +15,8 @@

 #pragma once
 #include "ui_ControllerSettingsDialog.h"
-#include "Frontend/InputManager.h"
+#include "pcsx2/Frontend/InputManager.h"
+#include "pcsx2/USB/USB.h"
 #include <QtCore/QList>
 #include <QtCore/QPair>
 #include <QtCore/QString>
@@ -27,6 +28,7 @@
 class ControllerGlobalSettingsWidget;
 class ControllerBindingWidget;
 class HotkeySettingsWidget;
+class USBDeviceWidget;

 class SettingsInterface;

@@ -61,6 +63,7 @@ public:
 	__fi SettingsInterface* getProfileSettingsInterface() { return m_profile_interface.get(); }

 	void updateListDescription(u32 global_slot, ControllerBindingWidget* widget);
+	void updateListDescription(u32 port, USBDeviceWidget* widget);

 	// Helper functions for updating setting values globally or in the profile.
 	bool getBoolValue(const char* section, const char* key, bool default_value) const;
@@ -93,8 +96,6 @@ private Q_SLOTS:
 	void createWidgets();

 private:
-	static QIcon getIconForType(const std::string& type);
-
 	void refreshProfileList();
 	void switchProfile(const QString& name);

@@ -102,6 +103,7 @@ private:

 	ControllerGlobalSettingsWidget* m_global_settings = nullptr;
 	std::array<ControllerBindingWidget*, MAX_PORTS> m_port_bindings{};
+	std::array<USBDeviceWidget*, USB::NUM_PORTS> m_usb_bindings{};
 	HotkeySettingsWidget* m_hotkey_settings = nullptr;

 	QList<QPair<QString, QString>> m_device_list;
@@ -9,7 +9,7 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>1300</width>
+    <width>1305</width>
    <height>680</height>
   </rect>
  </property>
@@ -33,13 +33,13 @@
     </property>
     <property name="minimumSize">
      <size>
-       <width>150</width>
+       <width>170</width>
       <height>0</height>
      </size>
     </property>
     <property name="maximumSize">
      <size>
-       <width>150</width>
+       <width>170</width>
       <height>16777215</height>
      </size>
     </property>
@@ -92,7 +92,8 @@
          <string>Load Profile</string>
         </property>
         <property name="icon">
-          <iconset theme="folder-open-line"/>
+          <iconset theme="folder-open-line">
+           <normaloff>.</normaloff>.</iconset>
         </property>
        </widget>
       </item>
@@ -113,7 +114,8 @@
          <string>Restore Defaults</string>
         </property>
         <property name="icon">
-          <iconset theme="restart-line"/>
+          <iconset theme="restart-line">
+           <normaloff>.</normaloff>.</iconset>
         </property>
        </widget>
       </item>
@@ -88,7 +88,8 @@ void HotkeySettingsWidget::createButtons()
 		QLabel* label = new QLabel(qApp->translate("Hotkeys", hotkey->display_name), m_container);
 		layout->addWidget(label, target_row, 0);

-		InputBindingWidget* bind = new InputBindingWidget(m_container, m_dialog->getProfileSettingsInterface(), "Hotkeys", hotkey->name);
+		InputBindingWidget* bind = new InputBindingWidget(
+			m_container, m_dialog->getProfileSettingsInterface(), InputBindingInfo::Type::Button, "Hotkeys", hotkey->name);
 		bind->setMinimumWidth(300);
 		layout->addWidget(bind, target_row, 1);
 	}
@@ -27,17 +27,17 @@
 // _BitScanForward()
 #include "pcsx2/GS/GSIntrin.h"

-InputBindingDialog::InputBindingDialog(SettingsInterface* sif, std::string section_name, std::string key_name,
-	std::vector<std::string> bindings, QWidget* parent)
+InputBindingDialog::InputBindingDialog(SettingsInterface* sif, InputBindingInfo::Type bind_type, std::string section_name,
+	std::string key_name, std::vector<std::string> bindings, QWidget* parent)
 	: QDialog(parent)
 	, m_sif(sif)
+	, m_bind_type(bind_type)
 	, m_section_name(std::move(section_name))
 	, m_key_name(std::move(key_name))
 	, m_bindings(std::move(bindings))
 {
 	m_ui.setupUi(this);
-	m_ui.title->setText(
-		tr("Bindings for %1 %2").arg(QString::fromStdString(m_section_name)).arg(QString::fromStdString(m_key_name)));
+	m_ui.title->setText(tr("Bindings for %1 %2").arg(QString::fromStdString(m_section_name)).arg(QString::fromStdString(m_key_name)));
 	m_ui.buttonBox->button(QDialogButtonBox::Close)->setText(tr("Close"));

 	connect(m_ui.addBinding, &QPushButton::clicked, this, &InputBindingDialog::onAddBindingButtonClicked);
@@ -159,8 +159,7 @@ void InputBindingDialog::startListeningForInput(u32 timeout_in_seconds)
 	m_input_listen_timer->setSingleShot(false);
 	m_input_listen_timer->start(1000);

-	m_input_listen_timer->connect(m_input_listen_timer, &QTimer::timeout, this,
-		&InputBindingDialog::onInputListenTimerTimeout);
+	m_input_listen_timer->connect(m_input_listen_timer, &QTimer::timeout, this, &InputBindingDialog::onInputListenTimerTimeout);
 	m_input_listen_remaining_seconds = timeout_in_seconds;
 	m_ui.status->setText(tr("Push Button/Axis... [%1]").arg(m_input_listen_remaining_seconds));
 	m_ui.addBinding->setEnabled(false);
@@ -198,8 +197,7 @@ void InputBindingDialog::addNewBinding()
 	if (m_new_bindings.empty())
 		return;

-	const std::string new_binding(
-		InputManager::ConvertInputBindingKeysToString(m_new_bindings.data(), m_new_bindings.size()));
+	const std::string new_binding(InputManager::ConvertInputBindingKeysToString(m_bind_type, m_new_bindings.data(), m_new_bindings.size()));
 	if (!new_binding.empty())
 	{
 		if (std::find(m_bindings.begin(), m_bindings.end(), new_binding) != m_bindings.end())
@@ -299,8 +297,7 @@ void InputBindingDialog::inputManagerHookCallback(InputBindingKey key, float val
 void InputBindingDialog::hookInputManager()
 {
 	InputManager::SetHook([this](InputBindingKey key, float value) {
-		QMetaObject::invokeMethod(this, "inputManagerHookCallback", Qt::QueuedConnection, Q_ARG(InputBindingKey, key),
-			Q_ARG(float, value));
+		QMetaObject::invokeMethod(this, "inputManagerHookCallback", Qt::QueuedConnection, Q_ARG(InputBindingKey, key), Q_ARG(float, value));
 		return InputInterceptHook::CallbackResult::StopProcessingEvent;
 	});
 }
@@ -15,7 +15,8 @@

 #pragma once
 #include "ui_InputBindingDialog.h"
-#include "Frontend/InputManager.h"
+#include "pcsx2/Config.h"
+#include "pcsx2/Frontend/InputManager.h"
 #include <QtWidgets/QDialog>
 #include <optional>
 #include <string>
@@ -28,7 +29,8 @@ class InputBindingDialog : public QDialog
 	Q_OBJECT

 public:
-	InputBindingDialog(SettingsInterface* sif, std::string section_name, std::string key_name, std::vector<std::string> bindings, QWidget* parent);
+	InputBindingDialog(SettingsInterface* sif, InputBindingInfo::Type bind_type, std::string section_name, std::string key_name,
+		std::vector<std::string> bindings, QWidget* parent);
 	~InputBindingDialog();

 protected Q_SLOTS:
@@ -61,6 +63,7 @@ protected:
 	Ui::InputBindingDialog m_ui;

 	SettingsInterface* m_sif;
+	InputBindingInfo::Type m_bind_type;
 	std::string m_section_name;
 	std::string m_key_name;
 	std::vector<std::string> m_bindings;
@@ -40,7 +40,8 @@ InputBindingWidget::InputBindingWidget(QWidget* parent)
 	connect(this, &QPushButton::clicked, this, &InputBindingWidget::onClicked);
 }

-InputBindingWidget::InputBindingWidget(QWidget* parent, SettingsInterface* sif, std::string section_name, std::string key_name)
+InputBindingWidget::InputBindingWidget(
+	QWidget* parent, SettingsInterface* sif, InputBindingInfo::Type bind_type, std::string section_name, std::string key_name)
 	: QPushButton(parent)
 {
 	setMinimumWidth(225);
@@ -48,7 +49,7 @@ InputBindingWidget::InputBindingWidget(QWidget* parent, SettingsInterface* sif,

 	connect(this, &QPushButton::clicked, this, &InputBindingWidget::onClicked);

-	initialize(sif, std::move(section_name), std::move(key_name));
+	initialize(sif, bind_type, std::move(section_name), std::move(key_name));
 }

 InputBindingWidget::~InputBindingWidget()
@@ -61,9 +62,11 @@ bool InputBindingWidget::isMouseMappingEnabled()
 	return Host::GetBaseBoolSettingValue("UI", "EnableMouseMapping", false);
 }

-void InputBindingWidget::initialize(SettingsInterface* sif, std::string section_name, std::string key_name)
+void InputBindingWidget::initialize(
+	SettingsInterface* sif, InputBindingInfo::Type bind_type, std::string section_name, std::string key_name)
 {
 	m_sif = sif;
+	m_bind_type = bind_type;
 	m_section_name = std::move(section_name);
 	m_key_name = std::move(key_name);
 	reloadBinding();
@@ -223,8 +226,7 @@ void InputBindingWidget::setNewBinding()
 	if (m_new_bindings.empty())
 		return;

-	const std::string new_binding(
-		InputManager::ConvertInputBindingKeysToString(m_new_bindings.data(), m_new_bindings.size()));
+	std::string new_binding(InputManager::ConvertInputBindingKeysToString(m_bind_type, m_new_bindings.data(), m_new_bindings.size()));
 	if (!new_binding.empty())
 	{
 		if (m_sif)
@@ -265,9 +267,8 @@ void InputBindingWidget::clearBinding()

 void InputBindingWidget::reloadBinding()
 {
-	m_bindings = m_sif ?
-		m_sif->GetStringList(m_section_name.c_str(), m_key_name.c_str()) :
-		Host::GetBaseStringListSetting(m_section_name.c_str(), m_key_name.c_str());
+	m_bindings = m_sif ? m_sif->GetStringList(m_section_name.c_str(), m_key_name.c_str()) :
+                         Host::GetBaseStringListSetting(m_section_name.c_str(), m_key_name.c_str());
 	updateText();
 }

@@ -306,8 +307,7 @@ void InputBindingWidget::startListeningForInput(u32 timeout_in_seconds)
 	m_input_listen_timer->setSingleShot(false);
 	m_input_listen_timer->start(1000);

-	m_input_listen_timer->connect(m_input_listen_timer, &QTimer::timeout, this,
-		&InputBindingWidget::onInputListenTimerTimeout);
+	m_input_listen_timer->connect(m_input_listen_timer, &QTimer::timeout, this, &InputBindingWidget::onInputListenTimerTimeout);
 	m_input_listen_remaining_seconds = timeout_in_seconds;
 	setText(tr("Push Button/Axis... [%1]").arg(m_input_listen_remaining_seconds));

@@ -365,8 +365,7 @@ void InputBindingWidget::inputManagerHookCallback(InputBindingKey key, float val
 void InputBindingWidget::hookInputManager()
 {
 	InputManager::SetHook([this](InputBindingKey key, float value) {
-		QMetaObject::invokeMethod(this, "inputManagerHookCallback", Qt::QueuedConnection, Q_ARG(InputBindingKey, key),
-			Q_ARG(float, value));
+		QMetaObject::invokeMethod(this, "inputManagerHookCallback", Qt::QueuedConnection, Q_ARG(InputBindingKey, key), Q_ARG(float, value));
 		return InputInterceptHook::CallbackResult::StopProcessingEvent;
 	});
 }
@@ -378,7 +377,7 @@ void InputBindingWidget::unhookInputManager()

 void InputBindingWidget::openDialog()
 {
-	InputBindingDialog binding_dialog(m_sif, m_section_name, m_key_name, m_bindings, QtUtils::GetRootWidget(this));
+	InputBindingDialog binding_dialog(m_sif, m_bind_type, m_section_name, m_key_name, m_bindings, QtUtils::GetRootWidget(this));
 	binding_dialog.exec();
 	reloadBinding();
 }
@@ -388,7 +387,8 @@ InputVibrationBindingWidget::InputVibrationBindingWidget(QWidget* parent)
 	connect(this, &QPushButton::clicked, this, &InputVibrationBindingWidget::onClicked);
 }

-InputVibrationBindingWidget::InputVibrationBindingWidget(QWidget* parent, ControllerSettingsDialog* dialog, std::string section_name, std::string key_name)
+InputVibrationBindingWidget::InputVibrationBindingWidget(
+	QWidget* parent, ControllerSettingsDialog* dialog, std::string section_name, std::string key_name)
 {
 	setMinimumWidth(225);
 	setMaximumWidth(225);
@@ -16,6 +16,7 @@
 #pragma once
 #include "common/Pcsx2Defs.h"
 #include "pcsx2/Frontend/InputManager.h"
+#include "pcsx2/Config.h"
 #include <QtWidgets/QPushButton>
 #include <optional>

@@ -30,12 +31,13 @@ class InputBindingWidget : public QPushButton

 public:
 	InputBindingWidget(QWidget* parent);
-	InputBindingWidget(QWidget* parent, SettingsInterface* sif, std::string section_name, std::string key_name);
+	InputBindingWidget(
+		QWidget* parent, SettingsInterface* sif, InputBindingInfo::Type bind_type, std::string section_name, std::string key_name);
 	~InputBindingWidget();

 	static bool isMouseMappingEnabled();

-	void initialize(SettingsInterface* sif, std::string section_name, std::string key_name);
+	void initialize(SettingsInterface* sif, InputBindingInfo::Type bind_type, std::string section_name, std::string key_name);

 public Q_SLOTS:
 	void clearBinding();
@@ -69,6 +71,7 @@ protected:
 	void unhookInputManager();

 	SettingsInterface* m_sif = nullptr;
+	InputBindingInfo::Type m_bind_type = InputBindingInfo::Type::Unknown;
 	std::string m_section_name;
 	std::string m_key_name;
 	std::vector<std::string> m_bindings;
@@ -103,6 +106,6 @@ private:
 	std::string m_section_name;
 	std::string m_key_name;
 	std::string m_binding;
-	
+
 	ControllerSettingsDialog* m_dialog;
 };
--- a/Show More
+++ b/Show More