Skip to content

fix: Respect user-set controller at boot #532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KyleGospo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Respect user-set controller at boot #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions core/global/launch_manager.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,20 +488,20 @@ func set_gamepad_profile(profile_path: String, target_gamepad: String = "") -> v
# Discover the currently set target for each gamepad to properly add additional
# capabilities based on that target
for device: CompositeDevice in input_plumber.get_composite_devices():
if target_gamepad.is_empty():
# First, find the currently set gamepad on the composite device
var device_target := target_gamepad
if device_target.is_empty():
# First, use the target gamepad the user configured, so their
# selection survives a restart.
device_target = settings_manager.get_value("input", "gamepad_profile_target", "") as String
if device_target.is_empty():
# Otherwise fall back to the gamepad currently set on the composite device
var targets = device.get_target_devices()
for target in targets:
var target_dbus_path: String = target.get("dbus_path")
if not target_dbus_path.contains("target/gamepad"):
continue
target_gamepad = target.get("device_type")
device_target = target.get("device_type")
break
if not target_gamepad.is_empty():
break
# Then, if overriden by settings, use that instead
#TODO: This is a global setting, refactor settings to permit individual gamepads to have different targets
target_gamepad = settings_manager.get_value("input", "gamepad_profile_target", target_gamepad) as String

# If no profile was specified, unset the gamepad profiles
if profile_path == "":
Expand All @@ -525,16 +525,16 @@ func set_gamepad_profile(profile_path: String, target_gamepad: String = "") -> v
logger.warn("Failed to load gamepad profile: " + profile_path)
return

InputPlumber.load_target_modified_profile(device, profile_path, target_gamepad)
InputPlumber.load_target_modified_profile(device, profile_path, device_target)

# Set the target gamepad if one was specified
if not target_gamepad.is_empty():
var target_devices := PackedStringArray([target_gamepad, "keyboard", "mouse"])
match target_gamepad:
if not device_target.is_empty():
var target_devices := PackedStringArray([device_target, "keyboard", "mouse"])
match device_target:
"xb360", "xbox-series", "xbox-elite", "gamepad", "hori-steam":
target_devices.append("touchpad")
_:
logger.debug(target_gamepad, "needs no additional target devices.")
logger.debug(device_target, "needs no additional target devices.")
logger.info("Setting target devices to: ", target_devices)
device.set_target_devices(target_devices)

Expand Down
12 changes: 11 additions & 1 deletion core/ui/card_ui/gamepad/gamepad_settings.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,18 @@ func _ready() -> void:

# Load the default profile for every attached gamepad
var profile_path = settings_manager.get_value("input", "gamepad_profile", "")
var saved_gamepad := settings_manager.get_value("input", "gamepad_profile_target", "") as String
for composite_device in input_plumber.get_composite_devices():
# Set the current profile_gamepad type to the currently configured CompositeDevice target gamepad
var targets = composite_device.get_target_devices()
for target in targets:
var target_dbus_path: String = target.get("dbus_path")
if not target_dbus_path.contains("target/gamepad"):
continue
self.profile_gamepad = target.get("device_type")
if saved_gamepad.is_empty():
self.profile_gamepad = target.get("device_type")
else:
self.profile_gamepad = saved_gamepad
_set_gamepad_profile(composite_device, profile_path)
break

Expand Down Expand Up @@ -631,6 +635,12 @@ func _set_gamepad_profile(device: CompositeDevice, profile_path: String = "") ->
else:
profile_path = settings_manager.get_library_value(library_item, "gamepad_profile", "")

if self.profile_gamepad.is_empty():
if not library_item:
self.profile_gamepad = settings_manager.get_value("input", "gamepad_profile_target", "") as String
else:
self.profile_gamepad = settings_manager.get_library_value(library_item, "gamepad_profile_target", "") as String

logger.debug("Setting " + device.name + " to profile: " + profile_path)
InputPlumber.load_target_modified_profile(device, profile_path, self.profile_gamepad)

Expand Down
Loading