feat(ui): add combo hotkey support

[alandtse]

Summary by CodeRabbit

• New Features

  • Multi-key/multi-device input bindings with a unified recording widget and clear option.
  • VR-aware key labels and color-coded device indicators for clearer controller feedback.
  • Updated VR default combos for menu and overlay actions.

• Bug Fixes

  • Fixed text rendering/display issues in overlays, shader debug, and settings UIs.

• Other

  • Legacy single-key bindings auto-migrate to the new combo format.

[coderabbitai]

📝 Walkthrough

Walkthrough

Migrate input handling to a new InputCombo abstraction (device+key), add UI widget and key-to-string helpers, convert menu/VR hotkey storage and renderer APIs to use std::vector, update VR/VRUtils types to aliases, and fix several ImGui string-formatting calls.

Changes

Cohort / File(s)	Summary
New Input utilities src/Utils/Input.h	Add InputDeviceType and InputCombo (packed device+key), JSON (de)serialization, VR-friendly string helpers, and ComboList JSON helpers.
UI helpers src/Utils/UI.h, src/Utils/UI.cpp	Add Util::Input::KeyIdToString(std::vector<InputCombo>) and Util::InputComboWidget(...) to render/record combos with VR-aware presentation.
Menu API & logic src/Menu.h, src/Menu.cpp, src/Menu/SettingsTabRenderer.*, src/Menu/OverlayRenderer.*, src/Menu/HomePageRenderer.cpp, src/Menu/AdvancedSettingsRenderer.cpp	Migrate six settings from uint32_t to std::vector<InputCombo>, add migration/serialization, replace key-to-string callbacks with InputComboWidget usage, update renderer signatures, and adapt hotkey capture/display logic.
VR integration src/Features/VR.h, src/Features/VR.cpp	Replace bespoke ControllerDevice/ButtonCombo with aliases to InputDeviceType/InputCombo; update default VR key bindings to use InputCombo.
VR utils src/Utils/VRUtils.h, src/Utils/VRUtils.cpp	Change APIs/switches to use InputDeviceType and alias ButtonCombo→InputCombo.
Minor ImGui fixes src/Features/PerformanceOverlay.cpp, src/Features/WeatherPicker.cpp, src/Menu/AdvancedSettingsRenderer.cpp	Fix ImGui::TextColored calls by passing C-strings (.c_str()) instead of temporary std::string objects.
Header/signature updates src/Utils/UI.h, src/Menu/OverlayRenderer.h, src/Menu/SettingsTabRenderer.h	Update includes and function signatures to accept std::vector<InputCombo> and remove legacy keyIdToString callback parameters.

Sequence Diagram(s)

sequenceDiagram
  participant User
  participant UI as Util::InputComboWidget
  participant Menu as Menu (hotkey state)
  participant Utils as Util::Input::KeyIdToString
  participant VR as VR subsystem
  participant Storage as Settings (JSON)

  User->>UI: Click "Record" / Interact
  UI->>Menu: Emit InputCombo(s) (vector)
  Menu->>Utils: Request display string for combo
  Utils->>VR: Inspect combos for VR inputs (GetVRString)
  VR-->>Utils: VR-specific mapping string
  Utils-->>Menu: Return human-readable string
  Menu->>Storage: Serialize InputCombo vector via ComboList -> JSON
  Storage-->>Menu: Persisted
  Menu-->>UI: Update displayed binding

Loading

Estimated code review effort

🎯 4 (Complex) | ⏱️ ~60 minutes

Possibly related PRs

• feat(vr): add imgui support #1296: Refactors VR input types from ControllerDevice/ButtonCombo to InputDeviceType/InputCombo — closely related type and API changes.
• refactor: break apart menu #1330: Refactors key-to-string and input utilities used by Menu/UI helpers — overlaps with Util::Input::KeyIdToString and UI changes.
• fix(ui): enter key now behaves properly when first time popup is open #1615: Hotkey capture and first-time setup Enter/Escape handling — overlaps with Menu hotkey capture behavior changes.

Suggested reviewers

• doodlum
• jiayev

Poem

🐇 I hopped through headers, packed keys in tune,
Primary, Secondary, Keyboard by moon,
Combos now bundle in vectors so bright,
Widgets record bindings both day and night,
A little rabbit cheers—hop, input, delight! ✨

🚥 Pre-merge checks | ✅ 2 | ❌ 1

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 37.78% which is insufficient. The required threshold is 80.00%.	Write docstrings for the functions missing them to satisfy the coverage threshold.

✅ Passed checks (2 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title accurately summarizes the main change: adding support for combo hotkeys in the UI, which is the primary objective reflected across multiple files implementing this feature.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing touches

• 📝 Generate docstrings

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Post copyable unit tests in a comment

Important

Action Needed: IP Allowlist Update

If your organization protects your Git platform with IP whitelisting, please add the new CodeRabbit IP address to your allowlist:

• ✨ 136.113.208.247/32 (new)
• 34.170.211.100/32
• 35.222.179.152/32

Reviews will stop working after February 8, 2026 if the new IP is not added to your allowlist.

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[github-actions]

Using provided base ref: d4ee994
Using base ref: d4ee994
Base commit date: 2026-02-01T19:49:55-08:00 (Sunday, February 01, 2026 07:49 PM)
No actionable suggestions for changed features.

[davo0411]

questions on supporting legacy systems, otherwise looks good

[Copilot]

Pull request overview

This PR adds comprehensive multi-key combination hotkey support (e.g., Ctrl+Shift+A) for both Desktop and VR modes, replacing the previous single-key system with a flexible combo-based architecture.

Changes:

• Introduces unified InputCombo and InputDeviceType abstractions to handle keyboard, mouse, VR controllers, and gamepads through a common interface
• Refactors all Menu hotkey settings from uint32_t to std::vector<InputCombo> with migration support for legacy configs
• Adds InputComboWidget UI component for recording multi-key sequences with modifier support
• Updates VR code to use new unified types via backwards-compatible type aliases

Reviewed changes

Copilot reviewed 17 out of 17 changed files in this pull request and generated 15 comments.

Show a summary per file

File	Description
src/Utils/Input.h	New file introducing InputDeviceType enum, InputCombo struct with JSON serialization, and VR string formatting
src/Utils/VRUtils.h/cpp	Updated to use InputDeviceType and InputCombo via type aliases for backward compatibility
src/Utils/UI.h/cpp	Added InputComboWidget for recording combos and KeyIdToString overload for combo display
src/Menu.h	Changed Settings struct hotkey fields from uint32_t to vector
src/Menu.cpp	Added migration logic, updated input processing to detect modifiers and match combos
src/Menu/SettingsTabRenderer.h/cpp	Refactored keybinding UI to use new InputComboWidget
src/Menu/OverlayRenderer.h/cpp	Updated function signatures to accept vector
src/Menu/HomePageRenderer.cpp	Updated first-time setup to use combo format, added Enter key guard
src/Menu/AdvancedSettingsRenderer.cpp	Added .c_str() calls for string conversion compatibility
src/Features/WeatherPicker.cpp	Added .c_str() calls for string conversion compatibility
src/Features/PerformanceOverlay.cpp	Added .c_str() calls for string conversion compatibility
src/Features/VR.h/cpp	Removed ButtonCombo/ControllerDevice definitions, using InputCombo/InputDeviceType via aliases

[coderabbitai]

Actionable comments posted: 2

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)

src/Features/VR.cpp (1)

817-870: ⚠️ Potential issue | 🟡 Minor

Validate non‑VR InputCombo entries on load.
Now that bindings are InputCombo, a malformed config could include keyboard/mouse device types. CheckCombo only handles Primary/Secondary/Both, so such entries silently break hotkeys. Consider filtering to VR device types (or warning) during settings load/clamp.

🤖 Fix all issues with AI agents

In `@src/Menu.cpp`:
- Around line 247-275: The migrateKey lambda currently converts a numeric legacy
key (uint32_t) into an InputCombo even when the value is 0; change migrateKey to
treat legacyKey==0 as "unbound" and skip migration (do not clear or push into
target) so existing bindings remain untouched; specifically, in the migrateKey
function that reads legacyKey and calls target.clear() and
target.push_back(InputCombo::Keyboard(legacyKey)), add a guard that only clears
and pushes when legacyKey != 0, otherwise do nothing.

In `@src/Utils/Input.h`:
- Around line 245-309: The JSON roundtrip misclassifies Primary (VR) combos as
keyboard because packed deviceAndKey values can be <0x10000; fix
ComboList::to_json and ComboList::from_json to add and recognize a packed marker
(use 0x80000000u) when serializing packed entries (in to_json: when writing
packedValues/deviceAndKey for non-keyboard-only entries OR for any InputCombo
where GetDevice() != Keyboard, set packedValue = c.deviceAndKey | 0x80000000u),
and in from_json check that numeric items with the marker are parsed as packed
(val & 0x80000000u -> reconstruct InputCombo by stripping marker into
deviceAndKey and push if InputCombo::IsValid()), treat unmarked values < 0x10000
as legacy keyboard via InputCombo::Keyboard(val), treat unmarked values >=
0x10000 as legacy packed entries for backward compatibility (construct
deviceAndKey = val and validate with IsValid()), and skip invalid/zero-key
combos so they are not added to combos.

🧹 Nitpick comments (1)

src/Menu/SettingsTabRenderer.cpp (1)

243-275: Remove placeholder blocks or wire side‑effects.
The empty if bodies and inline notes read like TODOs; either implement the side‑effects or drop the conditionals to keep the UI code clean.

♻️ Suggested cleanup

-		if (Util::InputComboWidget(
-				"Toggle Key:",
-				settings.ToggleKey,
-				state.settingToggleKey,  // Note: fixed argument mismatch if needed, based on UI.h signature
-				"Change##toggle")) {
-			// Optional: Trigger any necessary updates
-		}
+		Util::InputComboWidget(
+			"Toggle Key:",
+			settings.ToggleKey,
+			state.settingToggleKey,
+			"Change##toggle");

-		if (Util::InputComboWidget(
-				"Effect Toggle Key:",
-				settings.EffectToggleKey,
-				state.settingsEffectsToggle,  // UI.h expects bool&, state has bool&
-				"Change##EffectToggle")) {
-			// Optional: Trigger any necessary updates
-		}
+		Util::InputComboWidget(
+			"Effect Toggle Key:",
+			settings.EffectToggleKey,
+			state.settingsEffectsToggle,
+			"Change##EffectToggle");

-		if (Util::InputComboWidget(
-				"Skip Compilation Key:",
-				settings.SkipCompilationKey,
-				state.settingSkipCompilationKey,
-				"Change##skip")) {
-			// Optional: Trigger any necessary updates
-		}
+		Util::InputComboWidget(
+			"Skip Compilation Key:",
+			settings.SkipCompilationKey,
+			state.settingSkipCompilationKey,
+			"Change##skip");

-		if (Util::InputComboWidget(
-				"Overlay Toggle Key:",
-				settings.OverlayToggleKey,
-				state.settingOverlayToggleKey,
-				"Change##OverlayToggle")) {
-			// Optional: Trigger any necessary updates
-		}
+		Util::InputComboWidget(
+			"Overlay Toggle Key:",
+			settings.OverlayToggleKey,
+			state.settingOverlayToggleKey,
+			"Change##OverlayToggle");

As per coding guidelines: Provide complete, fully functional solutions without TODO/FIXME placeholders.

[github-actions]

✅ A pre-release build is available for this PR:
Download

[coderabbitai]

Actionable comments posted: 2

🤖 Fix all issues with AI agents

In `@src/Menu.cpp`:
- Around line 265-277: The loadComboList lambda calls
InputCombo::ComboList::from_json directly and can throw if items are malformed;
wrap the from_json call in a try/catch inside loadComboList (catch
std::exception) and on error log a warning that includes the keyName and the
exception message, then leave target unchanged or clear it to a safe default;
update all invocations (ToggleKey, SkipCompilationKey, EffectToggleKey,
OverlayToggleKey, ShaderBlockPrevKey, ShaderBlockNextKey) implicitly by fixing
the lambda so malformed user-edited o_json entries won’t crash settings loading.
- Around line 1041-1055: The hotkey matching currently only verifies required
modifiers are held, allowing supersets (e.g., Ctrl+Shift+K) to trigger; update
the block that inspects ka.settingKey (the branch checking
ka.settingKey.back().GetKey() and InputDeviceType::Keyboard) to compute the
current modifier set using GetAsyncKeyState and Constants::KEY_PRESSED_MASK and
compare it to the exact modifier set recorded in ka.settingKey (all entries
except the last); if there are any extra modifiers beyond the recorded ones,
treat it as non-matching and do not call ka.action(), otherwise proceed as
before.

🧹 Nitpick comments (1)

src/Menu/SettingsTabRenderer.cpp (1)

10-10: PR metadata: add issue reference if applicable.

Title already follows conventional commits. If this feature maps to a tracking issue, consider adding “Implements #…” / “Addresses #…” in the PR description for traceability. Happy to draft it.

[coderabbitai]

Actionable comments posted: 1

🤖 Fix all issues with AI agents

In `@src/Utils/Input.h`:
- Around line 312-323: The code currently calls parseAndAdd with values read via
get<uint32_t>() from item/j which silently wraps negative or oversized JSON
integers; update both the array branch (loop over item) and the single-integer
branch to read the JSON integer into a signed 64-bit temporary (e.g., int64_t
tmp = item.get<int64_t>() / j.get<int64_t>()), validate tmp is >= 0 and <=
UINT32_MAX, then cast to uint32_t and call parseAndAdd(computedVal, combos); if
the bounds check fails, reject the value (return an error, throw, or log and
skip) instead of allowing silent wraparound. Ensure you apply this change for
both the item and j reads and keep references to parseAndAdd and combos intact.

🧹 Nitpick comments (2)

src/Utils/Input.h (2)

1-1: Add an issue reference if this feature is tracked.

If there’s a GitHub issue for combo hotkeys, consider adding “Addresses #…/Implements #…” in the PR description for traceability.

---

171-231: Gate VR‑specific labeling for SE/AE and non‑VR devices.

GetVRString treats all non‑keyboard devices as VR and renders VR button names. That can mislabel mouse/gamepad combos and SE/AE runtimes. Consider a runtime‑aware path (e.g., via Globals‑provided runtime detection) that only uses VR mappings in VR, otherwise shows device‑appropriate labels or key codes. If you later read button enums from runtime structures, prefer REL::RelocateMember() for SE/AE/VR compatibility.