early-access version 2199

src/common/CMakeLists.txt

@@ -73,7 +73,6 @@ add_library(common STATIC
     hex_util.h
     host_memory.cpp
     host_memory.h
-    input.h
     intrusive_red_black_tree.h
     literals.h
     logging/backend.cpp

src/common/settings.h

@@ -6,6 +6,7 @@
 
 #include <algorithm>
 #include <array>
+#include <atomic>
 #include <map>
 #include <optional>
 #include <string>
@@ -559,15 +560,19 @@ struct Values {
     Setting<bool> enable_accurate_vibrations{false, "enable_accurate_vibrations"};
 
     Setting<bool> motion_enabled{true, "motion_enabled"};
+    BasicSetting<std::string> motion_device{"engine:motion_emu,update_period:100,sensitivity:0.01",
+                                            "motion_device"};
     BasicSetting<std::string> udp_input_servers{"127.0.0.1:26760", "udp_input_servers"};
 
     BasicSetting<bool> pause_tas_on_load{true, "pause_tas_on_load"};
     BasicSetting<bool> tas_enable{false, "tas_enable"};
     BasicSetting<bool> tas_loop{false, "tas_loop"};
+    BasicSetting<bool> tas_swap_controllers{true, "tas_swap_controllers"};
 
     BasicSetting<bool> mouse_panning{false, "mouse_panning"};
     BasicRangedSetting<u8> mouse_panning_sensitivity{10, 1, 100, "mouse_panning_sensitivity"};
     BasicSetting<bool> mouse_enabled{false, "mouse_enabled"};
+    std::string mouse_device;
     MouseButtonsRaw mouse_buttons;
 
     BasicSetting<bool> emulate_analog_keyboard{false, "emulate_analog_keyboard"};
@@ -581,11 +586,14 @@ struct Values {
 
     TouchscreenInput touchscreen;
 
+    BasicSetting<bool> use_touch_from_button{false, "use_touch_from_button"};
     BasicSetting<std::string> touch_device{"min_x:100,min_y:50,max_x:1800,max_y:850",
                                            "touch_device"};
     BasicSetting<int> touch_from_button_map_index{0, "touch_from_button_map"};
     std::vector<TouchFromButtonMap> touch_from_button_maps;
 
+    std::atomic_bool is_device_reload_pending{true};
+
     // Data Storage
     BasicSetting<bool> use_virtual_sd{true, "use_virtual_sd"};
     BasicSetting<bool> gamecard_inserted{false, "gamecard_inserted"};

src/common/settings_input.h

@@ -62,22 +62,11 @@ enum Values : int {
 
 constexpr int STICK_HID_BEGIN = LStick;
 constexpr int STICK_HID_END = NumAnalogs;
+constexpr int NUM_STICKS_HID = NumAnalogs;
 
 extern const std::array<const char*, NumAnalogs> mapping;
 } // namespace NativeAnalog
 
-namespace NativeTrigger {
-enum Values : int {
-    LTrigger,
-    RTrigger,
-
-    NumTriggers,
-};
-
-constexpr int TRIGGER_HID_BEGIN = LTrigger;
-constexpr int TRIGGER_HID_END = NumTriggers;
-} // namespace NativeTrigger
-
 namespace NativeVibration {
 enum Values : int {
     LeftVibrationDevice,
@@ -129,6 +118,7 @@ extern const std::array<const char*, NumMouseButtons> mapping;
 namespace NativeKeyboard {
 enum Keys {
     None,
+    Error,
 
     A = 4,
     B,
@@ -166,22 +156,22 @@ enum Keys {
     N8,
     N9,
     N0,
-    Return,
+    Enter,
     Escape,
     Backspace,
     Tab,
     Space,
     Minus,
-    Plus,
-    OpenBracket,
-    CloseBracket,
-    Pipe,
+    Equal,
+    LeftBrace,
+    RightBrace,
+    Backslash,
     Tilde,
     Semicolon,
-    Quote,
-    Backquote,
+    Apostrophe,
+    Grave,
     Comma,
-    Period,
+    Dot,
     Slash,
     CapsLockKey,
 
@@ -198,7 +188,7 @@ enum Keys {
     F11,
     F12,
 
-    PrintScreen,
+    SystemRequest,
     ScrollLockKey,
     Pause,
     Insert,
@@ -267,18 +257,8 @@ enum Keys {
     ScrollLockActive,
     KPComma,
 
-    Ro = 0x87,
-    KatakanaHiragana,
-    Yen,
-    Henkan,
-    Muhenkan,
-    NumPadCommaPc98,
-
-    HangulEnglish = 0x90,
-    Hanja,
-    KatakanaKey,
-    HiraganaKey,
-    ZenkakuHankaku,
+    KPLeftParenthesis,
+    KPRightParenthesis,
 
     LeftControlKey = 0xE0,
     LeftShiftKey,
@@ -327,8 +307,6 @@ enum Modifiers {
     CapsLock,
     ScrollLock,
     NumLock,
-    Katakana,
-    Hiragana,
 
     NumKeyboardMods,
 };