From d1b7c65b9ec9e76e299ef96710a86311e3cecd2f Mon Sep 17 00:00:00 2001
From: Zach Hilman <zachhilman@gmail.com>
Date: Thu, 1 Nov 2018 21:57:13 -0400
Subject: yuzu/config: Add (de-)serialization for multiplayer Defaults to full
 keyboard for keyboard -- It did not seem to be necessary to make the keyboard
 configurable (besides enabled/disabled).

---
 src/yuzu/configuration/config.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/yuzu/configuration/config.h')

diff --git a/src/yuzu/configuration/config.h b/src/yuzu/configuration/config.h
index 9c99c1b75..1facd6b55 100644
--- a/src/yuzu/configuration/config.h
+++ b/src/yuzu/configuration/config.h
@@ -22,6 +22,10 @@ public:
 
     static const std::array<int, Settings::NativeButton::NumButtons> default_buttons;
     static const std::array<std::array<int, 5>, Settings::NativeAnalog::NumAnalogs> default_analogs;
+    static const std::array<int, Settings::NativeMouseButton::NumMouseButtons>
+        default_mouse_buttons;
+    static const std::array<int, Settings::NativeKeyboard::NumKeyboardKeys> default_keyboard_keys;
+    static const std::array<int, Settings::NativeKeyboard::NumKeyboardMods> default_keyboard_mods;
 
 private:
     void ReadValues();
-- 
cgit v1.2.3


From 3a6cd5b3c8dec11cc88c6aebdc4773233f615c91 Mon Sep 17 00:00:00 2001
From: Zach Hilman <zachhilman@gmail.com>
Date: Sat, 3 Nov 2018 12:55:39 -0400
Subject: hid: Use player-defined controller type as PREFERRED_CONTROLLER

---
 src/yuzu/configuration/config.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/yuzu/configuration/config.h')

diff --git a/src/yuzu/configuration/config.h b/src/yuzu/configuration/config.h
index 1facd6b55..a1c27bbf9 100644
--- a/src/yuzu/configuration/config.h
+++ b/src/yuzu/configuration/config.h
@@ -29,7 +29,17 @@ public:
 
 private:
     void ReadValues();
+    void ReadPlayerValues();
+    void ReadDebugValues();
+    void ReadKeyboardValues();
+    void ReadMouseValues();
+    void ReadTouchscreenValues();
+
     void SaveValues();
+    void SavePlayerValues();
+    void SaveDebugValues();
+    void SaveMouseValues();
+    void SaveTouchscreenValues();
 
     std::unique_ptr<QSettings> qt_config;
     std::string qt_config_loc;
-- 
cgit v1.2.3