1 files changed, 77 insertions, 29 deletions
diff --git a/src/yuzu/configuration/configure_input_player.h b/src/yuzu/configuration/configure_input_player.h
index 95afa53752..a86db82006 100644
--- a/src/yuzu/configuration/configure_input_player.h
+++ b/src/yuzu/configuration/configure_input_player.h
@@ -15,11 +15,17 @@
 #include "common/param_package.h"
 #include "core/settings.h"
 #include "ui_configure_input.h"
+#include "yuzu/uisettings.h"
 
+class QCheckBox;
 class QKeyEvent;
+class QLabel;
 class QPushButton;
+class QSlider;
+class QSpinBox;
 class QString;
 class QTimer;
+class QWidget;
 
 namespace InputCommon::Polling {
 class DevicePoller;
@@ -30,43 +36,73 @@ namespace Ui {
 class ConfigureInputPlayer;
 }
 
-class ConfigureInputPlayer : public QDialog {
+class ConfigureInputPlayer : public QWidget {
     Q_OBJECT
 
 public:
-    explicit ConfigureInputPlayer(QWidget* parent, std::size_t player_index, bool debug = false);
+    explicit ConfigureInputPlayer(QWidget* parent, std::size_t player_index, QWidget* bottom_row,
+                                  bool debug = false);
     ~ConfigureInputPlayer() override;
 
-    /// Save all button configurations to settings file
+    /// Save all button configurations to settings file.
     void ApplyConfiguration();
 
+    /// Update the input devices combobox.
+    void UpdateInputDevices();
+
+    /// Restore all buttons to their default values.
+    void RestoreDefaults();
+
+    /// Clear all input configuration.
+    void ClearAll();
+
+    /// Set the connection state checkbox (used to sync state).
+    void ConnectPlayer(bool connected);
+
+signals:
+    /// Emitted when this controller is connected by the user.
+    void Connected(bool connected);
+    /// Emitted when the Handheld mode is selected (undocked with dual joycons attached).
+    void HandheldStateChanged(bool is_handheld);
+    /// Emitted when the input devices combobox is being refreshed.
+    void RefreshInputDevices();
+
+protected:
+    void showEvent(QShowEvent* event) override;
+
 private:
     void changeEvent(QEvent* event) override;
     void RetranslateUI();
 
-    void OnControllerButtonClick(int i);
-
     /// Load configuration settings.
     void LoadConfiguration();
-    /// Restore all buttons to their default values.
-    void RestoreDefaults();
-    /// Clear all input configuration
-    void ClearAll();
-
-    /// Update UI to reflect current configuration.
-    void UpdateButtonLabels();
 
     /// Called when the button was pressed.
     void HandleClick(QPushButton* button,
                      std::function<void(const Common::ParamPackage&)> new_input_setter,
                      InputCommon::Polling::DeviceType type);
 
-    /// Finish polling and configure input using the input_setter
+    /// Finish polling and configure input using the input_setter.
     void SetPollingResult(const Common::ParamPackage& params, bool abort);
 
     /// Handle key press events.
     void keyPressEvent(QKeyEvent* event) override;
 
+    /// Update UI to reflect current configuration.
+    void UpdateUI();
+
+    /// Update the controller selection combobox
+    void UpdateControllerCombobox();
+
+    /// Update the current controller icon.
+    void UpdateControllerIcon();
+
+    /// Hides and disables controller settings based on the current controller type.
+    void UpdateControllerAvailableButtons();
+
+    /// Gets the default controller mapping for this device and auto configures the input to match.
+    void UpdateMappingWithDefaults();
+
     std::unique_ptr<Ui::ConfigureInputPlayer> ui;
 
     std::size_t player_index;
@@ -75,32 +111,38 @@ private:
     std::unique_ptr<QTimer> timeout_timer;
     std::unique_ptr<QTimer> poll_timer;
 
+    static constexpr int PLAYER_COUNT = 8;
+    std::array<QCheckBox*, PLAYER_COUNT> player_connected_checkbox;
+
     /// This will be the the setting function when an input is awaiting configuration.
     std::optional<std::function<void(const Common::ParamPackage&)>> input_setter;
 
     std::array<Common::ParamPackage, Settings::NativeButton::NumButtons> buttons_param;
     std::array<Common::ParamPackage, Settings::NativeAnalog::NumAnalogs> analogs_param;
 
-    static constexpr int ANALOG_SUB_BUTTONS_NUM = 5;
+    static constexpr int ANALOG_SUB_BUTTONS_NUM = 4;
+    // Adds room for two extra push buttons LStick Modifier and RStick Modifier.
+    static constexpr int BUTTON_MAP_COUNT = Settings::NativeButton::NumButtons + 2;
 
     /// Each button input is represented by a QPushButton.
-    std::array<QPushButton*, Settings::NativeButton::NumButtons> button_map;
-
-    std::vector<QWidget*> debug_hidden;
-    std::vector<QWidget*> layout_hidden;
+    std::array<QPushButton*, BUTTON_MAP_COUNT> button_map;
+    /// Extra buttons for the modifiers.
+    Common::ParamPackage lstick_mod;
+    Common::ParamPackage rstick_mod;
 
-    /// A group of five QPushButtons represent one analog input. The buttons each represent up,
-    /// down, left, right, and modifier, respectively.
+    /// A group of four QPushButtons represent one analog input. The buttons each represent up,
+    /// down, left, right, respectively.
     std::array<std::array<QPushButton*, ANALOG_SUB_BUTTONS_NUM>, Settings::NativeAnalog::NumAnalogs>
         analog_map_buttons;
 
-    /// Analog inputs are also represented each with a single button, used to configure with an
-    /// actual analog stick
-    std::array<QPushButton*, Settings::NativeAnalog::NumAnalogs> analog_map_stick;
-    std::array<QSlider*, Settings::NativeAnalog::NumAnalogs>
-        analog_map_deadzone_and_modifier_slider;
-    std::array<QLabel*, Settings::NativeAnalog::NumAnalogs>
-        analog_map_deadzone_and_modifier_slider_label;
+    std::array<QLabel*, Settings::NativeAnalog::NumAnalogs> analog_map_deadzone_label;
+    std::array<QSlider*, Settings::NativeAnalog::NumAnalogs> analog_map_deadzone_slider;
+    std::array<QGroupBox*, Settings::NativeAnalog::NumAnalogs> analog_map_modifier_groupbox;
+    std::array<QPushButton*, Settings::NativeAnalog::NumAnalogs> analog_map_modifier_button;
+    std::array<QLabel*, Settings::NativeAnalog::NumAnalogs> analog_map_modifier_label;
+    std::array<QSlider*, Settings::NativeAnalog::NumAnalogs> analog_map_modifier_slider;
+    std::array<QGroupBox*, Settings::NativeAnalog::NumAnalogs> analog_map_range_groupbox;
+    std::array<QSpinBox*, Settings::NativeAnalog::NumAnalogs> analog_map_range_spinbox;
 
     static const std::array<std::string, ANALOG_SUB_BUTTONS_NUM> analog_sub_buttons;
 
@@ -110,6 +152,12 @@ private:
     /// keyboard events are ignored.
     bool want_keyboard_keys = false;
 
-    std::array<QPushButton*, 4> controller_color_buttons;
-    std::array<QColor, 4> controller_colors;
+    /// List of physical devices users can map with. If a SDL backed device is selected, then you
+    /// can usue this device to get a default mapping.
+    std::vector<Common::ParamPackage> input_devices;
+
+    /// Bottom row is where console wide settings are held, and its "owned" by the parent
+    /// ConfigureInput widget. On show, add this widget to the main layout. This will change the
+    /// parent of the widget to this widget (but thats fine).
+    QWidget* bottom_row;
 };