From f59080817ca0ebcb62956a23b1bfa75084448107 Mon Sep 17 00:00:00 2001 From: Yukino Song Date: Mon, 14 Jul 2025 01:32:45 +0800 Subject: [PATCH] Update key name for rumble forwarding --- src/config.cpp | 4 ++-- src/config.h | 2 +- src/platform/windows/input.cpp | 4 ++-- src_assets/common/assets/web/config.html | 2 +- src_assets/common/assets/web/configs/tabs/Inputs.vue | 4 ++-- src_assets/common/assets/web/public/assets/locale/en.json | 4 ++-- src_assets/common/assets/web/public/assets/locale/zh.json | 2 ++ 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/config.cpp b/src/config.cpp index 57f144f8..fbe651c5 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -571,7 +571,7 @@ namespace config { true, // high resolution scrolling true, // native pen/touch support false, // enable input only mode - true, // enable_rumble_messages_to_controllers + true, // forward_rumble }; sunshine_t sunshine { @@ -1287,7 +1287,7 @@ namespace config { bool_f(vars, "envvar_compatibility_mode", sunshine.envvar_compatibility_mode); bool_f(vars, "notify_pre_releases", sunshine.notify_pre_releases); bool_f(vars, "legacy_ordering", sunshine.legacy_ordering); - bool_f(vars, "enable_rumble_messages_to_controllers", input.enable_rumble_messages_to_controllers); + bool_f(vars, "forward_rumble", input.forward_rumble); int port = sunshine.port; int_between_f(vars, "port"s, port, {1024 + nvhttp::PORT_HTTPS, 65535 - rtsp_stream::RTSP_SETUP_PORT}); diff --git a/src/config.h b/src/config.h index 4fc3366b..8be2b42f 100644 --- a/src/config.h +++ b/src/config.h @@ -211,7 +211,7 @@ namespace config { bool native_pen_touch; bool enable_input_only_mode; - bool enable_rumble_messages_to_controllers; + bool forward_rumble; }; namespace flag { diff --git a/src/platform/windows/input.cpp b/src/platform/windows/input.cpp index daf218d9..9d182c7f 100644 --- a/src/platform/windows/input.cpp +++ b/src/platform/windows/input.cpp @@ -327,8 +327,8 @@ namespace platf { * @param smallMotor The small motor. */ void rumble(target_t::pointer target, std::uint8_t largeMotor, std::uint8_t smallMotor) { - // config::input.enable_rumble_messages_to_controllers - Default is true so ignore rumble messages when false - if( config::input.enable_rumble_messages_to_controllers == false ) { + // config::input.forward_rumble - Default is true so ignore rumble messages when false + if( config::input.forward_rumble == false ) { // Do nothing; just return return; } diff --git a/src_assets/common/assets/web/config.html b/src_assets/common/assets/web/config.html index 263406ee..3ebad8ff 100644 --- a/src_assets/common/assets/web/config.html +++ b/src_assets/common/assets/web/config.html @@ -176,7 +176,7 @@ "high_resolution_scrolling": "enabled", "native_pen_touch": "enabled", "enable_input_only_mode": "disabled", - "enable_rumble_messages_to_controllers": "enabled", + "forward_rumble": "enabled", "keybindings": "[0x10,0xA0,0x11,0xA2,0x12,0xA4]", // todo: add this to UI }, }, diff --git a/src_assets/common/assets/web/configs/tabs/Inputs.vue b/src_assets/common/assets/web/configs/tabs/Inputs.vue index e8487cbe..f92baecb 100644 --- a/src_assets/common/assets/web/configs/tabs/Inputs.vue +++ b/src_assets/common/assets/web/configs/tabs/Inputs.vue @@ -182,9 +182,9 @@ const config = ref(props.config)
diff --git a/src_assets/common/assets/web/public/assets/locale/en.json b/src_assets/common/assets/web/public/assets/locale/en.json index 056573c1..24e4d7a0 100644 --- a/src_assets/common/assets/web/public/assets/locale/en.json +++ b/src_assets/common/assets/web/public/assets/locale/en.json @@ -255,8 +255,6 @@ "enable_discovery_desc": "When disabled, you'll need to manually enter host IP on the client to pair.", "enable_input_only_mode": "Enable Input Only Mode", "enable_input_only_mode_desc": "Add an Input Only app entry. When enabled, the app list will only show the current running app and the Input Only entry when streaming. The Input Only entry will not receive any image or audio. Useful for operating the desktop on TV or connecting peripherals which the TV doesn't support with a phone.", - "enable_rumble_messages_to_controllers": "Enable Rumble Messages to Controllers", - "enable_rumble_messages_to_controllers_desc": "Enable Rumble Messages to Controllers", "enable_pairing": "Enable Pairing", "enable_pairing_desc": "Enable pairing for the Moonlight client. This allows the client to authenticate with the host and establish a secure connection.", "encoder": "Force a Specific Encoder", @@ -276,6 +274,8 @@ "file_apps_desc": "The file where current apps of Apollo are stored.", "file_state": "State File", "file_state_desc": "The file where current state of Apollo is stored", + "forward_rumble": "Forward Rumble Messages", + "forward_rumble_desc": "Forward Rumble Messages to clients", "gamepad": "Emulated Gamepad Type", "gamepad_auto": "Automatic selection options", "gamepad_desc": "Choose which type of gamepad to emulate on the host", diff --git a/src_assets/common/assets/web/public/assets/locale/zh.json b/src_assets/common/assets/web/public/assets/locale/zh.json index 17f81394..3028afdf 100644 --- a/src_assets/common/assets/web/public/assets/locale/zh.json +++ b/src_assets/common/assets/web/public/assets/locale/zh.json @@ -269,6 +269,8 @@ "file_apps_desc": "Apollo 保存应用程序配置的文件。", "file_state": "实时状态文件", "file_state_desc": "Apollo 保存当前状态的文件", + "forward_rumble": "转发手柄震动", + "forward_rumble_desc": "向客户端转发手柄震动信息", "gamepad": "模拟游戏手柄类型", "gamepad_auto": "自动选择选项", "gamepad_desc": "选择要在主机上模拟的游戏手柄类型",