From 5219615418920be8502aa24507572cf0930d65ea Mon Sep 17 00:00:00 2001
From: Morph
Date: Fri, 21 Aug 2020 07:39:24 -0400
Subject: Project Mjölnir: Part 2 - Controller Applet

Co-authored-by: Its-Rei <kupfel@gmail.com>
---
 src/core/frontend/applets/controller.h | 45 ++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 src/core/frontend/applets/controller.h

(limited to 'src/core/frontend/applets/controller.h')

diff --git a/src/core/frontend/applets/controller.h b/src/core/frontend/applets/controller.h
new file mode 100644
index 000000000..0908f2b69
--- /dev/null
+++ b/src/core/frontend/applets/controller.h
@@ -0,0 +1,45 @@
+// Copyright 2020 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <functional>
+
+#include "common/common_types.h"
+
+namespace Core::Frontend {
+
+using BorderColor = std::array<u8, 4>;
+
+struct ControllerParameters {
+    s8 min_players{};
+    s8 max_players{};
+    bool keep_controllers_connected{};
+    bool enable_single_mode{};
+    bool enable_border_color{};
+    std::vector<BorderColor> border_colors{};
+    bool allow_pro_controller{};
+    bool allow_handheld{};
+    bool allow_dual_joycons{};
+    bool allow_left_joycon{};
+    bool allow_right_joycon{};
+};
+
+class ControllerApplet {
+public:
+    virtual ~ControllerApplet();
+
+    virtual void ReconfigureControllers(std::function<void()> callback,
+                                        ControllerParameters parameters) const = 0;
+};
+
+class DefaultControllerApplet final : public ControllerApplet {
+public:
+    ~DefaultControllerApplet() override;
+
+    void ReconfigureControllers(std::function<void()> callback,
+                                ControllerParameters parameters) const override;
+};
+
+} // namespace Core::Frontend
-- 
cgit v1.2.3


From 5ce3015945e327751a053f7a5a1331a33f07819e Mon Sep 17 00:00:00 2001
From: Morph
Date: Thu, 27 Aug 2020 01:21:48 -0400
Subject: applets/controller: Implement "Explain Text"

"Explain Text" is additional text that is shown for each player in the controller applet.
---
 src/core/frontend/applets/controller.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/core/frontend/applets/controller.h')

diff --git a/src/core/frontend/applets/controller.h b/src/core/frontend/applets/controller.h
index 0908f2b69..a227f15cd 100644
--- a/src/core/frontend/applets/controller.h
+++ b/src/core/frontend/applets/controller.h
@@ -11,6 +11,7 @@
 namespace Core::Frontend {
 
 using BorderColor = std::array<u8, 4>;
+using ExplainText = std::array<char, 0x81>;
 
 struct ControllerParameters {
     s8 min_players{};
@@ -19,6 +20,8 @@ struct ControllerParameters {
     bool enable_single_mode{};
     bool enable_border_color{};
     std::vector<BorderColor> border_colors{};
+    bool enable_explain_text{};
+    std::vector<ExplainText> explain_text{};
     bool allow_pro_controller{};
     bool allow_handheld{};
     bool allow_dual_joycons{};
-- 
cgit v1.2.3